From 6849c2c3e3cedce671cb60d9ce77d0b12083c989 Mon Sep 17 00:00:00 2001
From: david-leifker <114954101+david-leifker@users.noreply.github.com>
Date: Thu, 7 Nov 2024 09:52:08 -0600
Subject: [PATCH] feat(template-mcps): configure helm revision env (#518)

---
 charts/datahub/Chart.yaml                                 | 2 +-
 .../datahub-upgrade/datahub-system-update-job.yml         | 8 ++++++++
 charts/datahub/values.yaml                                | 2 ++
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/charts/datahub/Chart.yaml b/charts/datahub/Chart.yaml
index e3d11e913..b8d8f9644 100644
--- a/charts/datahub/Chart.yaml
+++ b/charts/datahub/Chart.yaml
@@ -4,7 +4,7 @@ description: A Helm chart for DataHub
 type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
-version: 0.4.34
+version: 0.4.35
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application.
 appVersion: 0.14.1
diff --git a/charts/datahub/templates/datahub-upgrade/datahub-system-update-job.yml b/charts/datahub/templates/datahub-upgrade/datahub-system-update-job.yml
index ca636c31f..2a514a29c 100644
--- a/charts/datahub/templates/datahub-upgrade/datahub-system-update-job.yml
+++ b/charts/datahub/templates/datahub-upgrade/datahub-system-update-job.yml
@@ -142,6 +142,10 @@ spec:
             {{- end }}
             - name: {{ $v.values_env }}
               value: {{ $result | toJson | quote }}
+            {{- with $v.revision_env }}
+            - name: {{ . }}
+              value: '{"version":"{{ $.Chart.Version }}-{{ $.Release.Revision }}"}'
+            {{- end }}
             {{- end }}
           {{- with .Values.datahubSystemUpdate.extraEnvs }}
             {{- toYaml . | nindent 12 }}
@@ -313,6 +317,10 @@ spec:
             {{- end }}
             - name: {{ $v.values_env }}
               value: {{ $result | toJson | quote }}
+            {{- with $v.revision_env }}
+            - name: {{ . }}
+              value: '{"version":"{{ $.Chart.Version }}-{{ $.Release.Revision }}"}'
+            {{- end }}
             {{- end }}
           {{- with .Values.datahubSystemUpdate.extraEnvs }}
             {{- toYaml . | nindent 12 }}
diff --git a/charts/datahub/values.yaml b/charts/datahub/values.yaml
index b4c0c9e47..d241811f8 100644
--- a/charts/datahub/values.yaml
+++ b/charts/datahub/values.yaml
@@ -408,10 +408,12 @@ datahubSystemUpdate:
         - "datahub.systemUpdate.datahubGC.timezone"
       # Environment variable containing the json value for the template mcp
       values_env: DATAHUB_GC_BOOTSTRAP_VALUES
+      revision_env: DATAHUB_GC_BOOTSTRAP_REVISION
       # Base values for the template mcp
       values:
         ingestion:
           name: datahub-gc
+          version: "0.14.1.7rc2"
         schedule:
           # overridden by global.datahub.timezone
           timezone: "UTC"