Merge pull request #1268 from rguske/issue-1176

Add a pause to the 05-knative.sh as a workaround for #1176
vmware-samples · Oct 27, 2024 · f3ba886 · f3ba886
2 parents baf44a8 + d491869
commit f3ba886
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 0 deletions.
diff --git a/files/setup-05-knative.sh b/files/setup-05-knative.sh
@@ -38,6 +38,9 @@ kubectl apply -f /root/download/rabbitmq-broker.yaml
 kubectl wait --for=condition=available deploy/rabbitmq-broker-controller --timeout=${KUBECTL_WAIT} -n knative-eventing
 kubectl wait --for=condition=available deploy/rabbitmq-broker-webhook --timeout=${KUBECTL_WAIT} -n knative-eventing
 
+echo -e "\e[92mPause Installation ..." > /dev/console
+sleep ${VEBA_PAUSE}
+
 echo -e "\e[92mDeploying RabbitMQ Cluster ..." > /dev/console
 RABBITMQ_CONFIG_TEMPLATE=/root/config/knative/templates/rabbit-template.yaml
 RABBITMQ_CONFIG=/root/config/knative/rabbit.yaml

diff --git a/files/setup.sh b/files/setup.sh
@@ -5,6 +5,7 @@
 set -euo pipefail
 
 # Extract all OVF Properties
+VEBA_PAUSE=$(/root/setup/getOvfProperty.py "guestinfo.pause")
 VEBA_DEBUG=$(/root/setup/getOvfProperty.py "guestinfo.debug")
 TANZU_SOURCES_DEBUG=$(/root/setup/getOvfProperty.py "guestinfo.tanzu_sources_debug")
 HOSTNAME=$(/root/setup/getOvfProperty.py "guestinfo.hostname" | tr '[:upper:]' '[:lower:]')
@@ -66,6 +67,11 @@ else
         echo
 	fi
 
+	# Customize the pause if provided or else default to 15s
+	if [ -z "${VEBA_PAUSE}" ]; then
+		VEBA_PAUSE="15"
+	fi
+
 	# Customize the POD CIDR Network if provided or else default to 10.10.0.0/16
 	if [ -z "${POD_NETWORK_CIDR}" ]; then
 		POD_NETWORK_CIDR="10.16.0.0/16"
@@ -93,6 +99,7 @@ else
 
 	cat > /root/config/veba-config.json <<EOF
 {
+	"VEBA_PAUSE": "${VEBA_PAUSE}",
 	"VEBA_DEBUG": "${VEBA_DEBUG}",
 	"TANZU_SOURCES_DEBUG": "${TANZU_SOURCES_DEBUG}",
 	"HOSTNAME": "${HOSTNAME}",

diff --git a/manual/photon.xml.template b/manual/photon.xml.template
@@ -182,4 +182,8 @@
             <Label>POD CIDR Network</Label>
             <Description>Customize POD CIDR Network (Default 10.10.0.0/16)</Description>
         </Property>
+        <Property ovf:key="guestinfo.pause" ovf:type="string" ovf:userConfigurable="true" ovf:value="15">
+            <Label>Temporarily Pause</Label>
+            <Description>Temporarily halts the installation to ensure service dependencies and availability (Default 15s)</Description>
+        </Property>
     </ProductSection>