From 452de56c5520ffb6273af9a85941b015ad3b6e5e Mon Sep 17 00:00:00 2001 From: eskild <42120229+iameskild@users.noreply.github.com> Date: Thu, 19 Oct 2023 10:53:14 -0700 Subject: [PATCH] Revert conda-store to v0.4.14, #2028 (#2074) --- src/_nebari/constants.py | 2 +- .../conda-store/config/conda_store_config.py | 13 ++++++------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/_nebari/constants.py b/src/_nebari/constants.py index d5d20d306..48e7ec0af 100644 --- a/src/_nebari/constants.py +++ b/src/_nebari/constants.py @@ -15,7 +15,7 @@ DEFAULT_NEBARI_IMAGE_TAG = CURRENT_RELEASE DEFAULT_NEBARI_WORKFLOW_CONTROLLER_IMAGE_TAG = CURRENT_RELEASE -DEFAULT_CONDA_STORE_IMAGE_TAG = "2023.9.2" +DEFAULT_CONDA_STORE_IMAGE_TAG = "v0.4.14" LATEST_SUPPORTED_PYTHON_VERSION = "3.10" diff --git a/src/_nebari/stages/kubernetes_services/template/modules/kubernetes/services/conda-store/config/conda_store_config.py b/src/_nebari/stages/kubernetes_services/template/modules/kubernetes/services/conda-store/config/conda_store_config.py index 6ed6232ba..6f9e1089d 100644 --- a/src/_nebari/stages/kubernetes_services/template/modules/kubernetes/services/conda-store/config/conda_store_config.py +++ b/src/_nebari/stages/kubernetes_services/template/modules/kubernetes/services/conda-store/config/conda_store_config.py @@ -132,13 +132,12 @@ async def authenticate(self, request): namespaces.add(group_name) role_bindings[f"{group_name}/*"] = roles - conda_store = await get_conda_store(request) - with conda_store.session_factory() as db: - for namespace in namespaces: - _namespace = api.get_namespace(db, name=namespace) - if _namespace is None: - db.add(orm.Namespace(name=namespace)) - db.commit() + conda_store = get_conda_store(request) + for namespace in namespaces: + _namespace = api.get_namespace(conda_store.db, name=namespace) + if _namespace is None: + conda_store.db.add(orm.Namespace(name=namespace)) + conda_store.db.commit() return schema.AuthenticationToken( primary_namespace=username,