Merge branch 'main' into fix/2894-gcp-migrate-to-artifact-registry

nebari-dev · Jan 14, 2025 · f1c18bb · f1c18bb
2 parents cc58b47 + 062529b
commit f1c18bb
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 7 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/src/_nebari/stages/infrastructure/__init__.py b/src/_nebari/stages/infrastructure/__init__.py
@@ -106,7 +106,7 @@ class AzureInputVars(schema.Base):
     tags: Dict[str, str] = {}
     max_pods: Optional[int] = None
     network_profile: Optional[Dict[str, str]] = None
-    azure_policy_enabled: bool = None
+    azure_policy_enabled: Optional[bool] = None
     workload_identity_enabled: bool = False
 
 
@@ -374,6 +374,7 @@ class AzureProvider(schema.Base):
     network_profile: Optional[Dict[str, str]] = None
     max_pods: Optional[int] = None
     workload_identity_enabled: bool = False
+    azure_policy_enabled: Optional[bool] = None
 
     @model_validator(mode="before")
     @classmethod

diff --git a/src/_nebari/stages/infrastructure/template/azure/variables.tf b/src/_nebari/stages/infrastructure/template/azure/variables.tf
@@ -92,4 +92,5 @@ variable "authorized_ip_ranges" {
 variable "azure_policy_enabled" {
   description = "Enable Azure Policy"
   type        = bool
+  default     = false
 }
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,

diff --git a/tests/common/handlers.py b/tests/common/handlers.py
@@ -298,7 +298,9 @@ def _open_conda_store_service(self):
 
     def _open_new_environment_tab(self):
         self.page.get_by_label("Create a new environment in").click()
-        expect(self.page.get_by_text("Create Environment")).to_be_visible()
+        expect(
+            self.page.get_by_role("button", name="Create", exact=True)
+        ).to_be_visible()
 
     def _assert_user_namespace(self):
         expect(