Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow profiles to not mount secrets #145

Merged
merged 3 commits into from
Nov 20, 2024
Merged

Allow profiles to not mount secrets #145

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d4a9eb9
Allow profiles to not mount secrets
enolfc Nov 20, 2024
fd054e7
Linting fixes
enolfc Nov 20, 2024
163911e
Rename to `mount_secrets_volume`
enolfc Nov 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 18 additions & 8 deletions egi_notebooks_hub/egispawner.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,18 +52,18 @@ def __init__(self, *args, **kwargs):
self.token_secret_name = self._expand_user_properties(
self.token_secret_name_template
)
token_secret_volume_name = self._expand_user_properties(
self._token_secret_volume_name = self._expand_user_properties(
self.token_secret_volume_name_template
)
self.volumes.append(
{
"name": token_secret_volume_name,
"name": self._token_secret_volume_name,
"secret": {"secretName": self.token_secret_name},
}
)
self.volume_mounts.append(
{
"name": token_secret_volume_name,
"name": self._token_secret_volume_name,
"mountPath": self.token_mount_path,
"readOnly": True,
}
Expand Down Expand Up @@ -173,15 +173,25 @@ async def pre_spawn_hook(self, spawner):
# ensure we have a secret
await self._update_secret({})

def _adjust_secret_volume(self, profile):
if profile.get("mount_secrets_volume", True):
return profile
volume_mounts = profile.get("volume_mounts", self.volume_mounts)
new_mounts = []
for mount in self._sorted_dict_values(volume_mounts):
if mount["name"] == self._token_secret_volume_name:
self.log.debug(f"Removing secret volume mount {mount['name']} from pod")
else:
new_mounts.append(mount)
profile["kubespawner_override"]["volume_mounts"] = new_mounts
return profile

def _profile_filter(self, spawner):
profile_list = []
if spawner._profile_config:
groups = [g.name for g in spawner.user.groups]
for profile in spawner._profile_config:
profile_vos = profile.get("vo_claims", [])
if not profile_vos:
profile_list.append(profile)
else:
if any(i in groups for i in profile_vos):
profile_list.append(profile)
if not profile_vos or any(i in groups for i in profile_vos):
profile_list.append(self._adjust_secret_volume(profile))
return profile_list