Support --google-group option (#97)

* Support `--google-group` option * Bump chart version to 6.2.3 * Bump chart version to 6.2.4 Co-authored-by: Roei Zavida <[email protected]>
oauth2-proxy · Aug 27, 2022 · 3b2725d · 3b2725d
1 parent 2513e41
commit 3b2725d
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 1 deletion.
diff --git a/helm/oauth2-proxy/Chart.yaml b/helm/oauth2-proxy/Chart.yaml
@@ -1,5 +1,5 @@
 name: oauth2-proxy
-version: 6.2.3
+version: 6.2.4
 apiVersion: v2
 appVersion: 7.3.0
 home: https://oauth2-proxy.github.io/oauth2-proxy/

diff --git a/helm/oauth2-proxy/README.md b/helm/oauth2-proxy/README.md
@@ -112,6 +112,7 @@ Parameter | Description | Default
 `config.google.adminEmail` | user impersonated by the google service account | `""`
 `config.google.serviceAccountJson` | google service account json contents | `""`
 `config.google.existingConfig` | existing Kubernetes configmap to use for the service account file. See [google secret template](https://github.com/oauth2-proxy/manifests/blob/master/helm/oauth2-proxy/templates/google-secret.yaml) for the required values | `nil`
+`config.google.groups` | restrict logins to members of these google groups | `[]`
 `extraArgs` | key:value list of extra arguments to give the binary | `{}`
 `extraEnv` | key:value list of extra environment variables to give the binary | `[]`
 `extraVolumes` | list of extra volumes | `[]`

diff --git a/helm/oauth2-proxy/templates/deployment.yaml b/helm/oauth2-proxy/templates/deployment.yaml
@@ -87,6 +87,11 @@ spec:
           - --google-admin-email={{ .adminEmail }}
           - --google-service-account-json=/google/service-account.json
         {{- end }}
+        {{- if .groups }}
+        {{- range $group := .groups }}
+          - --google-group={{ $group }}
+        {{- end }}
+        {{- end }}
         {{- end }}
         {{- if .Values.htpasswdFile.enabled }}
           - --htpasswd-file=/etc/oauth2_proxy/htpasswd/users.txt

diff --git a/helm/oauth2-proxy/values.yaml b/helm/oauth2-proxy/values.yaml
@@ -26,6 +26,10 @@ config:
     # Alternatively, use an existing secret (see google-secret.yaml for required fields)
     # Example:
     # existingSecret: google-secret
+    # groups: []
+    # Example:
+    #  - [email protected]
+    #  - [email protected]
   # Default configuration, to be overridden
   configFile: |-
     email_domains = [ "*" ]