Skip to content

Commit

Permalink
Merge pull request #2299 from GeorgianaElena/fix-empty-admin
Browse files Browse the repository at this point in the history
Take into account all possible states of c.Authenticator.admin_users …
  • Loading branch information
GeorgianaElena authored Mar 3, 2023
2 parents ea9edbc + e9f58b3 commit 94bcaef
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion helm-charts/basehub/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -517,7 +517,11 @@ jupyterhub:
if add_staff_user_ids_to_admin_users:
user_id_type = get_config("custom.2i2c.add_staff_user_ids_of_type")
staff_user_ids = get_config(f"custom.2i2c.staff_{user_id_type}_ids", [])
c.Authenticator.admin_users.extend(staff_user_ids)
# `c.Authenticator.admin_users` can contain additional admins, can be an empty list,
# or it cannot be defined at all.
# This should cover all these cases.
staff_user_ids.extend(get_config("hub.config.Authenticator.admin_users", []))
c.Authenticator.admin_users = staff_user_ids
05-per-user-disk: |
# Optionally, create a PVC per user - useful for per-user databases
Expand Down

0 comments on commit 94bcaef

Please sign in to comment.