Merge pull request #2696 from sebassem/aio_version_revert

Revert AIO version and changes
microsoft · Sep 4, 2024 · 0ddbf92 · 0ddbf92
2 parents e2ac8d0 + cf51d21
commit 0ddbf92
Show file tree

Hide file tree

Showing 7 changed files with 97 additions and 87 deletions.
diff --git a/azure_edge_iot_ops_jumpstart/aio_manufacturing/bicep/artifacts/PowerShell/LogonScript.ps1 b/azure_edge_iot_ops_jumpstart/aio_manufacturing/bicep/artifacts/PowerShell/LogonScript.ps1
@@ -206,10 +206,21 @@ if ($aioConfig.AzCLIExtensions.Count -ne 0) {
     az config set extension.use_dynamic_install=yes_without_prompt --only-show-errors
     # Installing Azure CLI extensions
     foreach ($extension in $aioConfig.AzCLIExtensions) {
-        az extension add --name $extension --system --only-show-errors
+        $extensionName = $extension.name
+        $extensionVersion = $extension.version
+        if ($extensionVersion -ne "latest" -and $null -ne $extensionVersion) {
+            # Install extension with specific version
+            az extension add --name $extensionName --version $extensionVersion --system --only-show-errors
+            Write-Host "Installed $extensionName version $extensionVersion"
+        } else {
+            # Install extension without specifying a version
+            az extension add --name $extensionName --system --only-show-errors
+            Write-Host "Installed $extensionName (latest version)"
+        }
     }
 }
 
+
 Write-Host "[$(Get-Date -Format t)] INFO: Az CLI configuration complete!" -ForegroundColor Green
 Write-Host
 
@@ -402,7 +413,7 @@ $maxRetries = 5
 $aioStatus = "notDeployed"
 
 do {
-    az iot ops init --cluster $arcClusterName -g $resourceGroup --kv-id $keyVaultId --sp-app-id $spnClientID --sp-secret $spnClientSecret --broker-service-type loadBalancer --add-insecure-listener true --simulate-plc true --only-show-errors
+    az iot ops init --cluster $arcClusterName.toLower() -g $resourceGroup --kv-id $keyVaultId --sp-app-id $spnClientId --sp-secret $spnClientSecret --sp-object-id $spnObjectId --mq-service-type loadBalancer --mq-insecure true --simulate-plc false --disable-rsync-rules true --no-block --only-show-errors
     if ($? -eq $false) {
         $aioStatus = "notDeployed"
         Write-Host "`n"

diff --git a/azure_edge_iot_ops_jumpstart/aio_manufacturing/bicep/artifacts/PowerShell/aioConfig.psd1 b/azure_edge_iot_ops_jumpstart/aio_manufacturing/bicep/artifacts/PowerShell/aioConfig.psd1
@@ -48,13 +48,13 @@
 
     # Az CLI required extensions
     AzCLIExtensions         = @(
-        'k8s-extension',
-        'k8s-configuration',
-        'eventgrid',
-        'customlocation',
-        'kusto',
-        'storage-preview',
-        'azure-iot-ops'
+        @{name="k8s-extension"; version="latest"},
+        @{name="k8s-configuration"; version="latest"},
+        @{name="eventgrid"; version="latest"},
+        @{name="customlocation"; version="latest"},
+        @{name="kusto"; version="latest"},
+        @{name="storage-preview"; version="latest"},
+        @{name="azure-iot-ops"; version="0.5.1b1"}
     )
 
     # PowerShell modules

diff --git a/...e_edge_iot_ops_jumpstart/aio_manufacturing/bicep/artifacts/Settings/mq_cloudConnector.yml b/...e_edge_iot_ops_jumpstart/aio_manufacturing/bicep/artifacts/Settings/mq_cloudConnector.yml
@@ -1,40 +1,34 @@
-apiVersion: connectivity.iotoperations.azure.com/v1beta1
-kind: DataflowEndpoint
-metadata:
-  name: eventgrid
-spec:
-  endpointType: mqtt
-  authentication:
-    method: systemAssignedManagedIdentity
-    systemAssignedManagedIdentitySettings:
-      audience: https://eventgrid.azure.net
-  mqttSettings:
-    host: eventGridPlaceholder:8883
-    tls:
-      mode: Enabled
----
-apiVersion: connectivity.iotoperations.azure.com/v1beta1
-kind: Dataflow
+apiVersion: mq.iotoperations.azure.com/v1beta1
+kind: MqttBridgeTopicMap
 metadata:
   name: my-topic-map
+  namespace: azure-iot-operations
 spec:
-  profileRef: my-dataflow-profile
-  operations:
-  - operationType: source
-    name: source1
-    sourceSettings:
-      endpointRef: mq
-      dataSources:
-        - "topic/#"
-  - operationType: destination
-    name: destination1
-    destinationSettings:
-      endpointRef: eventgrid
-      dataDestination: factory-gateway-
+  mqttBridgeConnectorRef: my-mqtt-bridge
+  routes:
+    - direction: local-to-remote
+      name: route-to-eventgrid
+      qos: 1
+      source: "topic/#"
 ---
-apiVersion: connectivity.iotoperations.azure.com/v1beta1
-kind: DataflowProfile
+apiVersion: mq.iotoperations.azure.com/v1beta1
+kind: MqttBridgeConnector
 metadata:
-  name: my-dataflow-profile
+  name: my-mqtt-bridge
+  namespace: azure-iot-operations
 spec:
-  instanceCount: 1
+  image:
+    repository: mcr.microsoft.com/azureiotoperations/mqttbridge
+    tag: 0.1.0-preview
+    pullPolicy: IfNotPresent
+  protocol: v5
+  bridgeInstances: 1
+  clientIdPrefix: factory-gateway-
+  logLevel: debug
+  remoteBrokerConnection:
+    endpoint: eventGridPlaceholder:8883
+    tls:
+      tlsEnabled: true
+    authentication:
+      systemAssignedManagedIdentity:
+        audience: https://eventgrid.azure.net
diff --git a/azure_jumpstart_ag/artifacts/PowerShell/AgConfig-manufacturing.psd1 b/azure_jumpstart_ag/artifacts/PowerShell/AgConfig-manufacturing.psd1
@@ -51,13 +51,13 @@
 
     # Az CLI required extensions
     AzCLIExtensions         = @(
-        'k8s-extension',
-        'k8s-configuration',
-        'eventgrid',
-        'customlocation',
-        'kusto',
-        'storage-preview'
-        'azure-iot-ops'
+        @{name="k8s-extension"; version="latest"},
+        @{name="k8s-configuration"; version="latest"},
+        @{name="eventgrid"; version="latest"},
+        @{name="customlocation"; version="latest"},
+        @{name="kusto"; version="latest"},
+        @{name="storage-preview"; version="latest"},
+        @{name="azure-iot-ops"; version="0.5.1b1"}
     )
 
     # PowerShell modules

diff --git a/azure_jumpstart_ag/artifacts/PowerShell/Modules/common.psm1 b/azure_jumpstart_ag/artifacts/PowerShell/Modules/common.psm1
@@ -14,10 +14,21 @@ function Deploy-AzCLI {
         az config set extension.use_dynamic_install=yes_without_prompt --only-show-errors
         # Installing Azure CLI extensions
         foreach ($extension in $AgConfig.AzCLIExtensions) {
-            az extension add --name $extension --system --only-show-errors
+            $extensionName = $extension.name
+            $extensionVersion = $extension.version
+            if ($extensionVersion -ne "latest" -and $null -ne $extensionVersion) {
+                # Install extension with specific version
+                az extension add --name $extensionName --version $extensionVersion --system --only-show-errors
+                Write-Host "Installed $extensionName version $extensionVersion"
+            } else {
+                # Install extension without specifying a version
+                az extension add --name $extensionName --system --only-show-errors
+                Write-Host "Installed $extensionName (latest version)"
+            }
         }
     }
 
+
     Write-Host "[$(Get-Date -Format t)] INFO: Az CLI configuration complete!" -ForegroundColor Green
     Write-Host
 }

diff --git a/azure_jumpstart_ag/artifacts/PowerShell/Modules/manufacturing.psm1 b/azure_jumpstart_ag/artifacts/PowerShell/Modules/manufacturing.psm1
@@ -243,13 +243,13 @@ function Deploy-AIO {
             --only-show-errors
 
         do {
-            az iot ops init --cluster $arcClusterName -g $resourceGroup --kv-id $keyVaultId --sp-app-id $spnClientId --sp-secret $spnClientSecret --sp-object-id $spnObjectId --broker-service-type loadBalancer --add-insecure-listener true --simulate-plc false --no-block --only-show-errors
+            az iot ops init --cluster $arcClusterName.toLower() -g $resourceGroup --kv-id $keyVaultId --sp-app-id $spnClientId --sp-secret $spnClientSecret --sp-object-id $spnObjectId --mq-service-type loadBalancer --mq-insecure true --simulate-plc false --disable-rsync-rules true --no-block --only-show-errors
             if ($? -eq $false) {
                 $aioStatus = "notDeployed"
                 Write-Host "`n"
                 Write-Host "[$(Get-Date -Format t)] Error: An error occured while deploying AIO on the cluster...Retrying" -ForegroundColor DarkRed
                 Write-Host "`n"
-                az iot ops init --cluster $arcClusterName -g $resourceGroup --kv-id $keyVaultId --sp-app-id $spnClientId --sp-secret $spnClientSecret --sp-object-id $spnObjectId --broker-service-type loadBalancer --add-insecure-listener true --simulate-plc false --no-block --only-show-errors
+                az iot ops init --cluster $arcClusterName.toLower() -g $resourceGroup --kv-id $keyVaultId --sp-app-id $spnClientId --sp-secret $spnClientSecret --sp-object-id $spnObjectId --mq-service-type loadBalancer --mq-insecure true --simulate-plc false --disable-rsync-rules true --no-block --only-show-errors
                 $retryCount++
             }
             else {

diff --git a/azure_jumpstart_ag/artifacts/settings/mq_cloudConnector.yml b/azure_jumpstart_ag/artifacts/settings/mq_cloudConnector.yml
@@ -1,40 +1,34 @@
-apiVersion: connectivity.iotoperations.azure.com/v1beta1
-kind: DataflowEndpoint
-metadata:
-  name: eventgrid
-spec:
-  endpointType: mqtt
-  authentication:
-    method: systemAssignedManagedIdentity
-    systemAssignedManagedIdentitySettings:
-      audience: https://eventgrid.azure.net
-  mqttSettings:
-    host: eventGridPlaceholder:8883
-    tls:
-      mode: Enabled
----
-apiVersion: connectivity.iotoperations.azure.com/v1beta1
-kind: Dataflow
+apiVersion: mq.iotoperations.azure.com/v1beta1
+kind: MqttBridgeTopicMap
 metadata:
   name: my-topic-map
+  namespace: azure-iot-operations
 spec:
-  profileRef: my-dataflow-profile
-  operations:
-  - operationType: source
-    name: source1
-    sourceSettings:
-      endpointRef: mq
-      dataSources:
-        - "topic/#"
-  - operationType: destination
-    name: destination1
-    destinationSettings:
-      endpointRef: eventgrid
-      dataDestination: factory-gateway-
+  mqttBridgeConnectorRef: my-mqtt-bridge
+  routes:
+    - direction: local-to-remote
+      name: route-to-eventgrid
+      qos: 1
+      source: "topic/#"
 ---
-apiVersion: connectivity.iotoperations.azure.com/v1beta1
-kind: DataflowProfile
+apiVersion: mq.iotoperations.azure.com/v1beta1
+kind: MqttBridgeConnector
 metadata:
-  name: my-dataflow-profile
+  name: my-mqtt-bridge
+  namespace: azure-iot-operations
 spec:
-  instanceCount: 1
+  image:
+    repository: mcr.microsoft.com/azureiotoperations/mqttbridge
+    tag: 0.1.0-preview
+    pullPolicy: IfNotPresent
+  protocol: v5
+  bridgeInstances: 1
+  clientIdPrefix: factory-gateway-
+  logLevel: debug
+  remoteBrokerConnection:
+    endpoint: eventGridPlaceholder:8883
+    tls:
+      tlsEnabled: true
+    authentication:
+      systemAssignedManagedIdentity:
+        audience: https://eventgrid.azure.net