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.

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

Add compatibility prompt and notes for shared group mounting #2739

Merged
merged 7 commits into from
Sep 27, 2024
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
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
41 changes: 25 additions & 16 deletions src/_nebari/keycloak.py
Original file line number Diff line number Diff line change
Expand Up @@ -81,27 +81,16 @@ def list_users(keycloak_admin: keycloak.KeycloakAdmin):
)


def get_keycloak_admin_from_config(config: schema.Main):
keycloak_server_url = os.environ.get(
"KEYCLOAK_SERVER_URL", f"https://{config.domain}/auth/"
)

keycloak_username = os.environ.get("KEYCLOAK_ADMIN_USERNAME", "root")
keycloak_password = os.environ.get(
"KEYCLOAK_ADMIN_PASSWORD", config.security.keycloak.initial_root_password
)

should_verify_tls = config.certificate.type != CertificateEnum.selfsigned

def get_keycloak_admin(server_url, username, password, verify=False):
try:
keycloak_admin = keycloak.KeycloakAdmin(
server_url=keycloak_server_url,
username=keycloak_username,
password=keycloak_password,
server_url=server_url,
username=username,
password=password,
realm_name=os.environ.get("KEYCLOAK_REALM", "nebari"),
user_realm_name="master",
auto_refresh_token=("get", "put", "post", "delete"),
verify=should_verify_tls,
verify=verify,
)
except (
keycloak.exceptions.KeycloakConnectionError,
Expand All @@ -112,6 +101,26 @@ def get_keycloak_admin_from_config(config: schema.Main):
return keycloak_admin


def get_keycloak_admin_from_config(config: schema.Main):
keycloak_server_url = os.environ.get(
"KEYCLOAK_SERVER_URL", f"https://{config.domain}/auth/"
)

keycloak_username = os.environ.get("KEYCLOAK_ADMIN_USERNAME", "root")
keycloak_password = os.environ.get(
"KEYCLOAK_ADMIN_PASSWORD", config.security.keycloak.initial_root_password
)

should_verify_tls = config.certificate.type != CertificateEnum.selfsigned

return get_keycloak_admin(
server_url=keycloak_server_url,
username=keycloak_username,
password=keycloak_password,
verify=should_verify_tls,
)


def keycloak_rest_api_call(config: schema.Main = None, request: str = None):
"""Communicate directly with the Keycloak REST API by passing it a request"""
keycloak_server_url = os.environ.get(
Expand Down
76 changes: 76 additions & 0 deletions src/_nebari/upgrade.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
from typing_extensions import override

from _nebari.config import backup_configuration
from _nebari.keycloak import get_keycloak_admin
from _nebari.stages.infrastructure import (
provider_enum_default_node_groups_map,
provider_enum_name_map,
Expand Down Expand Up @@ -1235,6 +1236,81 @@ def _version_specific_upgrade(
)
rich.print("")

rich.print("\n ⚠️ Upgrade Warning ⚠️")

text = textwrap.dedent(
"""
Nebari version [green]2024.9.1[/green] introduces changes to how group
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this could use a little more detail explaining exactly what's going on here and specifying that the two options here are either all groups or just admin/analyst/developer. Suggested rewording below (please review for accuracy as well as grammar!)

Nebari version [green]2024.9.1[/green] introduces changes to how group directories are mounted in JupyterLab pods.

In previous versions of Nebari, every Keycloak group in the Nebari realm initiated the creation of a shared file directory that all group members could access in their JupyterLab pod at ~/shared/[group-name].

As of Nebari version [green]2024.9.1[/green], only groups that are assigned the jupyterhub Client Role allow-group-directory-creation will

You will be asked to confirm whether Nebari should now assign this role to all of your current groups. If not, only the admin, analyst, and developer group directories will be mounted in JupyterHub pods.

Regardless of your choice now, no data will be lost during this operation. You can re-mount group directories at any time by adding or removing the allow-group-directory-creation-role from your groups in the Keycloak UI.

For more information, please see the [green][link=https://www.nebari.dev/docs/how-tos/group-directory-creation]documentation[/link][/green].

directories are mounted in JupyterLab pods, now only groups with specific
permissions will have their directories mounted.

You will be asked to confirm how Nebari should handle your groups.
No data will be lost during this operation. You can reverse this at any time
by adding or removing the `allow-group-directory-creation-role` from your
groups in the Keycloak UI.


For more information, please see the [green][link=https://www.nebari.dev/docs/how-tos/group-directory-creation]documentation[/link][/green].
"""
)
rich.print(text)

confirm = Prompt.ask(
"[bold]Would you like Nebari to update your group permissions now?[/bold]",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If we are clear with what the feature is actually doing in the intro text, then I think we can change this to:

Would you like Nebari to assign allow-group-directory-creation-role to all of your groups now?

choices=["y", "N"],
default="N",
)
if confirm.lower() == "y":
# Proceed with updating group permissions
keycloak_admin = get_keycloak_admin(
server_url=f"https://{config['domain']}/auth/",
username="root",
password=config["security"]["keycloak"]["initial_root_password"],
)
client_id = keycloak_admin.get_client_id("jupyterhub")
_role_representation = keycloak_admin.get_role_by_id(
role_id=keycloak_admin.get_client_role_id(
client_id=client_id, role_name="allow-group-directory-creation-role"
)
)
groups = keycloak_admin.get_groups()
groups_with_roles = keycloak_admin.get_client_role_groups(
client_id=client_id, role_name="allow-group-directory-creation-role"
)
groups_without_role = [
group
for group in groups
if group["id"] not in [group["id"] for group in groups_with_roles]
]

if groups_without_role:
group_names = ", ".join(
[group["name"] for group in groups_without_role]
)
rich.print(
f"\n[bold]Updating the following groups with the required permissions:[/bold] {group_names}\n"
)
for group in groups_without_role:
_group_id = group["id"]
keycloak_admin.assign_group_client_roles(
group_id=_group_id,
client_id=client_id,
roles=[_role_representation],
)
rich.print(
"[green]Group permissions have been updated successfully.[/green]"
)
else:
rich.print(
"\n[green]All groups already have the required permissions.[/green]\n"
)
else:
rich.print(
"\n[bold yellow]You have chosen not to update group permissions at this time.[/bold yellow]"
)
rich.print(
"You can update them later by visiting the Keycloak UI and adding or removing the `allow-group-directory-creation-role` from your groups.\n"
)
return config


Expand Down
5 changes: 5 additions & 0 deletions tests/tests_unit/test_upgrade.py
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,11 @@ def mock_input(prompt, **kwargs):
== "Have you backed up your custom dashboards (if necessary), deleted the prometheus-node-exporter daemonset and updated the kube-prometheus-stack CRDs?"
):
return "y"
elif (
prompt
== "[bold]Would you like Nebari to update your group permissions now?[/bold]"
):
return "N"
# All other prompts will be answered with "y"
else:
return "y"
Expand Down
Loading