From e8d5f5076747fa5066d6b1c389f50b16ab87a3ff Mon Sep 17 00:00:00 2001
From: Pierre Bastianelli <pierre.bastianelli@gov.bc.ca>
Date: Tue, 1 Nov 2022 16:02:10 -0700
Subject: [PATCH 1/2] chore: increasing deployment timeouts, helm and shipit

---
 Makefile        |  4 ++--
 shipit.test.yml | 19 ++++++++-----------
 shipit.yml      |  2 +-
 3 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/Makefile b/Makefile
index 96c33f3..357997b 100644
--- a/Makefile
+++ b/Makefile
@@ -9,7 +9,7 @@ install:
 	dagConfig=$$(echo '{"org": "bcgov", "repo": "cas-metabase", "ref": "$(GIT_SHA1)", "path": "dags/cas_metabase_dags.py"}' | base64 -w0); \
 	helm dep up ./helm/cas-metabase; \
 	if [[ $(ENVIRONMENT) == test ]]; then \
-		helm upgrade --install --atomic --wait-for-jobs --timeout 300s --namespace "$(GGIRCS_NAMESPACE_PREFIX)-$(ENVIRONMENT)" \
+		helm upgrade --install --atomic --wait-for-jobs --timeout 1800s --namespace "$(GGIRCS_NAMESPACE_PREFIX)-$(ENVIRONMENT)" \
 		--set gcsProdBackupSAKey="gcp-$(GGIRCS_NAMESPACE_PREFIX)-prod-read-only-service-account-key" \
 		--set ciipDatabaseHost="cas-ciip-portal-patroni-readonly.$(CIIP_NAMESPACE_PREFIX)-$(ENVIRONMENT).svc.cluster.local" \
 		--set cifDatabaseHost="cas-cif-postgres-replicas.$(CIF_NAMESPACE_PREFIX)-$(ENVIRONMENT).svc.cluster.local" \
@@ -17,7 +17,7 @@ install:
 		--values ./helm/cas-metabase/values-$(ENVIRONMENT).yaml \
 		cas-metabase ./helm/cas-metabase; \
 	else \
-		helm upgrade --install --atomic --wait-for-jobs --timeout 300s --namespace "$(GGIRCS_NAMESPACE_PREFIX)-$(ENVIRONMENT)" \
+		helm upgrade --install --atomic --wait-for-jobs --timeout 1800s --namespace "$(GGIRCS_NAMESPACE_PREFIX)-$(ENVIRONMENT)" \
 		--set download-cas-metabase-dags.dagConfiguration="$$dagConfig" \
 		--values ./helm/cas-metabase/values-$(ENVIRONMENT).yaml \
 		cas-metabase ./helm/cas-metabase; \
diff --git a/shipit.test.yml b/shipit.test.yml
index a5c8b8d..3f3b32c 100644
--- a/shipit.test.yml
+++ b/shipit.test.yml
@@ -4,7 +4,7 @@ deploy:
   override:
     - git submodule update --init
     - make install:
-        timeout: 300
+        timeout: 2000 # just a little over the 1800s timing out the helm release
 review:
   checklist: []
 
@@ -15,13 +15,10 @@ tasks:
     steps:
       - ./broken_questions/broken_questions.sh $METABASE_PATH $METABASE_API_USER $METABASE_API_PASS
     variables:
-    -
-      name: METABASE_PATH
-      title: URL of the Metabase instance
-      default: https://cas-metabase-test.apps.silver.devops.gov.bc.ca
-    -
-      name: METABASE_API_USER
-      title: The username of the Metabase user used to access the API
-    -
-      name: METABASE_API_PASS
-      title: The password for the Metabase user used to access the API
+      - name: METABASE_PATH
+        title: URL of the Metabase instance
+        default: https://cas-metabase-test.apps.silver.devops.gov.bc.ca
+      - name: METABASE_API_USER
+        title: The username of the Metabase user used to access the API
+      - name: METABASE_API_PASS
+        title: The password for the Metabase user used to access the API
diff --git a/shipit.yml b/shipit.yml
index 856b0ef..7075596 100644
--- a/shipit.yml
+++ b/shipit.yml
@@ -4,6 +4,6 @@ deploy:
   override:
     - git submodule update --init
     - make install:
-        timeout: 300
+        timeout: 2000 # just a little over the 1800s timing out the helm release
 review:
   checklist: []

From 4c352328372232ee046f943fe5df726f6c10dee6 Mon Sep 17 00:00:00 2001
From: Pierre Bastianelli <pierre.bastianelli@gov.bc.ca>
Date: Tue, 1 Nov 2022 16:03:31 -0700
Subject: [PATCH 2/2] chore: patch version for helm chart

---
 helm/cas-metabase/Chart.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/helm/cas-metabase/Chart.yaml b/helm/cas-metabase/Chart.yaml
index 460d5e9..774602c 100644
--- a/helm/cas-metabase/Chart.yaml
+++ b/helm/cas-metabase/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: cas-metabase
 description: A Helm chart for the CAS Metabase instance
 type: application
-version: 0.3.1
+version: 0.3.2
 appVersion: 0.44.2
 dependencies:
   - name: cas-postgres