From 4e4bfa854ebe42b683403b8f17bcf7bcbd0d46e6 Mon Sep 17 00:00:00 2001 From: Liz Fong-Jones Date: Thu, 23 Dec 2021 16:20:38 -0800 Subject: [PATCH 1/3] fix: allow arbitrary env keys eg valueFrom --- chart/pyroscope/templates/deployment.yaml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/chart/pyroscope/templates/deployment.yaml b/chart/pyroscope/templates/deployment.yaml index 59c398e..32fbb8e 100644 --- a/chart/pyroscope/templates/deployment.yaml +++ b/chart/pyroscope/templates/deployment.yaml @@ -38,10 +38,8 @@ spec: image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}" imagePullPolicy: {{ .Values.image.pullPolicy }} {{- if .Values.env }} - env: - {{- range $k, $v := .Values.env }} - - name: {{ $k }} - value: {{ $v }} + {{- with .Values.env }} + env: {{- toYaml . | nindent 12 }} {{- end }} {{- end }} ports: @@ -106,4 +104,4 @@ spec: {{- with .Values.tolerations }} tolerations: {{- toYaml . | nindent 8 }} - {{- end }} \ No newline at end of file + {{- end }} From 563994fd20f566f9d6eb9ebd4740267c9e4b9aa6 Mon Sep 17 00:00:00 2001 From: Liz Fong-Jones Date: Thu, 23 Dec 2021 16:41:02 -0800 Subject: [PATCH 2/3] Update deployment.yaml --- chart/pyroscope/templates/deployment.yaml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/chart/pyroscope/templates/deployment.yaml b/chart/pyroscope/templates/deployment.yaml index 32fbb8e..ecd45b7 100644 --- a/chart/pyroscope/templates/deployment.yaml +++ b/chart/pyroscope/templates/deployment.yaml @@ -38,9 +38,11 @@ spec: image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}" imagePullPolicy: {{ .Values.image.pullPolicy }} {{- if .Values.env }} - {{- with .Values.env }} - env: {{- toYaml . | nindent 12 }} - {{- end }} + env: + {{- range $name, $item := .Values.env }} + - name: {{ $name }} + {{- $item | toYaml | nindent 14 }} + {{- end }} {{- end }} ports: - name: api From 288c9eee3da6b22663c27c308476bfeace2b55c1 Mon Sep 17 00:00:00 2001 From: Liz Fong-Jones Date: Thu, 23 Dec 2021 16:52:36 -0800 Subject: [PATCH 3/3] Restore deployment.yaml --- chart/pyroscope/templates/deployment.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/chart/pyroscope/templates/deployment.yaml b/chart/pyroscope/templates/deployment.yaml index ecd45b7..34596b4 100644 --- a/chart/pyroscope/templates/deployment.yaml +++ b/chart/pyroscope/templates/deployment.yaml @@ -39,10 +39,10 @@ spec: imagePullPolicy: {{ .Values.image.pullPolicy }} {{- if .Values.env }} env: - {{- range $name, $item := .Values.env }} - - name: {{ $name }} - {{- $item | toYaml | nindent 14 }} - {{- end }} + {{- range $k, $v := .Values.env }} + - name: {{ $k }} + value: {{ $v }} + {{- end }} {{- end }} ports: - name: api