Merge branch 'main' into global-imageregistry

Author: pierluigilenoci

helm/oauth2-proxy/README.md

@@ -225,6 +225,7 @@ The following table lists the configurable parameters of the oauth2-proxy chart
 | `serviceAccount.enabled`                              | create a service account                                                                                                                                                                                                                                         | `true`                                                                                               |
 | `serviceAccount.name`                                 | the service account name                                                                                                                                                                                                                                         | ``                                                                                                   |
 | `serviceAccount.annotations`                          | (optional) annotations for the service account                                                                                                                                                                                                                   | `{}`                                                                                                 |
+| `serviceAccount.imagePullSecrets`                     | imagePullSecrets for the service account                                                                                                                                                                                                                         | `[]`                                                                                                 |
 | `strategy`                                            | configure deployment strategy                                                                                                                                                                                                                                    | `{}`                                                                                                 |
 | `tolerations`                                         | list of node taints to tolerate                                                                                                                                                                                                                                  | `[]`                                                                                                 |
 | `securityContext.enabled`                             | enable Kubernetes security context on container                                                                                                                                                                                                                  | `true`                                                                                               |

helm/oauth2-proxy/templates/serviceaccount.yaml

@@ -17,6 +17,10 @@ metadata:
 {{- $labels | indent 4 }}
   name: {{ $saName }}
   namespace: {{ $namespace }}
+{{- with .Values.serviceAccount.imagePullSecrets }}
+imagePullSecrets:
+{{ toYaml . | indent 2 }}
+{{- end }}
 automountServiceAccountToken: {{ .Values.serviceAccount.automountServiceAccountToken }}
 {{- if and .Values.redis.enabled .Values.initContainers.waitForRedis.enabled }}
 ---

helm/oauth2-proxy/values.yaml

@@ -178,6 +178,9 @@ serviceAccount:
   name:
   automountServiceAccountToken: true
   annotations: {}
+  ## imagePullSecrets for the service account
+  imagePullSecrets: []
+    # - name: myRegistryKeySecretName
 
 # Network policy settings.
 networkPolicy: