Fix duplicate env vars on chartmuseum (#1316)

pluralsh · Jun 24, 2024 · c6df5fc · c6df5fc
1 parent 669a73a
commit c6df5fc
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 8 deletions.
diff --git a/plural/helm/plural/Chart.yaml b/plural/helm/plural/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: plural
 description: A helm chart for installing plural
 appVersion: 0.11.4
-version: 0.10.83
+version: 0.10.84
 dependencies:
   - name: hydra
     version: 0.26.5

diff --git a/plural/helm/plural/templates/_helpers.tpl b/plural/helm/plural/templates/_helpers.tpl
@@ -48,8 +48,6 @@ app.kubernetes.io/managed-by: {{ .Release.Service }}
 {{- define "plural.env" -}}
 - name: HOST
   value: {{ .Values.ingress.dns }}
-- name: DEPLOYED_AT
-  value: {{ now | unixEpoch | quote }}
 - name: NAMESPACE
   valueFrom:
     fieldRef:
@@ -95,7 +93,7 @@ app.kubernetes.io/managed-by: {{ .Release.Service }}
 {{- end -}}
 
 {{- define "plural.migration-name" -}}
-plural-migration-{{ .Release.Revision }}
+plural-migration-{{ .Values.image.tag | default .Chart.AppVersion | sha256sum | trunc 8 }}
 {{- end -}}
 
 {{- define "plural.wait-for-migration" -}}

diff --git a/plural/helm/plural/templates/chartmuseum.yaml b/plural/helm/plural/templates/chartmuseum.yaml
@@ -41,16 +41,12 @@ spec:
         - name: STORAGE
           value: {{ .Values.provider }}
         {{ end }}
-        - name: STORAGE_GOOGLE_BUCKET
-          value: {{ .Values.chartmuseum.bucket }}
         - name: STORAGE_GOOGLE_BUCKET
           value: {{ .Values.chartmuseum.bucket }}
         - name: STORAGE_GOOGLE_PREFIX
           value: ""
         - name: STORAGE_AMAZON_BUCKET
           value: {{ .Values.chartmuseum.bucket }}
-        - name: STORAGE_AMAZON_BUCKET
-          value: {{ .Values.chartmuseum.bucket }}
         - name: STORAGE_AMAZON_PREFIX
           value: ""
         - name: STORAGE_AMAZON_REGION