feat: improved wait

Author: johanneswuerbach

0_install.sh

@@ -5,10 +5,10 @@ mkdir -p ./kube
 
 if [ ! -f ./kube/config.yaml ]; then
   kind create cluster -n 5min-idp --kubeconfig ./kube/config.yaml --config ./setup/kind/cluster.yaml
-fi
 
-# connect current container to the kind network
-docker network connect "kind" "5min-idp"
+  # connect current container to the kind network
+  docker network connect "kind" "5min-idp"
+fi
 
 # used by humanitec-agent / inside docker to reach the cluster
 kubeconfig_docker=$(pwd)/kube/config-internal.yaml

1_demo.sh

@@ -3,15 +3,52 @@ set -eo pipefail
 
 if ! humctl get application 5min-idp; then
   humctl create application 5min-idp
+  echo "App created"
 fi
 
+echo "Deploying workload"
+
 humctl score deploy --app 5min-idp --env development -f ./score.yaml
 
-echo "Waiting for deploy"
+echo "Waiting for deployment"
+
+sleep 1
+
+DEPLOYMENT_ID=$(humctl get deployment . -o json \
+    --app 5min-idp \
+    --env development \
+    | jq -r .metadata.id)
+
+IS_DONE=false
+CURRENT_STATUS=""
 
-# TODO Use humctl to wait for deploy to finish once GA
-sleep 20
+while [ "$IS_DONE" = false ]; do
+  CURRENT_STATUS=$(humctl get deployment "${DEPLOYMENT_ID}" -o json \
+    --app 5min-idp \
+    --env development \
+    | jq -r .status.status)
+
+  if [ "$CURRENT_STATUS" = "in progress" ]; then
+    echo "Deployment still in progress..."
+    sleep 2
+  elif [ "$CURRENT_STATUS" = "failed" ]; then
+    echo "Deployment failed!"
+    IS_DONE=true
+  else
+    echo "Deployment complete!"
+    IS_DONE=true
+  fi
+done
+if [ "$CURRENT_STATUS" = "failed" ]; then
+  humctl get deployment-error --app 5min-idp --env development
+  exit 1
+fi
 
 workload_host=$(humctl get active-resources --app 5min-idp --env development -o yaml | yq '.[] | select(.metadata.type == "route") | .status.resource.host')
 
+echo "Waiting for workload to be available"
+
+# manually change the host here as the workload host resolves to localhost, which is not reachable from the container
+curl -I --retry 10 --retry-delay 3 --connect-to "$workload_host:30080:5min-idp-control-plane:30080" "http://$workload_host:30080"
+
 echo "Workload available at: http://$workload_host:30080"

Dockerfile

@@ -43,7 +43,7 @@ RUN  curl -fsSL https://github.com/mikefarah/yq/releases/latest/download/yq_linu
 
 # install humctl (https://github.com/humanitec/cli/releases)
 RUN mkdir /tmp/humctl && \
-  curl -fsSL https://github.com/humanitec/cli/releases/download/v0.21.0/cli_0.21.0_linux_${TARGETARCH}.tar.gz > /tmp/humctl/humctl.tar.gz && \
+  curl -fsSL https://github.com/humanitec/cli/releases/download/v0.21.1/cli_0.21.1_linux_${TARGETARCH}.tar.gz > /tmp/humctl/humctl.tar.gz && \
   tar -zxvf /tmp/humctl/humctl.tar.gz -C /tmp/humctl && \
   install -o root -g root -m 0755 /tmp/humctl/humctl /usr/local/bin/humctl && \
   humctl completion bash > /etc/bash_completion.d/humctl && \