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

Update conda-store-server image + use public auth_schema module for AuthenticationToken #2931

Merged
merged 6 commits into from
Feb 6, 2025
Merged

Update conda-store-server image + use public auth_schema module for AuthenticationToken #2931

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c2b1b32
Bump conda-store version
marcelovilla Jan 30, 2025
f9e08b4
Use public auth_schema module for AuthenticationToken
soapy1 Jan 31, 2025
dbea89d
Bump conda-store to 2025.2.1
soapy1 Feb 4, 2025
e88cd89
[pre-commit.ci] Apply automatic pre-commit fixes
pre-commit-ci[bot] Feb 4, 2025
e7f7d63
Merge branch 'main' into update-conda-store-config
viniciusdc Feb 6, 2025
49abd58
Merge branch 'main' into update-conda-store-config
viniciusdc Feb 6, 2025
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
2 changes: 1 addition & 1 deletion src/_nebari/constants.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
DEFAULT_NEBARI_IMAGE_TAG = CURRENT_RELEASE
DEFAULT_NEBARI_WORKFLOW_CONTROLLER_IMAGE_TAG = CURRENT_RELEASE

DEFAULT_CONDA_STORE_IMAGE_TAG = "2024.11.2"
DEFAULT_CONDA_STORE_IMAGE_TAG = "2025.2.1"

LATEST_SUPPORTED_PYTHON_VERSION = "3.10"

Expand Down
8 changes: 4 additions & 4 deletions ...es_services/template/modules/kubernetes/services/conda-store/config/conda_store_config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@

import requests
from conda_store_server import api
from conda_store_server._internal import schema
from conda_store_server._internal.server.dependencies import get_conda_store
from conda_store_server.server import schema as auth_schema
from conda_store_server.server.auth import GenericOAuthAuthentication
from conda_store_server.storage import S3Storage

Expand Down Expand Up @@ -357,7 +357,7 @@ def _get_conda_store_client_roles_for_user(
return client_roles_rich

def _get_current_entity_bindings(self, username):
entity = schema.AuthenticationToken(
entity = auth_schema.AuthenticationToken(
primary_namespace=username, role_bindings={}
)
self.log.info(f"entity: {entity}")
Expand Down Expand Up @@ -387,7 +387,7 @@ async def authenticate(self, request):

# superadmin gets access to everything
if "conda_store_superadmin" in user_data.get("roles", []):
return schema.AuthenticationToken(
return auth_schema.AuthenticationToken(
primary_namespace=username,
role_bindings={"*/*": {"admin"}},
)
Expand Down Expand Up @@ -425,7 +425,7 @@ async def authenticate(self, request):
if _namespace is None:
api.ensure_namespace(db, name=namespace)

return schema.AuthenticationToken(
return auth_schema.AuthenticationToken(
primary_namespace=username,
role_bindings=role_bindings,
)
Expand Down
Loading