From 9fc579e4fad1461b83605fbb68e8a0c4e921be6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C4=81nis=20Bebr=C4=ABtis?= Date: Fri, 12 Jan 2024 12:32:11 +0200 Subject: [PATCH 1/3] Wait flag for helm release, enables proper post-release creation --- cmd/ciReleaseDeploy.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cmd/ciReleaseDeploy.go b/cmd/ciReleaseDeploy.go index dd25c31..136c8cf 100644 --- a/cmd/ciReleaseDeploy.go +++ b/cmd/ciReleaseDeploy.go @@ -336,6 +336,7 @@ var ciReleaseDeployCmd = &cobra.Command{ ${EXTRA_DB_USER_PASS} \ --values "${SILTA_CONFIG}" \ ${EXTRA_HELM_FLAGS} \ + --wait \ --timeout "${DEPLOYMENT_TIMEOUT}" &> helm-output.log & pid=$! # TODO: Rewrite this part @@ -567,6 +568,7 @@ var ciReleaseDeployCmd = &cobra.Command{ --namespace="${NAMESPACE}" \ --values "${SILTA_CONFIG}" \ ${EXTRA_HELM_FLAGS} \ + --wait \ --timeout "${DEPLOYMENT_TIMEOUT}" &> helm-output.log & pid=$! # TODO: Rewrite this part From 857939011433ecfbcb6fc3b1edeab373956acd5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C4=81nis=20Bebr=C4=ABtis?= Date: Fri, 12 Jan 2024 12:42:11 +0200 Subject: [PATCH 2/3] Tests fix --- tests/release_test.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/release_test.go b/tests/release_test.go index 723f375..64f1e19 100644 --- a/tests/release_test.go +++ b/tests/release_test.go @@ -222,6 +222,7 @@ func TestReleaseDeployCmd(t *testing.T) { --namespace="${NAMESPACE}" \ --values "${SILTA_CONFIG}" \ ${EXTRA_HELM_FLAGS} \ + --wait \ --timeout "${DEPLOYMENT_TIMEOUT}" &> helm-output.log & pid=$!` CliExecTest(t, command, environment, testString, false) @@ -331,6 +332,7 @@ func TestReleaseDeployCmd(t *testing.T) { --namespace="${NAMESPACE}" \ --values "${SILTA_CONFIG}" \ ${EXTRA_HELM_FLAGS} \ + --wait \ --timeout "${DEPLOYMENT_TIMEOUT}" &> helm-output.log & pid=$!` CliExecTest(t, command, environment, testString, false) From df66a5f0eaf2a5414c532e448eb4798f899764a8 Mon Sep 17 00:00:00 2001 From: Rasmus Werling Date: Mon, 22 Jan 2024 11:26:22 +0200 Subject: [PATCH 3/3] Added "... and be ready" to message for clarificatoin --- cmd/ciReleaseDeploy.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmd/ciReleaseDeploy.go b/cmd/ciReleaseDeploy.go index 136c8cf..2639871 100644 --- a/cmd/ciReleaseDeploy.go +++ b/cmd/ciReleaseDeploy.go @@ -341,7 +341,7 @@ var ciReleaseDeployCmd = &cobra.Command{ # TODO: Rewrite this part - echo "Waiting for containers to start" + echo "Waiting for containers to start and be ready" TIME_WAITING=0 LOGS_SHOWN=false @@ -573,7 +573,7 @@ var ciReleaseDeployCmd = &cobra.Command{ # TODO: Rewrite this part - echo "Waiting for containers to start" + echo "Waiting for containers to start and be ready" TIME_WAITING=0 LOGS_SHOWN=false