Merge branch 'main' into revisionHistoryLimit

Author: pierluigilenoci

helm/oauth2-proxy/Chart.yaml

@@ -1,5 +1,5 @@
 name: oauth2-proxy
-version: 6.9.2
+version: 6.10.1
 apiVersion: v2
 appVersion: 7.4.0
 home: https://oauth2-proxy.github.io/oauth2-proxy/

helm/oauth2-proxy/README.md

@@ -117,6 +117,7 @@ Parameter | Description | Default
 `config.google.groups` | restrict logins to members of these google groups | `[]`
 `containerPort` | used to customise port on the deployment | `""`
 `extraArgs` | Extra arguments to give the binary. Either as a map with key:value pairs or as a list type, which allows to configure the same flag multiple times. (e.g. `["--allowed-role=CLIENT_ID:CLIENT_ROLE_NAME_A", "--allowed-role=CLIENT_ID:CLIENT_ROLE_NAME_B"]`). | `{}` or `[]`
+`extraContainers` | List of extra containers to be added to the pod | `[]`
 `extraEnv` | key:value list of extra environment variables to give the binary | `[]`
 `extraVolumes` | list of extra volumes | `[]`
 `extraVolumeMounts` | list of extra volumeMounts | `[]`
@@ -319,4 +320,4 @@ config:
     cookie_domains = [ ".domain.com", ".otherdomain.io" ]
     whitelist_domains = [ ".domain.com", ".otherdomain.io"]
     provider = "google"
-```
+```

helm/oauth2-proxy/templates/deployment.yaml

@@ -256,6 +256,9 @@ spec:
 {{- $securityContext := unset .Values.securityContext "enabled" }}
         securityContext:
           {{- toYaml $securityContext | nindent 10 }}
+{{- end }}
+{{- if .Values.extraContainers }}
+  {{- toYaml .Values.extraContainers | nindent 6 }}
 {{- end }}
       volumes:
 {{- with .Values.config.google }}

helm/oauth2-proxy/values.yaml

@@ -175,6 +175,11 @@ extraVolumeMounts: []
   # - mountPath: /etc/ssl/certs/
   #   name: ca-bundle-cert
 
+# Additional containers to be added to the pod.
+extraContainers: []
+  #  - name: my-sidecar
+  #    image: nginx:latest
+
 priorityClassName: ""
 
 # Host aliases, useful when working "on premise" where (public) DNS resolver does not know about my hosts.