Skip to content

Commit c6df5fc

Browse files
Fix duplicate env vars on chartmuseum (#1316)
1 parent 669a73a commit c6df5fc

File tree

3 files changed

+2
-8
lines changed

3 files changed

+2
-8
lines changed

Diff for: plural/helm/plural/Chart.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: v2
22
name: plural
33
description: A helm chart for installing plural
44
appVersion: 0.11.4
5-
version: 0.10.83
5+
version: 0.10.84
66
dependencies:
77
- name: hydra
88
version: 0.26.5

Diff for: plural/helm/plural/templates/_helpers.tpl

+1-3
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,6 @@ app.kubernetes.io/managed-by: {{ .Release.Service }}
4848
{{- define "plural.env" -}}
4949
- name: HOST
5050
value: {{ .Values.ingress.dns }}
51-
- name: DEPLOYED_AT
52-
value: {{ now | unixEpoch | quote }}
5351
- name: NAMESPACE
5452
valueFrom:
5553
fieldRef:
@@ -95,7 +93,7 @@ app.kubernetes.io/managed-by: {{ .Release.Service }}
9593
{{- end -}}
9694

9795
{{- define "plural.migration-name" -}}
98-
plural-migration-{{ .Release.Revision }}
96+
plural-migration-{{ .Values.image.tag | default .Chart.AppVersion | sha256sum | trunc 8 }}
9997
{{- end -}}
10098

10199
{{- define "plural.wait-for-migration" -}}

Diff for: plural/helm/plural/templates/chartmuseum.yaml

-4
Original file line numberDiff line numberDiff line change
@@ -41,16 +41,12 @@ spec:
4141
- name: STORAGE
4242
value: {{ .Values.provider }}
4343
{{ end }}
44-
- name: STORAGE_GOOGLE_BUCKET
45-
value: {{ .Values.chartmuseum.bucket }}
4644
- name: STORAGE_GOOGLE_BUCKET
4745
value: {{ .Values.chartmuseum.bucket }}
4846
- name: STORAGE_GOOGLE_PREFIX
4947
value: ""
5048
- name: STORAGE_AMAZON_BUCKET
5149
value: {{ .Values.chartmuseum.bucket }}
52-
- name: STORAGE_AMAZON_BUCKET
53-
value: {{ .Values.chartmuseum.bucket }}
5450
- name: STORAGE_AMAZON_PREFIX
5551
value: ""
5652
- name: STORAGE_AMAZON_REGION

0 commit comments

Comments
 (0)