Skip to content

Commit 3dec768

Browse files
mblaschkemblaschke
authored
Merge pull request #3 from jkroepke/env
[*] Use maps for env blocks
2 parents f32b765 + c34aaf8 commit 3dec768

File tree

29 files changed

+204
-105
lines changed

29 files changed

+204
-105
lines changed

‎.github/workflows/lint-test.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
build:
1010
name: lint, install
1111
runs-on: ubuntu-latest
12-
timeout-minutes: 10
12+
timeout-minutes: 60
1313
steps:
1414
- name: Checkout Code
1515
uses: actions/checkout@v3

‎charts/azure-janitor/Chart.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: azure-janitor
33
type: application
44
description: A Helm chart for azure-janitor
55
home: https://github.com/webdevops/azure-janitor
6-
version: 1.0.4
6+
version: 1.0.5
77
appVersion: 22.9.0
88
keywords:
99
- azure-janitor

‎charts/azure-janitor/ci/env-values.yaml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
env:
2+
DEBUG: "true"
3+
4+
extraEnv:
5+
- name: MY_POD_NAMESPACE
6+
valueFrom:
7+
fieldRef:
8+
fieldPath: metadata.namespace

‎charts/azure-janitor/templates/deployment.yaml‎

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -45,19 +45,21 @@ spec:
4545
imagePullPolicy: {{ .Values.image.pullPolicy | quote }}
4646

4747
securityContext: {{ toYaml .Values.containerSecurityContext | nindent 12 }}
48-
4948
env:
50-
{{- range $index, $val := .Values.secrets }}
51-
- name: {{ $index | quote }}
52-
valueFrom:
53-
secretKeyRef:
54-
name: {{ template "azure-janitor.fullname" $ }}
55-
key: {{ $index | quote }}
56-
{{- end }}
57-
{{ with .Values.env }}
58-
{{ toYaml . | nindent 12 }}
59-
{{end}}
60-
49+
{{- range $index, $val := .Values.secrets }}
50+
- name: {{ $index | quote }}
51+
valueFrom:
52+
secretKeyRef:
53+
name: {{ template "azure-janitor.fullname" $ }}
54+
key: {{ $index | quote }}
55+
{{- end }}
56+
{{- range $name, $value := .Values.env }}
57+
- name: {{ $name | quote }}
58+
value: {{ $value | quote }}
59+
{{- end }}
60+
{{- with .Values.extraEnv }}
61+
{{- tpl (toYaml .) $ | nindent 12 }}
62+
{{- end }}
6163
ports:
6264
- containerPort: 8080
6365
name: http-metrics

‎charts/azure-janitor/values.yaml‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,15 @@ minReadySeconds: 10
1717
terminationGracePeriodSeconds: 60
1818

1919
env: {}
20-
# - name: DEBUG
21-
# value: "true"
22-
# - name: VERBOSE
23-
# value: "true"
20+
# DEBUG: "true"
21+
# VERBOSE: "true"
22+
23+
extraEnv:
24+
# - name: REDIS_PASSWORD
25+
# valueFrom:
26+
# secretKeyRef:
27+
# key: redis-password
28+
# name: redis-config-0.0.2
2429

2530
secretsEnableTemplateFunctions: false
2631
secrets: {}

‎charts/azure-keyvault-exporter/Chart.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: azure-keyvault-exporter
33
type: application
44
description: A Helm chart for azure-keyvault-exporter
55
home: https://github.com/webdevops/azure-keyvault-exporter
6-
version: 1.0.1
6+
version: 1.0.2
77
appVersion: 22.9.0
88
keywords:
99
- azure-keyvault-exporter

‎charts/azure-keyvault-exporter/ci/env-values.yaml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
env:
2+
DEBUG: "true"
3+
4+
extraEnv:
5+
- name: MY_POD_NAMESPACE
6+
valueFrom:
7+
fieldRef:
8+
fieldPath: metadata.namespace

‎charts/azure-keyvault-exporter/templates/deployment.yaml‎

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -47,19 +47,21 @@ spec:
4747
imagePullPolicy: {{ .Values.image.pullPolicy | quote }}
4848

4949
securityContext: {{ toYaml .Values.containerSecurityContext | nindent 12 }}
50-
5150
env:
52-
{{- range $index, $val := .Values.secrets }}
53-
- name: {{ $index | quote }}
54-
valueFrom:
55-
secretKeyRef:
56-
name: {{ template "azure-keyvault-exporter.fullname" $ }}
57-
key: {{ $index | quote }}
58-
{{- end }}
59-
{{ with .Values.env }}
60-
{{ toYaml . | nindent 12 }}
61-
{{end}}
62-
51+
{{- range $index, $val := .Values.secrets }}
52+
- name: {{ $index | quote }}
53+
valueFrom:
54+
secretKeyRef:
55+
name: {{ template "azure-keyvault-exporter.fullname" $ }}
56+
key: {{ $index | quote }}
57+
{{- end }}
58+
{{- range $name, $value := .Values.env }}
59+
- name: {{ $name | quote }}
60+
value: {{ $value | quote }}
61+
{{- end }}
62+
{{- with .Values.extraEnv }}
63+
{{- tpl (toYaml .) $ | nindent 12 }}
64+
{{- end }}
6365
ports:
6466
- containerPort: 8080
6567
name: http-metrics

‎charts/azure-keyvault-exporter/values.yaml‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,15 @@ minReadySeconds: 10
1717
terminationGracePeriodSeconds: 60
1818

1919
env: {}
20-
# - name: DEBUG
21-
# value: "true"
22-
# - name: VERBOSE
23-
# value: "true"
20+
# DEBUG: "true"
21+
# VERBOSE: "true"
22+
23+
extraEnv: []
24+
# - name: REDIS_PASSWORD
25+
# valueFrom:
26+
# secretKeyRef:
27+
# key: redis-password
28+
# name: redis-config-0.0.2
2429

2530
secretsEnableTemplateFunctions: false
2631
secrets: {}

‎charts/azure-metrics-exporter/Chart.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: azure-metrics-exporter
33
type: application
44
description: A Helm chart for azure-metrics-exporter
55
home: https://github.com/webdevops/azure-metrics-exporter
6-
version: 1.0.1
6+
version: 1.0.2
77
appVersion: 22.9.0
88
keywords:
99
- azure-metrics-exporter

0 commit comments

Comments
 (0)