From f056f49a72329796caf58f4c7064822420bd4e5e Mon Sep 17 00:00:00 2001 From: Dylan Leard Date: Tue, 7 Mar 2023 15:02:05 -0800 Subject: [PATCH 1/3] chore: fix host in route --- helm/cas-metabase/templates/route.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helm/cas-metabase/templates/route.yaml b/helm/cas-metabase/templates/route.yaml index 6ddba96..77f3039 100644 --- a/helm/cas-metabase/templates/route.yaml +++ b/helm/cas-metabase/templates/route.yaml @@ -22,7 +22,7 @@ metadata: haproxy.router.openshift.io/balance: roundrobin spec: - host: {{ .Values.host }} + host: {{ .Values.route.host }} port: targetPort: {{ template "cas-metabase.fullname" . }} tls: From d2fe64f48fcdf76923689047a08b78610605ad94 Mon Sep 17 00:00:00 2001 From: Dylan Leard Date: Tue, 7 Mar 2023 15:03:40 -0800 Subject: [PATCH 2/3] chore: remove temporary route for prod --- .../templates/route-temporary.yaml | 22 ------------------- helm/cas-metabase/values-prod.yaml | 2 -- 2 files changed, 24 deletions(-) delete mode 100644 helm/cas-metabase/templates/route-temporary.yaml diff --git a/helm/cas-metabase/templates/route-temporary.yaml b/helm/cas-metabase/templates/route-temporary.yaml deleted file mode 100644 index 1a8262a..0000000 --- a/helm/cas-metabase/templates/route-temporary.yaml +++ /dev/null @@ -1,22 +0,0 @@ -{{- if .Values.route.enableTemporary }} -apiVersion: route.openshift.io/v1 -kind: Route -metadata: - name: {{ template "cas-metabase.fullname" . }}-temporary - labels: -{{ include "cas-metabase.labels" . | indent 4 }} - annotations: - haproxy.router.openshift.io/balance: roundrobin - -spec: - host: {{ .Values.route.temporaryHost }} - port: - targetPort: {{ template "cas-metabase.fullname" . }} - tls: - insecureEdgeTerminationPolicy: Redirect - termination: edge - to: - kind: Service - name: {{ template "cas-metabase.fullname" . }} - weight: 100 -{{- end }} diff --git a/helm/cas-metabase/values-prod.yaml b/helm/cas-metabase/values-prod.yaml index 1684e48..bf3523c 100644 --- a/helm/cas-metabase/values-prod.yaml +++ b/helm/cas-metabase/values-prod.yaml @@ -22,8 +22,6 @@ route: enable: true host: cas-metabase.nrs.gov.bc.ca certbotManaged: true - enableTemporary: true - temporaryHost: cas-metabase-prod.apps.silver.devops.gov.bc.ca certbot: certbot: From 236bbc09cb55fa91460f8d3550d390c44a9c747d Mon Sep 17 00:00:00 2001 From: Dylan Leard Date: Tue, 7 Mar 2023 15:17:12 -0800 Subject: [PATCH 3/3] chore: update chart version --- 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 15e5939..9a17377 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.5 +version: 0.3.6 appVersion: 0.44.2 dependencies: - name: cas-postgres