Add timeout env var to helm

cyberark · May 27, 2021 · 40a4bcc · 40a4bcc
1 parent 809639a
commit 40a4bcc
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 4 deletions.
diff --git a/bin/test-workflow/4_admin_cluster_prep.sh b/bin/test-workflow/4_admin_cluster_prep.sh
@@ -2,6 +2,7 @@
 set -euo pipefail
 
 export PLATFORM="${PLATFORM:-kubernetes}"
+export TIMEOUT="${TIMEOUT:-5m0s}"
 
 . utils.sh
 
@@ -21,5 +22,6 @@ pushd $(dirname "$0")/../../helm/kubernetes-cluster-prep > /dev/null
         --set conjur.account="$CONJUR_ACCOUNT" \
         --set conjur.applianceUrl="$CONJUR_APPLIANCE_URL" \
         --set conjur.certificateFilePath="files/conjur-cert.pem" \
-        --set authnK8s.authenticatorID="$AUTHENTICATOR_ID"
+        --set authnK8s.authenticatorID="$AUTHENTICATOR_ID" \
+        --timeout $TIMEOUT
 popd > /dev/null
diff --git a/bin/test-workflow/5_app_namespace_prep.sh b/bin/test-workflow/5_app_namespace_prep.sh
@@ -2,6 +2,7 @@
 set -euo pipefail
 
 export PLATFORM="${PLATFORM:-kubernetes}"
+export TIMEOUT="${TIMEOUT:-5m0s}"
 
 . utils.sh
 
@@ -18,5 +19,6 @@ pushd $(dirname "$0")/../../helm/application-namespace-prep > /dev/null
         --create-namespace \
         --set authnK8s.goldenConfigMap="authn-k8s-configmap" \
         --set authnK8s.namespace="$CONJUR_NAMESPACE" \
-        --set authnK8s.backendSecret="test-app-backend-certs"
+        --set authnK8s.backendSecret="test-app-backend-certs" \
+        --timeout $TIMEOUT
 popd > /dev/null
diff --git a/bin/test-workflow/7_app_deploy_backend.sh b/bin/test-workflow/7_app_deploy_backend.sh
@@ -2,6 +2,7 @@
 set -euo pipefail
 
 export PLATFORM="${PLATFORM:-kubernetes}"
+export TIMEOUT="${TIMEOUT:-5m0s}"
 
 . utils.sh
 
@@ -38,4 +39,5 @@ helm install app-summon-sidecar-backend-pg bitnami/postgresql -n $TEST_APP_NAMES
     --set securityContext.fsGroup="999" \
     --set postgresqlDatabase="test_app" \
     --set postgresqlUsername="test_app" \
-    --set postgresqlPassword=$SAMPLE_APP_BACKEND_DB_PASSWORD
+    --set postgresqlPassword=$SAMPLE_APP_BACKEND_DB_PASSWORD \
+    --timeout $TIMEOUT
diff --git a/bin/test-workflow/8_app_deploy_summon_sidecar.sh b/bin/test-workflow/8_app_deploy_summon_sidecar.sh
@@ -2,6 +2,7 @@
 set -euo pipefail
 
 export PLATFORM="${PLATFORM:-kubernetes}"
+export TIMEOUT="${TIMEOUT:-5m0s}"
 
 . utils.sh
 
@@ -20,7 +21,8 @@ pushd $(dirname "$0")/../../helm/app-deploy > /dev/null
   helm install app-summon-sidecar . -n "$TEST_APP_NAMESPACE_NAME" --debug --wait \
       --set app-summon-sidecar.enabled=true \
       --set global.conjur.conjurConnConfigMap="conjur-connect-configmap" \
-      --set app-summon-sidecar.conjur.authnLogin="$CONJUR_AUTHN_LOGIN_PREFIX/test-app-summon-sidecar"
+      --set app-summon-sidecar.conjur.authnLogin="$CONJUR_AUTHN_LOGIN_PREFIX/test-app-summon-sidecar" \
+      --timeout $TIMEOUT
 popd > /dev/null
 
 echo "Test app/sidecar deployed."