Merge pull request #2790 from microsoft/main

Merge latest changes intoOctober data services release
microsoft · Oct 29, 2024 · e79086f · e79086f
2 parents 35c954e + 86bd83c
commit e79086f
Show file tree

Hide file tree

Showing 8 changed files with 77 additions and 15 deletions.
diff --git a/azure_edge_iot_ops_jumpstart/acsa_fault_detection/artifacts/LogonScript.ps1 b/azure_edge_iot_ops_jumpstart/acsa_fault_detection/artifacts/LogonScript.ps1
@@ -208,7 +208,7 @@ az account set --subscription $Env:subscriptionId
 az config set extension.use_dynamic_install=yes_without_prompt
 Write-Host "`n"
 Write-Host "Installing Azure CLI extensions"
-az extension add --name connectedk8s --version 1.9.3
+az extension add --name connectedk8s --version 1.3.17
 az extension add --name k8s-extension
 Write-Host "`n"
 

diff --git a/azure_edge_iot_ops_jumpstart/acsa_fault_detection/azuredeploy.json b/azure_edge_iot_ops_jumpstart/acsa_fault_detection/azuredeploy.json
@@ -154,7 +154,7 @@
         }
     },
     "variables": {
-        "templateBaseUrl": "[concat('https://raw.githubusercontent.com/', parameters('githubAccount'), '/azure_arc/', parameters('githubBranch'), '/azure_edge_iot_ops_jumpstart/acsa_fault_detection/')]",
+        "templateBaseUrl": "[concat('https://raw.githubusercontent.com/', parameters('githubAccount'), '/azure_arc/refs/heads/', parameters('githubBranch'), '/azure_edge_iot_ops_jumpstart/acsa_fault_detection/')]",
         "vmName": "[concat(parameters('vmName'))]",
         "publicIpAddressName": "[concat(parameters('vmName'), '-PIP' )]",
         "networkInterfaceName": "[concat(parameters('vmName'),'-NIC')]",

diff --git a/azure_edge_iot_ops_jumpstart/acsa_fault_detection/azuredeploy.parameters.json b/azure_edge_iot_ops_jumpstart/acsa_fault_detection/azuredeploy.parameters.json
@@ -0,0 +1,51 @@
+{
+  "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
+  "contentVersion": "1.0.0.0",
+  "parameters": {
+    "vmSize": {
+      "value": "Standard_D8s_v3"
+    },
+    "vmName": {
+      "value": "ACSA-Win-Demo"
+    },
+    "kubernetesDistribution": {
+      "value": "k3s"
+    },
+    "windowsNode": {
+      "value": false
+    },
+    "adminUsername": {
+      "value": "arcdemo"
+    },
+    "adminPassword": {
+      "value": "ArcPassword123!!"
+    },
+    "appId": {
+      "value": "XXXXXXXXX"
+    },
+    "password": {
+      "value": "XXXXXXXXXX"
+    },
+    "tenantId": {
+      "value": "XXXXXXXXX"
+    },
+    "subscriptionId": {
+      "value": "XXXXXXXXXX"
+    },
+    "location": {
+      "value": "XXXXXXXX"
+    },
+    "deployBastion": {
+      "value": true
+    },
+    "bastionHostName": {
+      "value": "Arc-Win-Demo-Bastion"
+    },
+    "storageAccountName": {
+      "value": "XXXXXXX"
+    },
+    "storageContainer": {
+      "value": "fault-detection"
+    }
+  }
+}
diff --git a/azure_edge_iot_ops_jumpstart/aio_manufacturing/bicep/artifacts/Settings/mqtt_listener.yml b/azure_edge_iot_ops_jumpstart/aio_manufacturing/bicep/artifacts/Settings/mqtt_listener.yml
@@ -16,7 +16,7 @@ spec:
     spec:
       containers:
       - name: mqtt-listener
-        image: jumpstartprod.azurecr.io/contoso-bakeries-mqtt-listener:latest
+        image: mcr.microsoft.com/jumpstart/scenarios/mqtt_listener:1.0.0
         resources:
           limits:
             memory: "512Mi"

diff --git a/azure_edge_iot_ops_jumpstart/aio_manufacturing/bicep/artifacts/Settings/mqtt_simulator.yml b/azure_edge_iot_ops_jumpstart/aio_manufacturing/bicep/artifacts/Settings/mqtt_simulator.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
         - name: mqtt-simulator
-          image: jumpstartprod.azurecr.io/contoso-bakeries-mqtt-simulator:latest
+          image: mcr.microsoft.com/jumpstart/scenarios/mqtt_simulator:1.0.0
           resources:
             limits:
               cpu: "1"

diff --git a/azure_jumpstart_ag/artifacts/PowerShell/AgConfig-manufacturing.psd1 b/azure_jumpstart_ag/artifacts/PowerShell/AgConfig-manufacturing.psd1
@@ -62,12 +62,12 @@
 
     # PowerShell modules
     PowerShellModules       = @(
-        'Az.ConnectedKubernetes',
-        'Az.KubernetesConfiguration',
-        'Az.Kusto',
-        'Az.EventGrid',
-        'Az.Storage',
-        'Az.EventHub'
+        @{name='Az.ConnectedKubernetes'; version="0.10.3"},
+        @{name='Az.KubernetesConfiguration'; version="latest"},
+        @{name='Az.Kusto'; version="latest"},
+        @{name='Az.EventGrid'; version="latest"},
+        @{name='Az.Storage'; version="latest"},
+        @{name='Az.EventHub'; version="latest"}
     )
 
     # Chocolatey packages list

diff --git a/azure_jumpstart_ag/artifacts/PowerShell/AgConfig-retail.psd1 b/azure_jumpstart_ag/artifacts/PowerShell/AgConfig-retail.psd1
@@ -52,9 +52,9 @@
 
     # PowerShell modules
     PowerShellModules       = @(
-        'Az.ConnectedKubernetes'
-        'Az.KubernetesConfiguration'
-        'Az.Kusto'
+        @{name='Az.ConnectedKubernetes'; version="0.10.3"},
+        @{name='Az.KubernetesConfiguration'; version="latest"},
+        @{name='Az.Kusto'; version="latest"}
     )
 
     # Chocolatey packages list

diff --git a/azure_jumpstart_ag/artifacts/PowerShell/Modules/common.psm1 b/azure_jumpstart_ag/artifacts/PowerShell/Modules/common.psm1
@@ -37,10 +37,21 @@ function Deploy-AzPowerShell {
     Connect-AzAccount -Credential $psCred -TenantId $Env:spnTenantId -ServicePrincipal -Subscription $subscriptionId | Out-File -Append -FilePath ($AgConfig.AgDirectories["AgLogsDir"] + "\AzPowerShell.log")
     Set-AzContext -Subscription $subscriptionId
     # Install PowerShell modules
+    # Making module install dynamic
     if ($AgConfig.PowerShellModules.Count -ne 0) {
-        Write-Host "[$(Get-Date -Format t)] INFO: Installing PowerShell modules: " ($AgConfig.PowerShellModules -join ', ') -ForegroundColor Gray
+        Write-Host "[$(Get-Date -Format t)] INFO: Installing PowerShell modules" -ForegroundColor Gray
         foreach ($module in $AgConfig.PowerShellModules) {
-            Install-Module -Name $module -Force | Out-File -Append -FilePath ($AgConfig.AgDirectories["AgLogsDir"] + "\AzPowerShell.log")
+            $moduleName = $module.name
+            $moduleVersion = $module.version
+            if ($moduleVersion -ne "latest" -and $null -ne $moduleVersion) {
+                # Install extension with specific version
+                Install-Module $moduleName -Repository PSGallery -Force -AllowClobber -ErrorAction Stop -RequiredVersion $moduleVersion
+                Write-Host "Installed $moduleName version $moduleVersion"
+            } else {
+                # Install extension without specifying a version
+                Install-Module -Name $moduleName -Force
+                Write-Host "Installed $moduleName (latest version)"
+            }
         }
     }