Merge branch 'main' into kf-4049-bump-juju-3.1-uk8s-1.25

canonical · Sep 11, 2023 · 706962b · 706962b
2 parents 9b7ee2b + f998c24
commit 706962b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/config.yaml b/config.yaml
@@ -38,3 +38,7 @@ options:
       If not empty, this is a comma-separated list of paths, e.g. "/path1/,/path2/".
       That list defines which paths do not need to be authenticated on OIDC.
       The DEX path is always added to this list.
+  userid-claim:
+    type: string
+    default: 'email'
+    description: OpenID Connect claim whose value will be used as the userid.
diff --git a/src/charm.py b/src/charm.py
@@ -82,6 +82,7 @@ def service_environment(self):
             "OIDC_PROVIDER": f"{self.public_url}/dex",
             "OIDC_SCOPES": self.model.config["oidc-scopes"],
             "SERVER_PORT": self._http_port,
+            "USERID_CLAIM": self.model.config["userid-claim"],
             "USERID_HEADER": "kubeflow-userid",
             "USERID_PREFIX": "",
             "SESSION_STORE_PATH": "bolt.db",