Merge pull request #2410 from dkirby-ms/main

Update VI scenario with upstream changes to VI enabled by Arc extension deployment
microsoft · Feb 9, 2024 · b285a3a · b285a3a
2 parents 246fd48 + b135a4c
commit b285a3a
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 14 deletions.
diff --git a/azure_arc_k8s_jumpstart/aks_hybrid/aks_edge_essentials_single_vi/artifacts/LogonScript.ps1 b/azure_arc_k8s_jumpstart/aks_hybrid/aks_edge_essentials_single_vi/artifacts/LogonScript.ps1
@@ -136,6 +136,7 @@ Connect-AksEdgeArc -JsonConfigFilePath $tempDir\aksedge-config.json
 #####################################################################
 helm repo add ingress-nginx https://kubernetes.github.io/ingress-nginx
 helm repo update
+Start-Sleep -Seconds 5
 helm install ingress-nginx ingress-nginx/ingress-nginx
 
 #####################################################################
@@ -149,19 +150,24 @@ Start-Sleep -Seconds 30
 ### Video Indexer setup
 #####################################################################
 $viApiVersion="2023-06-02-preview" 
-$extensionName="videoindexer"
-#$version="1.0.28-preview" # switch to blank
+$extensionName="video-indexer"
+$version="1.0.41" # switch to blank
 $namespace="video-indexer"
 $releaseTrain="release" # switch to release
 $storageClass="longhorn"
 
 Write-Host "Create Cognitive Services on VI resource provider"
 $createResourceUri = "https://management.azure.com/subscriptions/${env:subscriptionId}/resourceGroups/${env:resourceGroup}/providers/Microsoft.VideoIndexer/accounts/${env:videoIndexerAccountName}/CreateExtensionDependencies?api-version=${viApiVersion}"
+
 $result = $(az rest --method post --uri $createResourceUri) | ConvertFrom-Json
 
-Write-Host "Retrieving Cognitive Service Credentials..."
+
 $getSecretsUri="https://management.azure.com/subscriptions/${env:subscriptionId}/resourceGroups/${env:resourceGroup}/providers/Microsoft.VideoIndexer/accounts/${env:videoIndexerAccountName}/ListExtensionDependenciesData?api-version=$viApiVersion"
-$csResourcesData=$(az rest --method post --uri $getSecretsUri) | ConvertFrom-Json
+while ($null -eq $csResourcesData) {
+    Write-Host "Retrieving Cognitive Service Credentials..."
+    $csResourcesData=$(az rest --method post --uri $getSecretsUri) | ConvertFrom-Json
+    Start-Sleep -Seconds 10
+}
 Write-Host
 
 Write-Host "Getting VM public IP address..."
@@ -177,14 +183,16 @@ az k8s-extension create --name $extensionName `
                         --cluster-name $clusterName `
                         --resource-group $Env:resourceGroup `
                         --cluster-type connectedClusters `
-                        --release-train $releaseTrain `
+                        --version $version `
                         --auto-upgrade-minor-version false `
                         --config-protected-settings "speech.endpointUri=$($csResourcesData.speechCognitiveServicesEndpoint)" `
                         --config-protected-settings "speech.secret=$($csResourcesData.speechCognitiveServicesPrimaryKey)" `
                         --config-protected-settings "translate.endpointUri=$($csResourcesData.translatorCognitiveServicesEndpoint)" `
                         --config-protected-settings "translate.secret=$($csResourcesData.translatorCognitiveServicesPrimaryKey)" `
-                        --config "videoIndexer.accountId=${Env:videoIndexerAccountId}" `
+                        --config-protected-settings "ocr.endpointUri=$($csResourcesData.ocrCognitiveServicesEndpoint)" `
+                        --config-protected-settings "ocr.secret=$($csResourcesData.ocrCognitiveServicesPrimaryKey)" `
                         --config "frontend.endpointUri=https://$ipAddress" `
+                        --config "videoIndexer.accountId=${Env:videoIndexerAccountId}" `
                         --config "storage.storageClass=$storageClass" `
                         --config "storage.accessMode=ReadWriteMany"
 
@@ -195,7 +203,7 @@ New-NetFirewallRule -DisplayName "Allow Inbound Port 443" -Direction Inbound -Lo
 
 Write-Host "Adding port forward for VI frontend..."
 Start-Sleep -Seconds 20
-$ing = kubectl get ing videoindexer-vi-arc -n $namespace -o json | ConvertFrom-Json
+$ing = kubectl get ing video-indexer-vi-arc -n $namespace -o json | ConvertFrom-Json
 $ingIp = $ing.status.loadBalancer.ingress.ip
 netsh interface portproxy add v4tov4 listenaddress=0.0.0.0 listenport=80 connectaddress=$ingIp connectport=80
 netsh interface portproxy add v4tov4 listenaddress=0.0.0.0 listenport=443 connectaddress=$ingIp connectport=443

diff --git a/azure_jumpstart_hcibox/artifacts/PowerShell/Bootstrap.ps1 b/azure_jumpstart_hcibox/artifacts/PowerShell/Bootstrap.ps1
@@ -149,21 +149,17 @@ Register-ScheduledTask -TaskName "HCIBoxLogonScript" -Trigger $Trigger -User $ad
 # Disable Edge 'First Run' Setup
 Write-Host "Configuring Microsoft Edge."
 $edgePolicyRegistryPath  = 'HKLM:SOFTWARE\Policies\Microsoft\Edge'
-$desktopSettingsRegistryPath = 'HKCU:SOFTWARE\Microsoft\Windows\Shell\Bags\1\Desktop'
 $firstRunRegistryName  = 'HideFirstRunExperience'
 $firstRunRegistryValue = '0x00000001'
 $savePasswordRegistryName = 'PasswordManagerEnabled'
 $savePasswordRegistryValue = '0x00000000'
-$autoArrangeRegistryName = 'FFlags'
-$autoArrangeRegistryValue = '1075839525'
 
 if (-NOT (Test-Path -Path $edgePolicyRegistryPath)) {
     New-Item -Path $edgePolicyRegistryPath -Force | Out-Null
 }
 
 New-ItemProperty -Path $edgePolicyRegistryPath -Name $firstRunRegistryName -Value $firstRunRegistryValue -PropertyType DWORD -Force
 New-ItemProperty -Path $edgePolicyRegistryPath -Name $savePasswordRegistryName -Value $savePasswordRegistryValue -PropertyType DWORD -Force
-Set-ItemProperty -Path $desktopSettingsRegistryPath -Name $autoArrangeRegistryName -Value $autoArrangeRegistryValue -Force
 
 # Change RDP Port
 Write-Host "Updating RDP Port - RDP port number from configuration is $rdpPort"
@@ -207,5 +203,5 @@ Install-WindowsFeature -Name Hyper-V -IncludeAllSubFeature -IncludeManagementToo
 # Clean up Bootstrap.log
 Write-Header "Clean up Bootstrap.log."
 Stop-Transcript
-$logSuppress = Get-Content $($HCIBoxConfig.Paths.LogsDir)\Bootstrap.log | Where-Object { $_ -notmatch "Host Application: powershell.exe" } 
-$logSuppress | Set-Content $($HCIBoxConfig.Paths.LogsDir)\Bootstrap.log -Force
+$logSuppress = Get-Content "$($HCIBoxConfig.Paths.LogsDir)\Bootstrap.log" | Where-Object { $_ -notmatch "Host Application: powershell.exe" } 
+$logSuppress | Set-Content "$($HCIBoxConfig.Paths.LogsDir)\Bootstrap.log" -Force
diff --git a/azure_jumpstart_hcibox/artifacts/PowerShell/New-HCIBoxCluster.ps1 b/azure_jumpstart_hcibox/artifacts/PowerShell/New-HCIBoxCluster.ps1
@@ -1482,7 +1482,7 @@ function Set-HCIDeployPrereqs {
             Get-NetAdapter StorageA | Disable-NetAdapter -Confirm:$false | Out-Null
             Get-NetAdapter StorageB | Disable-NetAdapter -Confirm:$false | Out-Null
 
-            #Invoke the registration script. For this preview release, only eastus region is supported.
+            #Invoke the registration script. For this release, only eastus region is supported.
             Invoke-AzStackHciArcInitialization -SubscriptionID $subId -ResourceGroup $resourceGroup -TenantID $tenantId -Region eastus -Cloud "AzureCloud" -ArmAccessToken $armtoken.Token -AccountID $clientId
 
             Get-NetAdapter StorageA | Enable-NetAdapter -Confirm:$false | Out-Null