Skip to content

Commit f67966e

Browse files
committed
RELEASE/MAJOR: kubernetes-ingress: Tag release 1.36.0
Changes in kubernetes-ingress: - Enable automountServiceAccountToken use (#217) - Automatically mount /tmp and /run as tmpfs for S6 overlay v3 Signed-off-by: Dinko Korunic <[email protected]>
1 parent fadc3b2 commit f67966e

File tree

3 files changed

+31
-10
lines changed

3 files changed

+31
-10
lines changed

kubernetes-ingress/Chart.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ apiVersion: v2
1616
name: kubernetes-ingress
1717
description: A Helm chart for HAProxy Kubernetes Ingress Controller
1818
type: application
19-
version: 1.35.5
19+
version: 1.36.0
2020
appVersion: 1.10.10
2121
kubeVersion: ">=1.22.0-0"
2222
keywords:
@@ -32,4 +32,5 @@ maintainers:
3232
engine: gotpl
3333
annotations:
3434
artifacthub.io/changes: |
35-
- Remove unneeded initContainers from CRD job (#215)
35+
- Enable automountServiceAccountToken use (#217)
36+
- Automatically mount /tmp and /run as tmpfs for S6 overlay v3

kubernetes-ingress/templates/controller-daemonset.yaml

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -198,8 +198,13 @@ spec:
198198
{{ toYaml .Values.controller.lifecycle | indent 12 }}
199199
{{- end }}
200200
{{- end }}
201-
{{- if or .Values.controller.extraVolumeMounts .Values.aws.licenseConfigSecretName }}
202201
volumeMounts:
202+
- name: tmp
203+
mountPath: /tmp
204+
subPath: tmp
205+
- name: tmp
206+
mountPath: /run
207+
subPath: run
203208
{{- if .Values.aws.licenseConfigSecretName }}
204209
- name: aws-product-license
205210
readOnly: true
@@ -210,16 +215,22 @@ spec:
210215
{{- else if gt (len .Values.controller.extraVolumeMounts) 0 }}
211216
{{ toYaml .Values.controller.extraVolumeMounts | indent 12 }}
212217
{{- end }}
213-
{{- end}}
214218
{{- if .Values.controller.extraContainers }}
215219
{{- if eq "string" (printf "%T" .Values.controller.extraContainers) }}
216220
{{ tpl .Values.controller.extraContainers . | indent 8 }}
217221
{{- else }}
218222
{{ toYaml .Values.controller.extraContainers | indent 8 }}
219223
{{- end }}
220224
{{- end }}
221-
{{- if or .Values.controller.extraVolumes .Values.aws.licenseConfigSecretName }}
222225
volumes:
226+
- name: tmp
227+
{{- if semverCompare ">=1.21.0-0" .Capabilities.KubeVersion.Version }}
228+
emptyDir:
229+
medium: Memory
230+
sizeLimit: 64Mi
231+
{{- else }}
232+
emptyDir: {}
233+
{{- end }}
223234
{{- if .Values.aws.licenseConfigSecretName }}
224235
- name: aws-product-license
225236
secret:
@@ -231,7 +242,6 @@ spec:
231242
{{- else if gt (len .Values.controller.extraVolumes) 0 }}
232243
{{ toYaml .Values.controller.extraVolumes | indent 8 }}
233244
{{- end }}
234-
{{- end }}
235245
{{- with.Values.controller.initContainers }}
236246
initContainers:
237247
{{- toYaml . | nindent 8 }}

kubernetes-ingress/templates/controller-deployment.yaml

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -196,8 +196,13 @@ spec:
196196
{{ toYaml .Values.controller.lifecycle | indent 12 }}
197197
{{- end }}
198198
{{- end }}
199-
{{- if or .Values.controller.extraVolumeMounts .Values.aws.licenseConfigSecretName }}
200199
volumeMounts:
200+
- name: tmp
201+
mountPath: /tmp
202+
subPath: tmp
203+
- name: tmp
204+
mountPath: /run
205+
subPath: run
201206
{{- if .Values.aws.licenseConfigSecretName }}
202207
- name: aws-product-license
203208
readOnly: true
@@ -208,16 +213,22 @@ spec:
208213
{{- else if gt (len .Values.controller.extraVolumeMounts) 0 }}
209214
{{ toYaml .Values.controller.extraVolumeMounts | indent 12 }}
210215
{{- end }}
211-
{{- end}}
212216
{{- if .Values.controller.extraContainers }}
213217
{{- if eq "string" (printf "%T" .Values.controller.extraContainers) }}
214218
{{ tpl .Values.controller.extraContainers . | indent 8 }}
215219
{{- else }}
216220
{{ toYaml .Values.controller.extraContainers | indent 8 }}
217221
{{- end }}
218222
{{- end }}
219-
{{- if or .Values.controller.extraVolumes .Values.aws.licenseConfigSecretName }}
220223
volumes:
224+
- name: tmp
225+
{{- if semverCompare ">=1.21.0-0" .Capabilities.KubeVersion.Version }}
226+
emptyDir:
227+
medium: Memory
228+
sizeLimit: 64Mi
229+
{{- else }}
230+
emptyDir: {}
231+
{{- end }}
221232
{{- if .Values.aws.licenseConfigSecretName }}
222233
- name: aws-product-license
223234
secret:
@@ -229,7 +240,6 @@ spec:
229240
{{- else if gt (len .Values.controller.extraVolumes) 0 }}
230241
{{ toYaml .Values.controller.extraVolumes | indent 8 }}
231242
{{- end }}
232-
{{- end }}
233243
{{- with.Values.controller.initContainers }}
234244
initContainers:
235245
{{- toYaml . | nindent 8 }}

0 commit comments

Comments
 (0)