From ff8adae0c7e2d437c463e3e156018d65ab5c7ec5 Mon Sep 17 00:00:00 2001 From: Seif Bassem <38246040+sebassem@users.noreply.github.com> Date: Tue, 17 Sep 2024 20:22:42 +0300 Subject: [PATCH] AIO patch (#2717) * add new images * removing --no-block * add wait for extension --- .../bicep/artifacts/PowerShell/LogonScript.ps1 | 5 ++--- .../bicep/artifacts/Settings/mqtt_listener.yml | 2 +- .../bicep/artifacts/Settings/mqtt_simulator.yml | 2 +- .../artifacts/PowerShell/Modules/manufacturing.psm1 | 13 ++++++++++--- 4 files changed, 14 insertions(+), 8 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 index 97fe9741c..f13878d58 100644 --- 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 @@ -202,7 +202,7 @@ az extension add --name connectedk8s --version 1.3.17 # Making extension install dynamic if ($aioConfig.AzCLIExtensions.Count -ne 0) { - Write-Host "[$(Get-Date -Format t)] INFO: Installing Azure CLI extensions: " ($aioConfig.AzCLIExtensions -join ', ') -ForegroundColor DarkGray + Write-Host "[$(Get-Date -Format t)] INFO: Installing Azure CLI extensions" -ForegroundColor DarkGray az config set extension.use_dynamic_install=yes_without_prompt --only-show-errors # Installing Azure CLI extensions foreach ($extension in $aioConfig.AzCLIExtensions) { @@ -413,7 +413,7 @@ $maxRetries = 5 $aioStatus = "notDeployed" do { - 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 --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 --only-show-errors if ($? -eq $false) { $aioStatus = "notDeployed" Write-Host "`n" @@ -448,7 +448,6 @@ if ($retryCount -eq $maxRetries) { exit 1 # Exit the script } - Write-Host "[$(Get-Date -Format t)] INFO: Started Event Grid role assignment process" -ForegroundColor DarkGray $extensionPrincipalId = (az k8s-extension list --cluster-name $arcClusterName --resource-group $resourceGroup --cluster-type "connectedClusters" --query "[?extensionType=='microsoft.iotoperations.mq']" --output json | ConvertFrom-Json).identity.principalId #$extensionPrincipalId = (az k8s-extension show --cluster-name $arcClusterName --name "mq" --resource-group $resourceGroup --cluster-type "connectedClusters" --output json | ConvertFrom-Json).identity.principalId 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 index 54ec3df88..98de044fc 100644 --- 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/mqtt-listener:latest + image: jumpstartprod.azurecr.io/contoso-bakeries-mqtt-listener:latest 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 index e5be1c538..43dd9d215 100644 --- 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/mqtt-simulator:latest + image: jumpstartprod.azurecr.io/contoso-bakeries-mqtt-simulator:latest resources: limits: cpu: "1" diff --git a/azure_jumpstart_ag/artifacts/PowerShell/Modules/manufacturing.psm1 b/azure_jumpstart_ag/artifacts/PowerShell/Modules/manufacturing.psm1 index 2d1c7c0eb..92c13b900 100644 --- a/azure_jumpstart_ag/artifacts/PowerShell/Modules/manufacturing.psm1 +++ b/azure_jumpstart_ag/artifacts/PowerShell/Modules/manufacturing.psm1 @@ -281,10 +281,17 @@ function Deploy-AIO { Write-Host "[$(Get-Date -Format t)] ERROR: AIO deployment failed. Exiting..." -ForegroundColor White -BackgroundColor Red exit 1 # Exit the script } - #Write-Host "AIO deployed successfully on the $clusterName cluster" -ForegroundColor Green - #Write-Host "`n" + + do{ + $extensionPrincipalId = (az k8s-extension list --cluster-name $arcClusterName --resource-group $resourceGroup --cluster-type "connectedClusters" --query "[?extensionType=='microsoft.iotoperations.mq']" --output json | ConvertFrom-Json).identity.principalId + if($null -eq $extensionPrincipalId){ + Write-Host "Waiting for the mq extension to be installed...waiting for 60 seconds" -ForegroundColor DarkGray + Start-Sleep -Seconds 60 + } + }until($null -ne $extensionPrincipalId) + Write-Host "[$(Get-Date -Format t)] INFO: Started Event Grid role assignment process" -ForegroundColor DarkGray - $extensionPrincipalId = (az k8s-extension list --cluster-name $arcClusterName --resource-group $resourceGroup --cluster-type "connectedClusters" --query "[?extensionType=='microsoft.iotoperations.mq']" --output json | ConvertFrom-Json).identity.principalId + #$extensionPrincipalId = (az k8s-extension list --cluster-name $arcClusterName --resource-group $resourceGroup --cluster-type "connectedClusters" --query "[?extensionType=='microsoft.iotoperations.mq']" --output json | ConvertFrom-Json).identity.principalId #$extensionPrincipalId = (az k8s-extension show --cluster-name $arcClusterName --name "mq" --resource-group $resourceGroup --cluster-type "connectedClusters" --output json | ConvertFrom-Json).identity.principalId $eventGridTopicId = (az eventgrid topic list --resource-group $resourceGroup --query "[0].id" -o tsv --only-show-errors) $eventGridNamespaceName = (az eventgrid namespace list --resource-group $resourceGroup --query "[0].name" -o tsv --only-show-errors)