Merge branch 'main' into update-k8s-max-version

nebari-dev · Jan 10, 2025 · f6062a7 · f6062a7
2 parents 5a17507 + 694d91b
commit f6062a7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/_nebari/constants.py b/src/_nebari/constants.py
@@ -16,7 +16,7 @@
 DEFAULT_NEBARI_IMAGE_TAG = CURRENT_RELEASE
 DEFAULT_NEBARI_WORKFLOW_CONTROLLER_IMAGE_TAG = CURRENT_RELEASE
 
-DEFAULT_CONDA_STORE_IMAGE_TAG = "2024.3.1"
+DEFAULT_CONDA_STORE_IMAGE_TAG = "2024.11.2"
 
 LATEST_SUPPORTED_PYTHON_VERSION = "3.10"
 

diff --git a/...es_services/template/modules/kubernetes/services/conda-store/config/conda_store_config.py b/...es_services/template/modules/kubernetes/services/conda-store/config/conda_store_config.py
@@ -10,9 +10,10 @@
 from pathlib import Path
 
 import requests
-from conda_store_server import api, orm, schema
+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.auth import GenericOAuthAuthentication
-from conda_store_server.server.dependencies import get_conda_store
 from conda_store_server.storage import S3Storage
 
 
@@ -422,8 +423,7 @@ async def authenticate(self, request):
             for namespace in namespaces:
                 _namespace = api.get_namespace(db, name=namespace)
                 if _namespace is None:
-                    db.add(orm.Namespace(name=namespace))
-                    db.commit()
+                    api.ensure_namespace(db, name=namespace)
 
         return schema.AuthenticationToken(
             primary_namespace=username,