feat: increment ACSA version deployed with AIO (#478)

Azure · Jan 14, 2025 · 17d7c25 · 17d7c25
1 parent 383db8d
commit 17d7c25
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 12 deletions.
diff --git a/azext_edge/constants.py b/azext_edge/constants.py
@@ -7,7 +7,7 @@
 
 import os
 
-VERSION = "1.1.0a1"
+VERSION = "1.1.0b1"
 EXTENSION_NAME = "azure-iot-ops"
 EXTENSION_ROOT = os.path.dirname(os.path.abspath(__file__))
 USER_AGENT = "IotOperationsCliExtension/{}".format(VERSION)
diff --git a/azext_edge/edge/commands_edge.py b/azext_edge/edge/commands_edge.py
@@ -187,7 +187,7 @@ def create_instance(
     if broker_backend_redundancy_factor < 2:
         logger.warning(
             "Deploying Azure IoT Operations with less than 2 broker backend replicas "
-            "prevents future version upgrades https://aka.ms/aio-broker-upgrade."
+            "prevents future version upgrades."
         )
         should_bail = not should_continue_prompt(confirm_yes=confirm_yes, context="Create")
         if should_bail:

diff --git a/azext_edge/edge/providers/orchestration/template.py b/azext_edge/edge/providers/orchestration/template.py
@@ -48,13 +48,13 @@ def copy(self) -> "TemplateBlueprint":
 
 
 TEMPLATE_BLUEPRINT_ENABLEMENT = TemplateBlueprint(
-    commit_id="ade4c2645c9ee6c4a1038f2bfef12773ca30691a",
+    commit_id="db955b7c1f5942ed6adb355b6ce997d7c753a055",
     content={
         "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#",
         "languageVersion": "2.0",
         "contentVersion": "1.0.0.0",
         "metadata": {
-            "_generator": {"name": "bicep", "version": "0.31.34.60546", "templateHash": "3322333164880261279"}
+            "_generator": {"name": "bicep", "version": "0.32.4.45862", "templateHash": "3534807839334108747"}
         },
         "definitions": {
             "_1.AdvancedConfig": {
@@ -213,7 +213,7 @@ def copy(self) -> "TemplateBlueprint":
             "VERSIONS": {
                 "platform": "0.7.6",
                 "secretStore": "0.6.7",
-                "containerStorage": "2.2.2",
+                "containerStorage": "2.2.3",
                 "openServiceMesh": "1.2.10",
             },
             "TRAINS": {
@@ -249,7 +249,6 @@ def copy(self) -> "TemplateBlueprint":
                         "installTrustManager": "[if(equals(parameters('trustConfig').source, 'SelfSigned'), 'true', 'false')]",
                     },
                 },
-                "dependsOn": ["cluster"],
             },
             "secret_store_extension": {
                 "type": "Microsoft.KubernetesConfiguration/extensions",
@@ -267,7 +266,7 @@ def copy(self) -> "TemplateBlueprint":
                         "validatingAdmissionPolicies.applyPolicies": "false",
                     },
                 },
-                "dependsOn": ["aio_platform_extension", "cluster"],
+                "dependsOn": ["aio_platform_extension"],
             },
             "open_service_mesh_extension": {
                 "type": "Microsoft.KubernetesConfiguration/extensions",
@@ -288,7 +287,6 @@ def copy(self) -> "TemplateBlueprint":
                         "osm.osm.injector.resource.requests.cpu": "100m",
                     },
                 },
-                "dependsOn": ["cluster"],
             },
             "container_storage_extension": {
                 "type": "Microsoft.KubernetesConfiguration/extensions",
@@ -303,7 +301,7 @@ def copy(self) -> "TemplateBlueprint":
                     "releaseTrain": "[coalesce(tryGet(tryGet(parameters('advancedConfig'), 'edgeStorageAccelerator'), 'train'), variables('TRAINS').containerStorage)]",
                     "configurationSettings": "[union(createObject('edgeStorageConfiguration.create', 'true', 'feature.diskStorageClass', variables('kubernetesStorageClass')), if(equals(tryGet(tryGet(parameters('advancedConfig'), 'edgeStorageAccelerator'), 'faultToleranceEnabled'), true()), createObject('acstorConfiguration.create', 'true', 'acstorConfiguration.properties.diskMountPoint', '/mnt'), createObject()))]",
                 },
-                "dependsOn": ["aio_platform_extension", "cluster", "open_service_mesh_extension"],
+                "dependsOn": ["aio_platform_extension", "open_service_mesh_extension"],
             },
         },
         "outputs": {
@@ -349,13 +347,13 @@ def copy(self) -> "TemplateBlueprint":
 )
 
 TEMPLATE_BLUEPRINT_INSTANCE = TemplateBlueprint(
-    commit_id="ade4c2645c9ee6c4a1038f2bfef12773ca30691a",
+    commit_id="db955b7c1f5942ed6adb355b6ce997d7c753a055",
     content={
         "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#",
         "languageVersion": "2.0",
         "contentVersion": "1.0.0.0",
         "metadata": {
-            "_generator": {"name": "bicep", "version": "0.31.34.60546", "templateHash": "9520109892569949061"}
+            "_generator": {"name": "bicep", "version": "0.32.4.45862", "templateHash": "16118026265927091454"}
         },
         "definitions": {
             "_1.AdvancedConfig": {
@@ -596,7 +594,6 @@ def copy(self) -> "TemplateBlueprint":
                     "scope": "[variables('AIO_EXTENSION_SCOPE')]",
                     "configurationSettings": "[union(variables('defaultAioConfigurationSettings'), coalesce(tryGet(tryGet(parameters('advancedConfig'), 'aio'), 'configurationSettingsOverride'), createObject()))]",
                 },
-                "dependsOn": ["cluster"],
             },
             "customLocation": {
                 "type": "Microsoft.ExtendedLocation/customLocations",