From d63cb8e691ee56c114bef3be6aca0ada8076bb45 Mon Sep 17 00:00:00 2001
From: "ali.alkhalidi" <ali.alkhalidi@securekey.com>
Date: Tue, 1 Jun 2021 13:36:02 -0400
Subject: [PATCH] fix: reorder jobs and wait longer for cms

Signed-off-by: ali.alkhalidi <ali.alkhalidi@securekey.com>
---
 .../jobs/overlays/common/kustomization.yaml   | 20 +++++++++----------
 k8s/scripts/deploy_all.sh                     |  8 ++++++--
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/k8s/jobs/kustomize/jobs/overlays/common/kustomization.yaml b/k8s/jobs/kustomize/jobs/overlays/common/kustomization.yaml
index 25761a7fc..c2ca2727e 100644
--- a/k8s/jobs/kustomize/jobs/overlays/common/kustomization.yaml
+++ b/k8s/jobs/kustomize/jobs/overlays/common/kustomization.yaml
@@ -54,24 +54,24 @@ configMapGenerator:
   name: governance-vcs-add-profiles-script
 
 resources:
-- adapter-issuer/add-profiles.yml
-- hub-auth/hydra/hydra-create-client.yml
+- cms/strapi/user-data.yml
+- cms/oathkeeper/role.yml
+- cms/oathkeeper/rolebinding.yml
+- cms/oathkeeper/process-template.yml
 - vcs/issuer/add-profiles.yml
 - vcs/verifier/add-profiles.yml
 - vcs/holder/add-profiles.yml
 - vcs/governance/add-profiles.yml
-- rp/role.yml
-- rp/rolebinding.yml
-- rp/register-tenant.yml
+- hub-auth/hydra/hydra-create-client.yml
+- adapter-issuer/add-profiles.yml
+- login-consent/hydra/hydra-create-client.yml
 - issuer/role.yml
 - issuer/rolebinding.yml
 - issuer/register-tenant.yml
+- rp/role.yml
+- rp/rolebinding.yml
+- rp/register-tenant.yml
 - ace-rp/create-profiles.yml
-- login-consent/hydra/hydra-create-client.yml
-- cms/strapi/user-data.yml
-- cms/oathkeeper/role.yml
-- cms/oathkeeper/rolebinding.yml
-- cms/oathkeeper/process-template.yml
 
 transformers:
 - sedtransform.yml
diff --git a/k8s/scripts/deploy_all.sh b/k8s/scripts/deploy_all.sh
index 97d839a09..1c490097b 100755
--- a/k8s/scripts/deploy_all.sh
+++ b/k8s/scripts/deploy_all.sh
@@ -49,7 +49,11 @@ NONE=$(tput sgr0)
 healthCheck() {
 	sleep 2
 	n=0
-	maxAttempts=200
+  maxAttempts=200
+  if [ "" != "$4" ]
+  then
+	   maxAttempts=$4
+  fi
 	echo "running health check : app=$1 url=$2 timeout=$maxAttempts seconds"
 	until [ $n -ge $maxAttempts ]
 	do
@@ -111,5 +115,5 @@ done
 ## Late health checks
 component=LATE
 for url in ${HEALTCHECK_URL[$component]}; do
-    healthCheck $component "$url" ${HEALTHCHECK_CODE["$url"]}
+    healthCheck $component "$url" ${HEALTHCHECK_CODE["$url"]} 300
 done