Skip to content

Commit ee62199

Browse files
technicalgurutechnicalguru
committed
Fixed issue with empty additional specs
1 parent 3dbbb6f commit ee62199

11 files changed

Lines changed: 104 additions & 0 deletions

File tree

‎examples/helm-charts/amavis/templates/deployment.yaml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@ spec:
1717
{{- if .Values.additionalLabels -}}
1818
{{- toYaml .Values.additionalLabels | nindent 8 }}
1919
{{- end }}
20+
{{- if .Values.additionalTemplateSpec -}}
21+
{{- toYaml .Values.additionalTemplateSpec | nindent 4 }}
22+
{{- end }}
2023
spec:
2124
affinity:
2225
nodeAffinity:
@@ -27,6 +30,9 @@ spec:
2730
operator: In
2831
values:
2932
- {{ .Values.environment }}
33+
{{- if .Values.additionalPodSpec -}}
34+
{{- toYaml .Values.additionalPodSpec | nindent 6 }}
35+
{{- end }}
3036
containers:
3137
- name: {{ .Chart.Name }}
3238
image: "{{ .Values.image.repository }}:{{ .Chart.AppVersion }}"
@@ -51,6 +57,9 @@ spec:
5157
mountPath: {{ .mountPath }}
5258
subPath: {{ base .path }}
5359
{{- end }}
60+
{{- if .Values.additionalContainerSpec -}}
61+
{{- toYaml .Values.additionalContainerSpec | nindent 8 }}
62+
{{- end }}
5463
resources:
5564
{{- toYaml .Values.resources | nindent 12 }}
5665
volumes:

‎examples/helm-charts/amavis/values.yaml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,3 +59,11 @@ configFiles: {}
5959
#- name: example2
6060
# mountPath: /etc/spamassassin/x20-example.cf
6161
# path: example2.cf
62+
63+
# $additionalTemplateSpec - Add more deployment template specification at this value
64+
# $additionalPodSpec - Add more pod specification at this value
65+
# $additionalContainerSpec - Add more container specification at this value
66+
additionalTemplateSpec: {}
67+
additionalPodSpec: {}
68+
additionalContainerSpec: {}
69+

‎examples/helm-charts/mailserver/values.yaml‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,9 @@ imagePullPolicy: &default_pull_policy "IfNotPresent"
2727
# $mariadb.volumeType - How is the data volume being connected (hostPath, pvc)
2828
# $mariadb.enableAuditLog - enables the mariadb audit plugin
2929
# $mariadb.auditFilePath - where to store the audit file (default is the data directory in order to persist automatically)
30+
# $mariadb.additionalTemplateSpec - Add more deployment template specification at this value
31+
# $mariadb.additionalPodSpec - Add more pod specification at this value
32+
# $mariadb.additionalContainerSpec - Add more container specification at this value
3033
mariadb:
3134
affinityLabel: *default_affinity_label
3235
environment: *default_environment
@@ -69,6 +72,9 @@ mariadb:
6972
# $postfix.tlsCAPath - directory where trusted CA certificates are stored
7073
# $postfix.tlsAdminEmail - e-mail of admin to be informed when TLS certificate is about to expire
7174
# $postfix.configFiles - definition of additional config files
75+
# $postfix.additionalTemplateSpec - Add more deployment template specification at this value
76+
# $postfix.additionalPodSpec - Add more pod specification at this value
77+
# $postfix.additionalContainerSpec - Add more container specification at this value
7278
postfix:
7379
affinityLabel: *default_affinity_label
7480
environment: *default_environment
@@ -100,6 +106,9 @@ postfix:
100106
# $amavis.relayPort - relay port for Amavis mail scanning
101107
# $amavis.virusAdminEmail - e-mail of admin to be informed when viruses were quarantined
102108
# $amavis.configFiles - definition of additional config files
109+
# $amavis.additionalTemplateSpec - Add more deployment template specification at this value
110+
# $amavis.additionalPodSpec - Add more pod specification at this value
111+
# $amavis.additionalContainerSpec - Add more container specification at this value
103112
amavis:
104113
affinityLabel: *default_affinity_label
105114
environment: *default_environment
@@ -127,6 +136,9 @@ amavis:
127136
# $postfixadmin.hostmasterEmail - e-mail of host responsible
128137
# $postfixadmin.postmasterEmail - e-mail of mail responsible
129138
# $postfixadmin.webmasterEmail - e-mail of web responsible
139+
# $postfixadmin.additionalTemplateSpec - Add more deployment template specification at this value
140+
# $postfixadmin.additionalPodSpec - Add more pod specification at this value
141+
# $postfixadmin.additionalContainerSpec - Add more container specification at this value
130142
postfixadmin:
131143
image:
132144
pullPolicy: *default_pull_policy
@@ -153,6 +165,9 @@ postfixadmin:
153165
# $roundcube.smtpServerHostname - hostname to be used for HELO greeting
154166
# $roundcube.defaultDomain - The default domain for login users
155167
# $roundcube.desKey - a unique 24-char string for your server (required, must not be empty)
168+
# $roundcube.additionalTemplateSpec - Add more deployment template specification at this value
169+
# $roundcube.additionalPodSpec - Add more pod specification at this value
170+
# $roundcube.additionalContainerSpec - Add more container specification at this value
156171
roundcube:
157172
image:
158173
pullPolicy: *default_pull_policy

‎examples/helm-charts/mariadb/templates/deployment.yaml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@ spec:
1919
{{- if .Values.additionalLabels -}}
2020
{{- toYaml .Values.additionalLabels | nindent 8 }}
2121
{{- end }}
22+
{{- if .Values.additionalTemplateSpec -}}
23+
{{- toYaml .Values.additionalTemplateSpec | nindent 4 }}
24+
{{- end }}
2225
spec:
2326
affinity:
2427
nodeAffinity:
@@ -29,6 +32,9 @@ spec:
2932
operator: In
3033
values:
3134
- {{ .Values.environment }}
35+
{{- if .Values.additionalPodSpec -}}
36+
{{- toYaml .Values.additionalPodSpec | nindent 6 }}
37+
{{- end }}
3238
containers:
3339
- name: {{ .Chart.Name }}
3440
image: "{{ .Values.image.repository }}:{{ .Chart.AppVersion }}"
@@ -56,6 +62,9 @@ spec:
5662
mountPath: /etc/mysql/conf.d/{{ include "mariadb.fullname" .}}-audit-log.cnf
5763
subPath: {{ include "mariadb.fullname" .}}-audit-log.cnf
5864
{{- end }}
65+
{{- if .Values.additionalContainerSpec -}}
66+
{{- toYaml .Values.additionalContainerSpec | nindent 8 }}
67+
{{- end }}
5968
volumes:
6069
- name: data
6170
{{- if eq .Values.volumeType "hostPath" }}

‎examples/helm-charts/mariadb/values.yaml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,3 +60,12 @@ enableAuditLog: true
6060
# $auditFilePath - where to store the audit file (default is the data directory in order to persist automatically)
6161
auditFilePath: "/var/lib/mysql/server_audit.log"
6262

63+
################################################
64+
# More customization
65+
################################################
66+
# $additionalTemplateSpec - Add more deployment template specification at this value
67+
# $additionalPodSpec - Add more pod specification at this value
68+
# $additionalContainerSpec - Add more container specification at this value
69+
additionalTemplateSpec: {}
70+
additionalPodSpec: {}
71+
additionalContainerSpec: {}

‎examples/helm-charts/postfix/templates/deployment.yaml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@ spec:
1717
{{- if .Values.additionalLabels -}}
1818
{{- toYaml .Values.additionalLabels | nindent 8 }}
1919
{{- end }}
20+
{{- if .Values.additionalTemplateSpec -}}
21+
{{- toYaml .Values.additionalTemplateSpec | nindent 4 }}
22+
{{- end }}
2023
spec:
2124
affinity:
2225
nodeAffinity:
@@ -27,6 +30,9 @@ spec:
2730
operator: In
2831
values:
2932
- {{ .Values.environment }}
33+
{{- if .Values.additionalPodSpec -}}
34+
{{- toYaml .Values.additionalPodSpec | nindent 6 }}
35+
{{- end }}
3036
containers:
3137
- name: {{ .Chart.Name }}
3238
image: "{{ .Values.image.repository }}:{{ .Chart.AppVersion }}"
@@ -93,6 +99,9 @@ spec:
9399
mountPath: {{ .mountPath }}
94100
subPath: {{ base .path }}
95101
{{- end }}
102+
{{- if .Values.additionalContainerSpec -}}
103+
{{- toYaml .Values.additionalContainerSpec | nindent 8 }}
104+
{{- end }}
96105
resources:
97106
{{- toYaml .Values.resources | nindent 12 }}
98107
volumes:

‎examples/helm-charts/postfix/values.yaml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,3 +104,10 @@ configFiles: {}
104104
#- name: example2
105105
# mountPath: /etc/postfix/x20-example.cf
106106
# path: example2.cf
107+
108+
# $additionalTemplateSpec - Add more deployment template specification at this value
109+
# $additionalPodSpec - Add more pod specification at this value
110+
# $additionalContainerSpec - Add more container specification at this value
111+
additionalTemplateSpec: {}
112+
additionalPodSpec: {}
113+
additionalContainerSpec: {}

‎examples/helm-charts/postfixadmin/templates/deployment.yaml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,13 @@ spec:
1717
{{- if .Values.additionalLabels -}}
1818
{{- toYaml .Values.additionalLabels | nindent 8 }}
1919
{{- end }}
20+
{{- if .Values.additionalTemplateSpec -}}
21+
{{- toYaml .Values.additionalTemplateSpec | nindent 4 }}
22+
{{- end }}
2023
spec:
24+
{{- if .Values.additionalPodSpec -}}
25+
{{- toYaml .Values.additionalPodSpec | nindent 6 }}
26+
{{- end }}
2127
containers:
2228
- name: {{ .Chart.Name }}
2329
image: "{{ .Values.image.repository }}:{{ .Chart.AppVersion }}"
@@ -48,6 +54,9 @@ spec:
4854
ports:
4955
- name: http
5056
containerPort: 80
57+
{{- if .Values.additionalContainerSpec -}}
58+
{{- toYaml .Values.additionalContainerSpec | nindent 8 }}
59+
{{- end }}
5160
resources:
5261
{{- toYaml .Values.resources | nindent 12 }}
5362

‎examples/helm-charts/postfixadmin/values.yaml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,3 +58,13 @@ abuseEmail: "abuse@localhost"
5858
hostmasterEmail: "hostmaster@localhost"
5959
postmasterEmail: "postmaster@localhost"
6060
webmasterEmail: "webmaster@localhost"
61+
62+
################################################
63+
# More customization
64+
################################################
65+
# $additionalTemplateSpec - Add more deployment template specification at this value
66+
# $additionalPodSpec - Add more pod specification at this value
67+
# $additionalContainerSpec - Add more container specification at this value
68+
additionalTemplateSpec: {}
69+
additionalPodSpec: {}
70+
additionalContainerSpec: {}

‎examples/helm-charts/roundcube/templates/deployment.yaml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,13 @@ spec:
1717
{{- if .Values.additionalLabels -}}
1818
{{- toYaml .Values.additionalLabels | nindent 8 }}
1919
{{- end }}
20+
{{- if .Values.additionalTemplateSpec -}}
21+
{{- toYaml .Values.additionalTemplateSpec | nindent 4 }}
22+
{{- end }}
2023
spec:
24+
{{- if .Values.additionalPodSpec -}}
25+
{{- toYaml .Values.additionalPodSpec | nindent 6 }}
26+
{{- end }}
2127
containers:
2228
- name: {{ .Chart.Name }}
2329
image: "{{ .Values.image.repository }}:{{ .Chart.AppVersion }}"
@@ -42,6 +48,9 @@ spec:
4248
ports:
4349
- name: http
4450
containerPort: 80
51+
{{- if .Values.additionalContainerSpec -}}
52+
{{- toYaml .Values.additionalContainerSpec | nindent 8 }}
53+
{{- end }}
4554
resources:
4655
{{- toYaml .Values.resources | nindent 12 }}
4756

0 commit comments

Comments
 (0)