RELEASE/MINOR: kubernetes-ingress: Tag release 1.36.1

Changes in kubernetes-ingress:
- Move automountServiceAccountToken flag from pods to ServiceAccount
  configuration (fixes for #217)

RELEASE/MAJOR: haproxy: Tag release 1.20.0

Changes in haproxy:
- Update base image to HAProxy 2.9.2
- Add automountServiceAccountToken feature for ServiceAccount (#192)

Signed-off-by: Dinko Korunic <dkorunic@haproxy.com>

Author: dkorunic

haproxy/Chart.yaml

@@ -16,8 +16,8 @@ apiVersion: v2
 name: haproxy
 description: A Helm chart for HAProxy on Kubernetes
 type: application
-version: 1.19.3
-appVersion: 2.8.2
+version: 1.20.0
+appVersion: 2.9.2
 kubeVersion: ">=1.17.0-0"
 keywords:
   - haproxy
@@ -31,5 +31,5 @@ maintainers:
 engine: gotpl
 annotations:
   artifacthub.io/changes: |
-    - Update base image to HAProxy 2.8.2
-    - Fix includes name in haproxy charts (#203)
+    - Update base image to HAProxy 2.9.2
+    - Add automountServiceAccountToken feature for ServiceAccount (#192)

haproxy/templates/serviceaccount.yaml

@@ -26,4 +26,7 @@ metadata:
   annotations:
     {{- toYaml . | nindent 4 }}
   {{- end }}
+{{- if hasKey .Values.serviceAccount "automountServiceAccountToken" }}
+automountServiceAccountToken: {{ .Values.serviceAccount.automountServiceAccountToken }}
+{{- end }}
 {{- end }}

haproxy/values.yaml

@@ -20,6 +20,7 @@ serviceAccount:
   annotations: {}
   create: true
   name:
+  automountServiceAccountToken: true
 
 ## Override namespace for for the whole chart
 ## If namespaceOverride is set, helm will use it's value instead of .Release.Namespace for all chart components.

kubernetes-ingress/Chart.yaml

@@ -16,7 +16,7 @@ apiVersion: v2
 name: kubernetes-ingress
 description: A Helm chart for HAProxy Kubernetes Ingress Controller
 type: application
-version: 1.36.0
+version: 1.36.1
 appVersion: 1.10.10
 kubeVersion: ">=1.22.0-0"
 keywords:
@@ -32,5 +32,4 @@ maintainers:
 engine: gotpl
 annotations:
   artifacthub.io/changes: |
-    - Enable automountServiceAccountToken use (#217)
-    - Automatically mount /tmp and /run as tmpfs for S6 overlay v3
+    - Move automountServiceAccountToken flag from pods to ServiceAccount configuration (fixes for #217)

kubernetes-ingress/templates/controller-deployment.yaml

@@ -57,9 +57,6 @@ spec:
     spec:
       enableServiceLinks: {{ .Values.controller.enableServiceLinks }}
       serviceAccountName: {{ include "kubernetes-ingress.serviceAccountName" . }}
-      {{- if hasKey .Values.controller "automountServiceAccountToken" }}
-      automountServiceAccountToken: {{ .Values.controller.automountServiceAccountToken }}
-      {{- end }}
       terminationGracePeriodSeconds: {{ .Values.controller.terminationGracePeriodSeconds }}
 {{- with .Values.controller.topologySpreadConstraints }}
       topologySpreadConstraints:

kubernetes-ingress/templates/controller-serviceaccount.yaml

@@ -26,4 +26,7 @@ metadata:
     app.kubernetes.io/managed-by: {{ .Release.Service }}
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/version: {{ .Chart.AppVersion }}
+{{- if hasKey .Values.serviceAccount "automountServiceAccountToken" }}
+automountServiceAccountToken: {{ .Values.serviceAccount.automountServiceAccountToken }}
+{{- end }}
 {{- end -}}

kubernetes-ingress/values.yaml

@@ -43,6 +43,7 @@ namespace:
 serviceAccount:
   create: true
   name:
+  automountServiceAccountToken: true
 
 ## Namespace override
 ## Allow the release namespace to be overridden for multi-namespace deployments in combined charts
@@ -538,7 +539,3 @@ controller:
   ## Toggle to add the RBAC permissions needed for the techdump tool.
   techdump:
     enabled: false
-
-  ## automountServiceAccountToken
-  ## Automatically mount a ServiceAccount's API credentials
-  automountServiceAccountToken: true