From 9858144b40f5d0d2c477efeca47d5e3020a10140 Mon Sep 17 00:00:00 2001 From: dkirby-ms Date: Sun, 3 Mar 2024 19:05:43 -0600 Subject: [PATCH 1/3] fix logging --- .../artifacts/PowerShell/Configure-AKSWorkloadCluster.ps1 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/azure_jumpstart_hcibox/artifacts/PowerShell/Configure-AKSWorkloadCluster.ps1 b/azure_jumpstart_hcibox/artifacts/PowerShell/Configure-AKSWorkloadCluster.ps1 index fba5b8ba1d..e5f5ffe0d5 100644 --- a/azure_jumpstart_hcibox/artifacts/PowerShell/Configure-AKSWorkloadCluster.ps1 +++ b/azure_jumpstart_hcibox/artifacts/PowerShell/Configure-AKSWorkloadCluster.ps1 @@ -26,6 +26,7 @@ $location = "eastus" $lnetName = "hcibox-aks-lnet-vlan110" $customLocName = $HCIBoxConfig.rbCustomLocationName $WarningPreference = "SilentlyContinue" +$ErrorActionPreference = "SilentlyContinue" Invoke-Command -ComputerName "$($HCIBoxConfig.NodeHostConfig[0].Hostname).$($HCIBoxConfig.SDNDomainFQDN)" -Credential $domainCred -Authentication CredSSP -ArgumentList $HCIBoxConfig -ScriptBlock { $HCIBoxConfig = $args[0] az login --service-principal --username $using:spnClientID --password=$using:spnSecret --tenant $using:spnTenantId @@ -43,6 +44,7 @@ Invoke-Command -ComputerName "$($HCIBoxConfig.NodeHostConfig[0].Hostname).$($HCI az stack-hci-vm network lnet create --subscription $using:subId --resource-group $using:rg --custom-location $customLocationID --location $using:location --name $using:lnetName --vm-switch-name $switchName --ip-allocation-method "static" --address-prefixes $addressPrefixes --gateway $gateway --dns-servers $dnsServers --vlan $vlanid } $WarningPreference = "SilentlyContinue" +$ErrorActionPreference = "Continue" az login --service-principal --username $env:spnClientID --password=$env:spnClientSecret --tenant $env:spnTenantId az extension add --name customlocation From 66908a2f6de756523c0d8b018f627fc415840816 Mon Sep 17 00:00:00 2001 From: dkirby-ms Date: Sun, 3 Mar 2024 19:47:44 -0600 Subject: [PATCH 2/3] aks --- .../artifacts/PowerShell/Configure-AKSWorkloadCluster.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure_jumpstart_hcibox/artifacts/PowerShell/Configure-AKSWorkloadCluster.ps1 b/azure_jumpstart_hcibox/artifacts/PowerShell/Configure-AKSWorkloadCluster.ps1 index e5f5ffe0d5..4a88988ec4 100644 --- a/azure_jumpstart_hcibox/artifacts/PowerShell/Configure-AKSWorkloadCluster.ps1 +++ b/azure_jumpstart_hcibox/artifacts/PowerShell/Configure-AKSWorkloadCluster.ps1 @@ -51,6 +51,6 @@ az extension add --name customlocation az extension add -n aksarc --upgrade $customLocationID=(az customlocation show --resource-group $env:resourceGroup --name $HCIBoxConfig.rbCustomLocationName --query id -o tsv) $lnetId="/subscriptions/$subId/resourceGroups/$env:resourceGroup/providers/Microsoft.AzureStackHCI/logicalnetworks/$lnetName" -az aksarc create -n $HCIBoxConfig.AKSworkloadClusterName -g $env:resourceGroup --custom-location $customlocationID --vnet-ids $lnetId --aad-admin-group-object-ids $groupObjectID --generate-ssh-keys --control-plane-ip $HCIBoxConfig.AKSControlPlaneIP +az aksarc create -n $HCIBoxConfig.AKSworkloadClusterName -g $env:resourceGroup --custom-location $customlocationID --vnet-ids $lnetId --aad-admin-group-object-ids $groupObjectID --generate-ssh-keys --control-plane-ip $HCIBoxConfig.AKSControlPlaneIP az aksarc create -n $HCIBoxConfig.AKSworkloadClusterName -g $env:resourceGroup --custom-location $customlocationID --vnet-ids $lnetId --aad-admin-group-object-ids $groupObjectID --generate-ssh-keys --control-plane-ip $HCIBoxConfig.AKSControlPlaneIP Stop-Transcript From 2667a6546917eb880b9308d18a59cb2028104f4a Mon Sep 17 00:00:00 2001 From: dkirby-ms Date: Sun, 3 Mar 2024 19:49:01 -0600 Subject: [PATCH 3/3] typo --- .../artifacts/PowerShell/Configure-AKSWorkloadCluster.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure_jumpstart_hcibox/artifacts/PowerShell/Configure-AKSWorkloadCluster.ps1 b/azure_jumpstart_hcibox/artifacts/PowerShell/Configure-AKSWorkloadCluster.ps1 index 4a88988ec4..e5f5ffe0d5 100644 --- a/azure_jumpstart_hcibox/artifacts/PowerShell/Configure-AKSWorkloadCluster.ps1 +++ b/azure_jumpstart_hcibox/artifacts/PowerShell/Configure-AKSWorkloadCluster.ps1 @@ -51,6 +51,6 @@ az extension add --name customlocation az extension add -n aksarc --upgrade $customLocationID=(az customlocation show --resource-group $env:resourceGroup --name $HCIBoxConfig.rbCustomLocationName --query id -o tsv) $lnetId="/subscriptions/$subId/resourceGroups/$env:resourceGroup/providers/Microsoft.AzureStackHCI/logicalnetworks/$lnetName" -az aksarc create -n $HCIBoxConfig.AKSworkloadClusterName -g $env:resourceGroup --custom-location $customlocationID --vnet-ids $lnetId --aad-admin-group-object-ids $groupObjectID --generate-ssh-keys --control-plane-ip $HCIBoxConfig.AKSControlPlaneIP az aksarc create -n $HCIBoxConfig.AKSworkloadClusterName -g $env:resourceGroup --custom-location $customlocationID --vnet-ids $lnetId --aad-admin-group-object-ids $groupObjectID --generate-ssh-keys --control-plane-ip $HCIBoxConfig.AKSControlPlaneIP +az aksarc create -n $HCIBoxConfig.AKSworkloadClusterName -g $env:resourceGroup --custom-location $customlocationID --vnet-ids $lnetId --aad-admin-group-object-ids $groupObjectID --generate-ssh-keys --control-plane-ip $HCIBoxConfig.AKSControlPlaneIP Stop-Transcript