From 9a678c4f6567cc3314da1d5274f9c7f43e5987ae Mon Sep 17 00:00:00 2001 From: Vanshika Reddy Date: Mon, 15 Apr 2024 14:36:02 -0400 Subject: [PATCH 01/22] adding arm templates --- aks-arc/aks-hci/armtemplate.json | 220 ++++++++++++++++++++++ aks-arc/aks-hci/azs.parameters.json | 65 +++++++ aks-arc/aks-vmware/armtemplateVmware.json | 203 ++++++++++++++++++++ aks-arc/aks-vmware/deploy.ps1 | 160 ++++++++++++++++ aks-arc/aks-vmware/getDeployStatus.ps1 | 51 +++++ aks-arc/aks-vmware/vmware.parameters.json | 62 ++++++ 6 files changed, 761 insertions(+) create mode 100644 aks-arc/aks-hci/armtemplate.json create mode 100644 aks-arc/aks-hci/azs.parameters.json create mode 100644 aks-arc/aks-vmware/armtemplateVmware.json create mode 100644 aks-arc/aks-vmware/deploy.ps1 create mode 100644 aks-arc/aks-vmware/getDeployStatus.ps1 create mode 100644 aks-arc/aks-vmware/vmware.parameters.json diff --git a/aks-arc/aks-hci/armtemplate.json b/aks-arc/aks-hci/armtemplate.json new file mode 100644 index 000000000000..b5e5a8c2487a --- /dev/null +++ b/aks-arc/aks-hci/armtemplate.json @@ -0,0 +1,220 @@ +{ + "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#", + "contentVersion": "1.0.0.0", + "parameters": { + "provisionedClusterName": { + "type": "string", + "defaultValue": "", + "metadata": { + "description": "The name of the AKS Arc Cluster resource." + } + }, + "location": { + "type": "string", + "defaultValue": "eastus", + "metadata": { + "description": "The location of the AKS Arc Cluster resource." + } + }, + "resourceTags": { + "type": "object", + "defaultValue": {} + }, + "connectedClustersApiVersion": { + "type": "String", + "defaultValue": "" + }, + "provisionedClustersApiVersion": { + "type": "String", + "defaultValue": "" + }, + + "sshRSAPublicKey": { + "type": "string", + "metadata": { + "description": "Configure all linux machines with the SSH RSA public key string. Your key should include three parts, for example 'ssh-rsa AAAAB...snip...UcyupgH '" + } + }, + "enableAHUB": { + "type": "string", + "defaultValue": "NotApplicable", + "metadata": { + "description": "Azure Hybrid Benefit for Windows Server licenses. NotApplicable, True, False." + } + }, + "agentName": { + "type": "string", + "defaultValue": "nodepool", + "metadata": { + "description": "The name of the node pool." + } + }, + "agentVMSize": { + "type": "string", + "defaultValue": "Standard_A4_v2", + "metadata": { + "description": "The VM size for node pools." + } + }, + "agentCount": { + "type": "int", + "defaultValue": 1, + "minValue": 1, + "maxValue": 50, + "metadata": { + "description": "The number of nodes for the cluster." + } + }, + "agentOsType": { + "type": "string", + "defaultValue": "Linux", + "metadata": { + "description": "The OS Type for the agent pool. Values are Linux and Windows." + } + }, + "loadBalancerCount": { + "type": "int", + "defaultValue": 0, + "metadata": { + "description": "The number of load balancers." + } + }, + "kubernetesVersion": { + "type": "string", + "metadata": { + "description": "The version of Kubernetes." + } + }, + "controlPlaneNodeCount": { + "type": "int", + "defaultValue": 1, + "minValue": 1, + "maxValue": 5, + "metadata": { + "description": "The number of control plane nodes for the cluster." + } + }, + "controlPlaneIp": { + "type": "string", + "defaultValue": "", + "metadata": { + "description": "Control plane IP address." + } + }, + "controlPlaneVMSize": { + "type": "string", + "defaultValue": "Standard_A4_v2", + "metadata": { + "description": "The VM size for control plane." + } + }, + "vnetSubnetIds": { + "type": "array", + "metadata": { + "description": "List of subnet Ids for the AKS cluster." + } + }, + "podCidr": { + "type": "string", + "defaultValue": "10.244.0.0/16", + "metadata": { + "description": "The VM size for control plane." + } + }, + "networkPolicy": { + "type": "string", + "defaultValue": "calico", + "metadata": { + "description": "Network policy to use for Kubernetes pods. Only options supported is calico." + } + }, + "customLocation": { + "type": "string", + "metadata": { + "description": "Fully qualified custom location ARM resource Id." + } + } + }, + "resources": [ + { + "apiVersion": "[parameters('connectedClustersApiVersion')]", + "type": "Microsoft.Kubernetes/ConnectedClusters", + "kind": "ProvisionedCluster", + "location": "[parameters('location')]", + "name": "[parameters('provisionedClusterName')]", + "tags": "[parameters('resourceTags')]", + "identity": { + "type": "SystemAssigned" + }, + "properties": { + "agentPublicKeyCertificate":"" , + "aadProfile": { + "enableAzureRBAC": false + } + } + }, + { + "apiVersion": "[parameters('provisionedClustersApiVersion')]", + "type": "microsoft.hybridcontainerservice/provisionedclusterinstances", + "name": "default", + "scope": "[concat('Microsoft.Kubernetes/ConnectedClusters', '/', parameters('provisionedClusterName'))]", + "dependsOn": [ + "[resourceId('Microsoft.Kubernetes/ConnectedClusters', parameters('provisionedClusterName'))]" + ], + "properties": { + "agentPoolProfiles": [ + { + "count": "[parameters('agentCount')]", + "name":"[parameters('agentName')]", + "osType": "[parameters('agentOsType')]", + "vmSize": "[parameters('agentVMSize')]" + } + ], + "cloudProviderProfile": { + "infraNetworkProfile": { + "vnetSubnetIds": "[parameters('vnetSubnetIds')]" + } + }, + "controlPlane": { + "count": "[parameters('controlPlaneNodeCount')]", + "controlPlaneEndpoint": { + "hostIP": "[parameters('controlPlaneIp')]" + }, + "vmSize": "[parameters('controlPlaneVMSize')]" + }, + "licenseProfile": { + "azureHybridBenefit": "[parameters('enableAHUB')]" + }, + "kubernetesVersion": "[parameters('kubernetesVersion')]", + "linuxProfile": { + "ssh": { + "publicKeys": [ + { + "keyData": "[parameters('sshRSAPublicKey')]" + } + ] + } + }, + "networkProfile": { + "loadBalancerProfile": { + "count": "[parameters('loadBalancerCount')]" + }, + "networkPolicy": "[parameters('networkPolicy')]", + "podCidr": "[parameters('podCidr')]" + }, + "storageProfile": { + "nfsCsiDriver": { + "enabled": false + }, + "smbCsiDriver": { + "enabled": false + } + } + } + // "extendedLocation": { + // "name": "[parameters('customLocation')]", + // "type": "CustomLocation" + // } + } + ] + } \ No newline at end of file diff --git a/aks-arc/aks-hci/azs.parameters.json b/aks-arc/aks-hci/azs.parameters.json new file mode 100644 index 000000000000..7c9b53539e60 --- /dev/null +++ b/aks-arc/aks-hci/azs.parameters.json @@ -0,0 +1,65 @@ +{ + "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#", + "contentVersion": "1.0.0.0", + "parameters": { + "provisionedClusterName": { + "value": "TODO: Fill in parameter value" + }, + "location": { + "value": "eastus" + }, + "resourceTags": { + "value": {} + }, + "sshRSAPublicKey": { + "value": "TODO: Fill in parameter value" + }, + "enableAHUB": { + "value": "NotApplicable" + }, + "agentName": { + "value": "nodepool" + }, + "agentVMSize": { + "value": "Standard_A4_v2" + }, + "agentCount": { + "value": 1 + }, + "agentOsType": { + "value": "Linux" + }, + "loadBalancerCount": { + "value": 0 + }, + "kubernetesVersion": { + "value": "1.26.6" + }, + "apiversion":{ + "value": "2024-01-01" + }, + "controlPlaneNodeCount": { + "value": 1 + }, + "controlPlaneIp": { + "value": "TODO: Fill in parameter value" + }, + "controlPlaneVMSize": { + "value": "Standard_A4_v2" + }, + "vnetSubnetIds": { + "value": [ + "TODO: Fill in parameter value" + ] + }, + "podCidr": { + "value": "10.244.0.0/16" + }, + "networkPolicy": { + "value": "calico" + }, + "customLocation": { + "value": "TODO: Fill in parameter value" + } + } +} \ No newline at end of file diff --git a/aks-arc/aks-vmware/armtemplateVmware.json b/aks-arc/aks-vmware/armtemplateVmware.json new file mode 100644 index 000000000000..438b126f98d2 --- /dev/null +++ b/aks-arc/aks-vmware/armtemplateVmware.json @@ -0,0 +1,203 @@ +{ + "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#", + "contentVersion": "1.0.0.0", + "parameters": { + "provisionedClusterName": { + "type": "string", + "defaultValue": "aksarc-armcluster", + "metadata": { + "description": "The name of the AKS Arc Cluster resource." + } + }, + "location": { + "type": "string", + "defaultValue": "eastus", + "metadata": { + "description": "The location of the AKS Arc Cluster resource." + } + }, + "resourceTags": { + "type": "object", + "defaultValue": {} + }, + "sshRSAPublicKey": { + "type": "string", + "metadata": { + "description": "Configure all linux machines with the SSH RSA public key string. Your key should include three parts, for example 'ssh-rsa AAAAB...snip...UcyupgH '" + } + }, + "enableAHUB": { + "type": "string", + "defaultValue": "NotApplicable", + "metadata": { + "description": "Azure Hybrid Benefit for Windows Server licenses. NotApplicable, True, False." + } + }, + "agentName": { + "type": "string", + "defaultValue": "nodepool", + "metadata": { + "description": "The name of the node pool." + } + }, + "agentVMSize": { + "type": "string", + "defaultValue": "Standard_A4_v2", + "metadata": { + "description": "The VM size for node pools." + } + }, + "agentCount": { + "type": "int", + "defaultValue": 1, + "minValue": 1, + "maxValue": 50, + "metadata": { + "description": "The number of nodes for the cluster." + } + }, + "agentOsType": { + "type": "string", + "defaultValue": "Linux", + "metadata": { + "description": "The OS Type for the agent pool. Values are Linux and Windows." + } + }, + "loadBalancerCount": { + "type": "int", + "defaultValue": 0, + "metadata": { + "description": "The number of load balancers." + } + }, + "kubernetesVersion": { + "type": "string", + "metadata": { + "description": "The version of Kubernetes." + } + }, + "controlPlaneNodeCount": { + "type": "int", + "defaultValue": 1, + "minValue": 1, + "maxValue": 5, + "metadata": { + "description": "The number of control plane nodes for the cluster." + } + }, + "controlPlaneIp": { + "type": "string", + "defaultValue": "", + "metadata": { + "description": "Control plane IP address." + } + }, + "controlPlaneVMSize": { + "type": "string", + "defaultValue": "Standard_A4_v2", + "metadata": { + "description": "The VM size for control plane." + } + }, + "vnetSubnetIds": { + "type": "array", + "metadata": { + "description": "List of subnet Ids for the AKS cluster." + } + }, + "podCidr": { + "type": "string", + "defaultValue": "10.244.0.0/16", + "metadata": { + "description": "The VM size for control plane." + } + }, + "networkPolicy": { + "type": "string", + "defaultValue": "calico", + "metadata": { + "description": "Network policy to use for Kubernetes pods. Only options supported is calico." + } + }, + "customLocation": { + "type": "string", + "metadata": { + "description": "Fully qualified custom location ARM resource Id." + } + } + }, + "resources": [ + { + "apiVersion": "2023-11-01-preview", + "type": "Microsoft.Kubernetes/ConnectedClusters", + "kind": "ProvisionedCluster", + "location": "[parameters('location')]", + "name": "[parameters('provisionedClusterName')]", + "tags": "[parameters('resourceTags')]", + "identity": { + "type": "SystemAssigned" + }, + "properties": { + "agentPublicKeyCertificate":"" , + "aadProfile": { + "enableAzureRBAC": false + } + } + }, + { + "apiVersion": "2023-11-15-preview", + "type": "microsoft.hybridcontainerservice/provisionedclusterinstances", + "name": "default", + "scope": "[concat('Microsoft.Kubernetes/ConnectedClusters', '/', parameters('provisionedClusterName'))]", + "dependsOn": [ + "[resourceId('Microsoft.Kubernetes/ConnectedClusters', parameters('provisionedClusterName'))]" + ], + "properties": { + "agentPoolProfiles": [ + { + "count": "[parameters('agentCount')]", + "name":"[parameters('agentName')]", + "osType": "[parameters('agentOsType')]", + "vmSize": "[parameters('agentVMSize')]" + } + ], + "cloudProviderProfile": { + "infraNetworkProfile": { + "vnetSubnetIds": "[parameters('vnetSubnetIds')]" + } + }, + "controlPlane": { + "count": "[parameters('controlPlaneNodeCount')]", + "controlPlaneEndpoint": { + "hostIP": "[parameters('controlPlaneIp')]" + }, + "vmSize": "[parameters('controlPlaneVMSize')]" + }, + "licenseProfile": { + "azureHybridBenefit": "[parameters('enableAHUB')]" + }, + "kubernetesVersion": "[parameters('kubernetesVersion')]", + "linuxProfile": { + "ssh": { + "publicKeys": [ + { + "keyData": "[parameters('sshRSAPublicKey')]" + } + ] + } + }, + "networkProfile": { + "loadBalancerProfile": { + "count": "[parameters('loadBalancerCount')]" + }, + "networkPolicy": "[parameters('networkPolicy')]", + "podCidr": "[parameters('podCidr')]" + } + }, + "extendedLocation": { + "name": "[parameters('customLocation')]", + "type": "CustomLocation" + } + } + ] + } diff --git a/aks-arc/aks-vmware/deploy.ps1 b/aks-arc/aks-vmware/deploy.ps1 new file mode 100644 index 000000000000..15f9bfd6b6e8 --- /dev/null +++ b/aks-arc/aks-vmware/deploy.ps1 @@ -0,0 +1,160 @@ +# Deploy AKS Arc clusters on vmware in batches +[CmdletBinding()] +param ( + [Parameter(Mandatory=$true)] + [string] + [ValidateScript({Test-Path $_ -PathType Leaf})] + $ControlplaneStaticIPfile = "availip.txt", + + [Parameter(Mandatory=$true)] + [ValidateScript({Test-Path $_ -PathType Leaf})] + [string] + $ArmTemplateFile = "armtemplate.json", + + [Parameter(Mandatory=$true)] + [string] + [ValidateScript({Test-Path $_ -PathType Leaf})] + $ArmTemplateParametersFile = "vmware.parameters.json", + + [Parameter(Mandatory=$true)] + [string] + $ResourceGroup = 'sarathys', + + [Parameter(Mandatory=$true)] + [string] + $ServicePrincipalId, + + [Parameter(Mandatory=$true)] + [securestring] + $ServicePrincipalSecret, + + [Parameter(Mandatory=$true)] + [string] + $TenantId = 'microsoft.onmicrosoft.com' +) + +# Path: ARMtemplates/deploy.ps1 + +function Login { + param ( + [Parameter(Mandatory=$true)] + [string] + $ServicePrincipalId, + + [Parameter(Mandatory=$true)] + [securestring] + $ServicePrincipalSecret, + + [Parameter(Mandatory=$true)] + [string] + $TenantId = 'microsoft.onmicrosoft.com' + ) + + $ErrorActionPreference = 'stop' + $ServicePrincipalSecret = ConvertFrom-SecureString -SecureString $ServicePrincipalSecret + az login --service-principal -u $ServicePrincipalId -p $ServicePrincipalSecret --tenant $TenantId +} + + +function Save-DeploymentInfo($deploymentName, $clusterName, $rg) +{ + $cluster = az aksarc show -n "$clusterName" -g $rg | ConvertFrom-Json + Write-Verbose -Message "az deployment show deployment: $deploymentName" -Verbose + $depInfo = az deployment group show -n $deploymentName -g $rg | ConvertFrom-Json + $errorInfo = $null + if($null -ne $depInfo) + { + if($cluster.properties.provisioningState -eq 'Failed') + { + Write-Verbose -Message "cluster $clusterName provisioning has failed" -Verbose + $errorInfo = @{ClusterName = "$clusterName" + Error = $cluster.properties.status.errorMessage + AddOnNotReady = ($c.properties.status.controlPlaneStatus | ? {$_.ready -ne 'True'} ) + ArmDeployment = $depInfo.name + ArmDeployError = ($depInfo.properties.error.details | select message).message + ArmDeployDuration = $depInfo.properties.duration + } + } + else + { + Write-Verbose -Message "cluster $clusterName provisioning has succeeded." -Verbose + } + } + + $deployInfo = @{DeploymentName = $deploymentName; ClusterName = $clusterName; ErrorInfo = $errorInfo} + + Write-Verbose -Message "Deployment info for deployment: $deploymentName clusterName: $clusterName saved to $resultsFile" -Verbose + $deployInfo | ConvertTo-Json | Out-File $resultsFile -Append +} + + +# main + +$ErrorActionPreference = 'continue' + +# get mmdd prefix +$prefix = (Get-Date).ToString("MMdd") +$armDeployPrefix = "a$prefix-" +$clusPrefix = "c$prefix-" + +$ips = Get-Content $ControlplaneStaticIPfile -ErrorAction Stop + +$batchSize = 10 +$batchNum = 0 +$r = [System.Random]::new() +$batchSize = $r.Next(1, 10) +$iteration = 0 +$rg = 'sarathys' + +mkdir c:\aksarc -Force +$resultsFile = "C:\aksarc\results.json" + +Login -ServicePrincipalId $ServicePrincipalId -ServicePrincipalSecret $ServicePrincipalSecret -TenantId $TenantId + +while($true) +{ + $iteration++ + Write-Verbose -Message "[$(Get-Date)] START iteration $iteration" -Verbose + for($i=0; $i -lt $ips.Count; $i = $i + $batchSize) + { + $batchNum++ + Write-Verbose -Message "[$(Get-Date)] START batch $batchNum deployment, batch size = $batchSize" -Verbose + for($j=$i; ($j -lt ($i + $batchSize)) -and ($j -lt $ips.Count - 1); $j++) + { + $controlPlaneIp = $ips[$j] + $controlPlaneIpRes = $controlPlaneIp.Replace('.','-') + $deploymentName = "$armDeployPrefix$controlPlaneIpRes" + $clusterName = "$clusPrefix$controlPlaneIpRes" + Write-Verbose -Message "[$(Get-Date)] Starting template deployment $deploymentName with control plane IP: $controlPlaneIp clusterName $clusterName" -Verbose + az deployment group create --name $deploymentName --resource-group sarathys --template-file .\armtemplate.json --parameters `@vmware.parametersLoop.json ` + --parameters controlPlaneIp=$controlPlaneIp --parameters provisionedClusterName=$clusterName --no-wait + } + + for($j=$i; ($j -lt ($i + $batchSize)) -and ($j -lt $ips.Count - 1); $j++) + { + $controlPlaneIp = $ips[$j] + $controlPlaneIpRes = $controlPlaneIp.Replace('.','-') + $deploymentName = "$armDeployPrefix$controlPlaneIpRes" + + Write-Verbose -Message "[$(Get-Date)] WAIT for deployment $deploymentName to be created, timeout 1h." -Verbose + az deployment group wait --name $deploymentName --resource-group sarathys --created + } + + + for($j=$i; ($j -lt ($i + $batchSize)) -and ($j -lt $ips.Count - 1); $j++) + { + $controlPlaneIp = $ips[$j] + $controlPlaneIpRes = $controlPlaneIp.Replace('.','-') + $deploymentName = "$armDeployPrefix$controlPlaneIpRes" + + Save-DeploymentInfo -deploymentName $deploymentName -clusterName $clusterName -rg $rg + Write-Verbose -Message "[$(Get-Date)] DELETE deployment $deploymentName to be created, timeout 1h." -Verbose + az deployment group delete --name $deploymentName --resource-group sarathys --no-wait + } + + + Write-Verbose -Message "[$(Get-Date)] END batch $batchNum" -Verbose + $batchSize = $r.Next(1, 10) + } + Write-Verbose -Message "[$(Get-Date)] END iteration $iteration" -Verbose +} diff --git a/aks-arc/aks-vmware/getDeployStatus.ps1 b/aks-arc/aks-vmware/getDeployStatus.ps1 new file mode 100644 index 000000000000..ecf7c412718a --- /dev/null +++ b/aks-arc/aks-vmware/getDeployStatus.ps1 @@ -0,0 +1,51 @@ +# script to obtain errors from ARM template deployments +# az login --service-principal -u adf4852b-132b-443d-81b0-c50493735ab9 -p ... --tenant microsoft.onmicrosoft.com +$ErrorActionPreference = 'continue' + +#todo parameterize +$start = 7 +$end = 206 +$armDeployPrefix = "armdep-0317-a" +$clusPrefix = "clus-0317-a" +$rg = 'sarathys' +$success = 0 +$fail = 0 +$errorInfo = @() + +for($i=$start; $i -lt $end; $i++) +{ + Write-Verbose -Message "AksArc show cluster: $clusPrefix$i " -Verbose + $cluster = az aksarc show -n "$clusPrefix$i" -g $rg | ConvertFrom-Json + Write-Verbose -Message "az deployment show deployment: $armDeployPrefix$i " -Verbose + $depInfo = az deployment group show -n "$armDeployPrefix$i" -g $rg | ConvertFrom-Json + if($null -ne $depInfo) + { + if($cluster.properties.provisioningState -eq 'Failed') + { + Write-Verbose -Message "cluster $clusPrefix$i provisioning has failed" -Verbose + $fail++ + $errorInfo += @{ClusterName = "$clusPrefix$i" + Error = $cluster.properties.status.errorMessage + AddOnNotReady = ($c.properties.status.controlPlaneStatus | ? {$_.ready -ne 'True'} ) + ArmDeployment = $depInfo.name + ArmDeployError = ($depInfo.properties.error.details | select message).message + ArmDeployDuration = $depInfo.properties.duration + } + } + else + { + Write-Verbose -Message "cluster $clusPrefix$i provisioning has succeeded." -Verbose + $success++ + } + } +} + +Write-Verbose -Message "Success: $success failed: $fail" -Verbose +mkdir c:\temp -Force +$errorLogFile = "c:\temp\aksvmwareerr2.txt" +$errorInfo | ConvertTo-Json | Out-File $errorLogFile -Force +Write-Verbose -Message "Error info written $errorLogFile" -Verbose + + + + diff --git a/aks-arc/aks-vmware/vmware.parameters.json b/aks-arc/aks-vmware/vmware.parameters.json new file mode 100644 index 000000000000..ebb432c61c05 --- /dev/null +++ b/aks-arc/aks-vmware/vmware.parameters.json @@ -0,0 +1,62 @@ +{ + "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#", + "contentVersion": "1.0.0.0", + "parameters": { + "provisionedClusterName": { + "value": "TODO: Add cluster name here." + }, + "location": { + "value": "eastus" + }, + "resourceTags": { + "value": {} + }, + "sshRSAPublicKey": { + "value": "TODO: Add your SSH RSA public key here." + }, + "enableAHUB": { + "value": "NotApplicable" + }, + "agentName": { + "value": "nodepool" + }, + "agentVMSize": { + "value": "Standard_A4_v2" + }, + "agentCount": { + "value": 1 + }, + "agentOsType": { + "value": "Linux" + }, + "loadBalancerCount": { + "value": 0 + }, + "kubernetesVersion": { + "value": "1.26.6" + }, + "controlPlaneNodeCount": { + "value": 1 + }, + "controlPlaneIp": { + "value": "100.65.180.140" + }, + "controlPlaneVMSize": { + "value": "Standard_D4s_v3" + }, + "vnetSubnetIds": { + "value": [ + "TODO: Add your subnet ARM ID here." + ] + }, + "podCidr": { + "value": "10.244.0.0/16" + }, + "networkPolicy": { + "value": "calico" + }, + "customLocation": { + "value": "TODO: Add your custom location ARM ID here." + } + } +} \ No newline at end of file From 8f92e41900e356539b634610694f7db9b4f5e938 Mon Sep 17 00:00:00 2001 From: ReddyVanshika <110912436+ReddyVanshika@users.noreply.github.com> Date: Mon, 30 Sep 2024 15:52:39 -0400 Subject: [PATCH 02/22] Create metadata.json added metadata.json for akshci --- aks-arc/aks-hci/metadata.json | 65 +++++++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) create mode 100644 aks-arc/aks-hci/metadata.json diff --git a/aks-arc/aks-hci/metadata.json b/aks-arc/aks-hci/metadata.json new file mode 100644 index 000000000000..747b5a53641e --- /dev/null +++ b/aks-arc/aks-hci/metadata.json @@ -0,0 +1,65 @@ +{ + "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#", + "contentVersion": "1.0.0.0", + "parameters": { + "provisionedClusterName": { + "value": "cluster1" + }, + "location": { + "value": "eastus" + }, + "resourceTags": { + "value": {} + }, + "sshRSAPublicKey": { + "value": "sshRSAPublicKey" + }, + "enableAHUB": { + "value": "NotApplicable" + }, + "agentName": { + "value": "nodepool" + }, + "agentVMSize": { + "value": "Standard_A4_v2" + }, + "agentCount": { + "value": 1 + }, + "agentOsType": { + "value": "Linux" + }, + "loadBalancerCount": { + "value": 0 + }, + "kubernetesVersion": { + "value": "1.26.6" + }, + "apiversion":{ + "value": "2024-01-01" + }, + "controlPlaneNodeCount": { + "value": 1 + }, + "controlPlaneIp": { + "value": "1.0.0.156" + }, + "controlPlaneVMSize": { + "value": "Standard_A4_v2" + }, + "vnetSubnetIds": { + "value": [ + "vnet1" + ] + }, + "podCidr": { + "value": "10.244.0.0/16" + }, + "networkPolicy": { + "value": "calico" + }, + "customLocation": { + "value": "houston" + } + } +} From 0bcfa867bf9f0eee9cb2807caee402433718d5a0 Mon Sep 17 00:00:00 2001 From: ReddyVanshika <110912436+ReddyVanshika@users.noreply.github.com> Date: Mon, 30 Sep 2024 15:54:03 -0400 Subject: [PATCH 03/22] Create metadata.json --- aks-arc/aks-vmware/metadata.json | 62 ++++++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) create mode 100644 aks-arc/aks-vmware/metadata.json diff --git a/aks-arc/aks-vmware/metadata.json b/aks-arc/aks-vmware/metadata.json new file mode 100644 index 000000000000..218b47028734 --- /dev/null +++ b/aks-arc/aks-vmware/metadata.json @@ -0,0 +1,62 @@ +{ + "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#", + "contentVersion": "1.0.0.0", + "parameters": { + "provisionedClusterName": { + "value": "cluster1" + }, + "location": { + "value": "eastus" + }, + "resourceTags": { + "value": {} + }, + "sshRSAPublicKey": { + "value": "sshRSAPublicKey" + }, + "enableAHUB": { + "value": "NotApplicable" + }, + "agentName": { + "value": "nodepool" + }, + "agentVMSize": { + "value": "Standard_A4_v2" + }, + "agentCount": { + "value": 1 + }, + "agentOsType": { + "value": "Linux" + }, + "loadBalancerCount": { + "value": 0 + }, + "kubernetesVersion": { + "value": "1.26.6" + }, + "controlPlaneNodeCount": { + "value": 1 + }, + "controlPlaneIp": { + "value": "100.65.180.140" + }, + "controlPlaneVMSize": { + "value": "Standard_D4s_v3" + }, + "vnetSubnetIds": { + "value": [ + "hvnet" + ] + }, + "podCidr": { + "value": "10.244.0.0/16" + }, + "networkPolicy": { + "value": "calico" + }, + "customLocation": { + "value": "Houston" + } + } +} From eaa38c8a13989f1e926087036ba5212e7f8afa2d Mon Sep 17 00:00:00 2001 From: ReddyVanshika Date: Wed, 23 Oct 2024 07:37:56 -0400 Subject: [PATCH 04/22] changed to have only one folder --- aks-arc/aks-hci/armtemplate.json | 220 ---------------------------- aks-arc/aks-hci/azs.parameters.json | 65 -------- aks-arc/aks-hci/metadata.json | 65 -------- 3 files changed, 350 deletions(-) delete mode 100644 aks-arc/aks-hci/armtemplate.json delete mode 100644 aks-arc/aks-hci/azs.parameters.json delete mode 100644 aks-arc/aks-hci/metadata.json diff --git a/aks-arc/aks-hci/armtemplate.json b/aks-arc/aks-hci/armtemplate.json deleted file mode 100644 index b5e5a8c2487a..000000000000 --- a/aks-arc/aks-hci/armtemplate.json +++ /dev/null @@ -1,220 +0,0 @@ -{ - "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#", - "contentVersion": "1.0.0.0", - "parameters": { - "provisionedClusterName": { - "type": "string", - "defaultValue": "", - "metadata": { - "description": "The name of the AKS Arc Cluster resource." - } - }, - "location": { - "type": "string", - "defaultValue": "eastus", - "metadata": { - "description": "The location of the AKS Arc Cluster resource." - } - }, - "resourceTags": { - "type": "object", - "defaultValue": {} - }, - "connectedClustersApiVersion": { - "type": "String", - "defaultValue": "" - }, - "provisionedClustersApiVersion": { - "type": "String", - "defaultValue": "" - }, - - "sshRSAPublicKey": { - "type": "string", - "metadata": { - "description": "Configure all linux machines with the SSH RSA public key string. Your key should include three parts, for example 'ssh-rsa AAAAB...snip...UcyupgH '" - } - }, - "enableAHUB": { - "type": "string", - "defaultValue": "NotApplicable", - "metadata": { - "description": "Azure Hybrid Benefit for Windows Server licenses. NotApplicable, True, False." - } - }, - "agentName": { - "type": "string", - "defaultValue": "nodepool", - "metadata": { - "description": "The name of the node pool." - } - }, - "agentVMSize": { - "type": "string", - "defaultValue": "Standard_A4_v2", - "metadata": { - "description": "The VM size for node pools." - } - }, - "agentCount": { - "type": "int", - "defaultValue": 1, - "minValue": 1, - "maxValue": 50, - "metadata": { - "description": "The number of nodes for the cluster." - } - }, - "agentOsType": { - "type": "string", - "defaultValue": "Linux", - "metadata": { - "description": "The OS Type for the agent pool. Values are Linux and Windows." - } - }, - "loadBalancerCount": { - "type": "int", - "defaultValue": 0, - "metadata": { - "description": "The number of load balancers." - } - }, - "kubernetesVersion": { - "type": "string", - "metadata": { - "description": "The version of Kubernetes." - } - }, - "controlPlaneNodeCount": { - "type": "int", - "defaultValue": 1, - "minValue": 1, - "maxValue": 5, - "metadata": { - "description": "The number of control plane nodes for the cluster." - } - }, - "controlPlaneIp": { - "type": "string", - "defaultValue": "", - "metadata": { - "description": "Control plane IP address." - } - }, - "controlPlaneVMSize": { - "type": "string", - "defaultValue": "Standard_A4_v2", - "metadata": { - "description": "The VM size for control plane." - } - }, - "vnetSubnetIds": { - "type": "array", - "metadata": { - "description": "List of subnet Ids for the AKS cluster." - } - }, - "podCidr": { - "type": "string", - "defaultValue": "10.244.0.0/16", - "metadata": { - "description": "The VM size for control plane." - } - }, - "networkPolicy": { - "type": "string", - "defaultValue": "calico", - "metadata": { - "description": "Network policy to use for Kubernetes pods. Only options supported is calico." - } - }, - "customLocation": { - "type": "string", - "metadata": { - "description": "Fully qualified custom location ARM resource Id." - } - } - }, - "resources": [ - { - "apiVersion": "[parameters('connectedClustersApiVersion')]", - "type": "Microsoft.Kubernetes/ConnectedClusters", - "kind": "ProvisionedCluster", - "location": "[parameters('location')]", - "name": "[parameters('provisionedClusterName')]", - "tags": "[parameters('resourceTags')]", - "identity": { - "type": "SystemAssigned" - }, - "properties": { - "agentPublicKeyCertificate":"" , - "aadProfile": { - "enableAzureRBAC": false - } - } - }, - { - "apiVersion": "[parameters('provisionedClustersApiVersion')]", - "type": "microsoft.hybridcontainerservice/provisionedclusterinstances", - "name": "default", - "scope": "[concat('Microsoft.Kubernetes/ConnectedClusters', '/', parameters('provisionedClusterName'))]", - "dependsOn": [ - "[resourceId('Microsoft.Kubernetes/ConnectedClusters', parameters('provisionedClusterName'))]" - ], - "properties": { - "agentPoolProfiles": [ - { - "count": "[parameters('agentCount')]", - "name":"[parameters('agentName')]", - "osType": "[parameters('agentOsType')]", - "vmSize": "[parameters('agentVMSize')]" - } - ], - "cloudProviderProfile": { - "infraNetworkProfile": { - "vnetSubnetIds": "[parameters('vnetSubnetIds')]" - } - }, - "controlPlane": { - "count": "[parameters('controlPlaneNodeCount')]", - "controlPlaneEndpoint": { - "hostIP": "[parameters('controlPlaneIp')]" - }, - "vmSize": "[parameters('controlPlaneVMSize')]" - }, - "licenseProfile": { - "azureHybridBenefit": "[parameters('enableAHUB')]" - }, - "kubernetesVersion": "[parameters('kubernetesVersion')]", - "linuxProfile": { - "ssh": { - "publicKeys": [ - { - "keyData": "[parameters('sshRSAPublicKey')]" - } - ] - } - }, - "networkProfile": { - "loadBalancerProfile": { - "count": "[parameters('loadBalancerCount')]" - }, - "networkPolicy": "[parameters('networkPolicy')]", - "podCidr": "[parameters('podCidr')]" - }, - "storageProfile": { - "nfsCsiDriver": { - "enabled": false - }, - "smbCsiDriver": { - "enabled": false - } - } - } - // "extendedLocation": { - // "name": "[parameters('customLocation')]", - // "type": "CustomLocation" - // } - } - ] - } \ No newline at end of file diff --git a/aks-arc/aks-hci/azs.parameters.json b/aks-arc/aks-hci/azs.parameters.json deleted file mode 100644 index 7c9b53539e60..000000000000 --- a/aks-arc/aks-hci/azs.parameters.json +++ /dev/null @@ -1,65 +0,0 @@ -{ - "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#", - "contentVersion": "1.0.0.0", - "parameters": { - "provisionedClusterName": { - "value": "TODO: Fill in parameter value" - }, - "location": { - "value": "eastus" - }, - "resourceTags": { - "value": {} - }, - "sshRSAPublicKey": { - "value": "TODO: Fill in parameter value" - }, - "enableAHUB": { - "value": "NotApplicable" - }, - "agentName": { - "value": "nodepool" - }, - "agentVMSize": { - "value": "Standard_A4_v2" - }, - "agentCount": { - "value": 1 - }, - "agentOsType": { - "value": "Linux" - }, - "loadBalancerCount": { - "value": 0 - }, - "kubernetesVersion": { - "value": "1.26.6" - }, - "apiversion":{ - "value": "2024-01-01" - }, - "controlPlaneNodeCount": { - "value": 1 - }, - "controlPlaneIp": { - "value": "TODO: Fill in parameter value" - }, - "controlPlaneVMSize": { - "value": "Standard_A4_v2" - }, - "vnetSubnetIds": { - "value": [ - "TODO: Fill in parameter value" - ] - }, - "podCidr": { - "value": "10.244.0.0/16" - }, - "networkPolicy": { - "value": "calico" - }, - "customLocation": { - "value": "TODO: Fill in parameter value" - } - } -} \ No newline at end of file diff --git a/aks-arc/aks-hci/metadata.json b/aks-arc/aks-hci/metadata.json deleted file mode 100644 index 747b5a53641e..000000000000 --- a/aks-arc/aks-hci/metadata.json +++ /dev/null @@ -1,65 +0,0 @@ -{ - "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#", - "contentVersion": "1.0.0.0", - "parameters": { - "provisionedClusterName": { - "value": "cluster1" - }, - "location": { - "value": "eastus" - }, - "resourceTags": { - "value": {} - }, - "sshRSAPublicKey": { - "value": "sshRSAPublicKey" - }, - "enableAHUB": { - "value": "NotApplicable" - }, - "agentName": { - "value": "nodepool" - }, - "agentVMSize": { - "value": "Standard_A4_v2" - }, - "agentCount": { - "value": 1 - }, - "agentOsType": { - "value": "Linux" - }, - "loadBalancerCount": { - "value": 0 - }, - "kubernetesVersion": { - "value": "1.26.6" - }, - "apiversion":{ - "value": "2024-01-01" - }, - "controlPlaneNodeCount": { - "value": 1 - }, - "controlPlaneIp": { - "value": "1.0.0.156" - }, - "controlPlaneVMSize": { - "value": "Standard_A4_v2" - }, - "vnetSubnetIds": { - "value": [ - "vnet1" - ] - }, - "podCidr": { - "value": "10.244.0.0/16" - }, - "networkPolicy": { - "value": "calico" - }, - "customLocation": { - "value": "houston" - } - } -} From a15f16fa6dc33fd243d58a3349fd424d660e789c Mon Sep 17 00:00:00 2001 From: ReddyVanshika Date: Wed, 6 Nov 2024 04:53:15 -0500 Subject: [PATCH 05/22] updated PR with ReadMe and correct names. ReadMe needs a few more changes --- aks-arc/aks-vmware/metadata.json | 62 ------------------- .../microsoft.aksarc/aks-vmware/README.md | 30 +++++++++ .../aks-vmware/azuredeploy.json | 8 +-- .../aks-vmware/azuredeploy.parameters.json | 0 .../microsoft.aksarc}/aks-vmware/deploy.ps1 | 0 .../aks-vmware/getDeployStatus.ps1 | 0 .../microsoft.aksarc/aks-vmware/metadata.json | 10 +++ 7 files changed, 44 insertions(+), 66 deletions(-) delete mode 100644 aks-arc/aks-vmware/metadata.json create mode 100644 quickstarts/microsoft.aksarc/aks-vmware/README.md rename aks-arc/aks-vmware/armtemplateVmware.json => quickstarts/microsoft.aksarc/aks-vmware/azuredeploy.json (97%) rename aks-arc/aks-vmware/vmware.parameters.json => quickstarts/microsoft.aksarc/aks-vmware/azuredeploy.parameters.json (100%) rename {aks-arc => quickstarts/microsoft.aksarc}/aks-vmware/deploy.ps1 (100%) rename {aks-arc => quickstarts/microsoft.aksarc}/aks-vmware/getDeployStatus.ps1 (100%) create mode 100644 quickstarts/microsoft.aksarc/aks-vmware/metadata.json diff --git a/aks-arc/aks-vmware/metadata.json b/aks-arc/aks-vmware/metadata.json deleted file mode 100644 index 218b47028734..000000000000 --- a/aks-arc/aks-vmware/metadata.json +++ /dev/null @@ -1,62 +0,0 @@ -{ - "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#", - "contentVersion": "1.0.0.0", - "parameters": { - "provisionedClusterName": { - "value": "cluster1" - }, - "location": { - "value": "eastus" - }, - "resourceTags": { - "value": {} - }, - "sshRSAPublicKey": { - "value": "sshRSAPublicKey" - }, - "enableAHUB": { - "value": "NotApplicable" - }, - "agentName": { - "value": "nodepool" - }, - "agentVMSize": { - "value": "Standard_A4_v2" - }, - "agentCount": { - "value": 1 - }, - "agentOsType": { - "value": "Linux" - }, - "loadBalancerCount": { - "value": 0 - }, - "kubernetesVersion": { - "value": "1.26.6" - }, - "controlPlaneNodeCount": { - "value": 1 - }, - "controlPlaneIp": { - "value": "100.65.180.140" - }, - "controlPlaneVMSize": { - "value": "Standard_D4s_v3" - }, - "vnetSubnetIds": { - "value": [ - "hvnet" - ] - }, - "podCidr": { - "value": "10.244.0.0/16" - }, - "networkPolicy": { - "value": "calico" - }, - "customLocation": { - "value": "Houston" - } - } -} diff --git a/quickstarts/microsoft.aksarc/aks-vmware/README.md b/quickstarts/microsoft.aksarc/aks-vmware/README.md new file mode 100644 index 000000000000..755878d37cc8 --- /dev/null +++ b/quickstarts/microsoft.aksarc/aks-vmware/README.md @@ -0,0 +1,30 @@ +--- +description: This template creates an AKS ARC provision cluster. +page_type: sample +products: +- azure +- azure-resource-manager +urlFragment: AKS-VMWare +languages: +- json +- bicep +--- +# Create an AKS ARC Provision cluster using a template + +![Azure Public Test Date]() +![Azure Public Test Result]() + +![Best Practice Check](https://azurequickstartsservice.blob.core.windows.net/badges/quickstarts/microsoft.analysisservices/analysis-services-create/BestPracticeResult.svg) +![Cred Scan Check](https://azurequickstartsservice.blob.core.windows.net/badges/quickstarts/microsoft.analysisservices/analysis-services-create/CredScanResult.svg) + +![Bicep Version](https://azurequickstartsservice.blob.core.windows.net/badges/quickstarts/microsoft.analysisservices/analysis-services-create/BicepVersion.svg) + +[![Deploy To Azure](https://raw.githubusercontent.com/Azure/azure-quickstart-templates/master/1-CONTRIBUTION-GUIDE/images/deploytoazure.svg?sanitize=true)](https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2FAzure%2Fazure-quickstart-templates%2Fmaster%2Fquickstarts%2Fmicrosoft.analysisservices%2Fanalysis-services-create%2Fazuredeploy.json) + +[![Visualize](https://raw.githubusercontent.com/Azure/azure-quickstart-templates/master/1-CONTRIBUTION-GUIDE/images/visualizebutton.svg?sanitize=true)](http://armviz.io/#/?load=https%3A%2F%2Fraw.githubusercontent.com%2FAzure%2Fazure-quickstart-templates%2Fmaster%2Fquickstarts%2Fmicrosoft.analysisservices%2Fanalysis-services-create%2Fazuredeploy.json) + +This template allows you to deploy a new Azure Analysis Services server with a simple firewall rule. The [quickstart]() article describes how to deploy the template. + +For more information about Azure Analysis Services, see [What is Azure Analysis Services?](https://docs.microsoft.com/azure/analysis-services/analysis-services-overview). + +`Tags: Microsoft.aksarc/aks-vmware` diff --git a/aks-arc/aks-vmware/armtemplateVmware.json b/quickstarts/microsoft.aksarc/aks-vmware/azuredeploy.json similarity index 97% rename from aks-arc/aks-vmware/armtemplateVmware.json rename to quickstarts/microsoft.aksarc/aks-vmware/azuredeploy.json index 438b126f98d2..174ac66c30a0 100644 --- a/aks-arc/aks-vmware/armtemplateVmware.json +++ b/quickstarts/microsoft.aksarc/aks-vmware/azuredeploy.json @@ -193,11 +193,11 @@ "networkPolicy": "[parameters('networkPolicy')]", "podCidr": "[parameters('podCidr')]" } - }, - "extendedLocation": { - "name": "[parameters('customLocation')]", - "type": "CustomLocation" } + // "extendedLocation": { + // "name": "[parameters('customLocation')]", + // "type": "CustomLocation" + // } } ] } diff --git a/aks-arc/aks-vmware/vmware.parameters.json b/quickstarts/microsoft.aksarc/aks-vmware/azuredeploy.parameters.json similarity index 100% rename from aks-arc/aks-vmware/vmware.parameters.json rename to quickstarts/microsoft.aksarc/aks-vmware/azuredeploy.parameters.json diff --git a/aks-arc/aks-vmware/deploy.ps1 b/quickstarts/microsoft.aksarc/aks-vmware/deploy.ps1 similarity index 100% rename from aks-arc/aks-vmware/deploy.ps1 rename to quickstarts/microsoft.aksarc/aks-vmware/deploy.ps1 diff --git a/aks-arc/aks-vmware/getDeployStatus.ps1 b/quickstarts/microsoft.aksarc/aks-vmware/getDeployStatus.ps1 similarity index 100% rename from aks-arc/aks-vmware/getDeployStatus.ps1 rename to quickstarts/microsoft.aksarc/aks-vmware/getDeployStatus.ps1 diff --git a/quickstarts/microsoft.aksarc/aks-vmware/metadata.json b/quickstarts/microsoft.aksarc/aks-vmware/metadata.json new file mode 100644 index 000000000000..d648f90cf72b --- /dev/null +++ b/quickstarts/microsoft.aksarc/aks-vmware/metadata.json @@ -0,0 +1,10 @@ +{ + "$schema": "https://aka.ms/azure-quickstart-templates-metadata-schema#", + "type": "QuickStart", + "itemDisplayName": "Create an AKS ARC cluster", + "description": "This template creates an AKS ARC cluster with an assiciated control plane IP and Vnet", + "summary": "Create an AKS ARC cluster instance using a template", + "githubUsername": "ReddyVanshika", + "docOwner": "ReddyVanshika", + "dateUpdated": "2024-11-05" + } \ No newline at end of file From a4b19db7d4762a977e58a115288d6c18c5069d40 Mon Sep 17 00:00:00 2001 From: ReddyVanshika Date: Thu, 7 Nov 2024 07:03:19 -0500 Subject: [PATCH 06/22] updated readme --- .../microsoft.aksarc/aks-vmware/README.md | 8 +- .../microsoft.aksarc/aks-vmware/deploy.ps1 | 160 ------------------ .../aks-vmware/getDeployStatus.ps1 | 51 ------ 3 files changed, 3 insertions(+), 216 deletions(-) delete mode 100644 quickstarts/microsoft.aksarc/aks-vmware/deploy.ps1 delete mode 100644 quickstarts/microsoft.aksarc/aks-vmware/getDeployStatus.ps1 diff --git a/quickstarts/microsoft.aksarc/aks-vmware/README.md b/quickstarts/microsoft.aksarc/aks-vmware/README.md index 755878d37cc8..e01870eeed0f 100644 --- a/quickstarts/microsoft.aksarc/aks-vmware/README.md +++ b/quickstarts/microsoft.aksarc/aks-vmware/README.md @@ -12,19 +12,17 @@ languages: # Create an AKS ARC Provision cluster using a template ![Azure Public Test Date]() -![Azure Public Test Result]() +![Azure Public Test Result](https://azurequickstartsservice.blob.core.windows.net/badges/quickstarts/microsoft.analysisservices/analysis-services-create/PublicDeployment.svg) ![Best Practice Check](https://azurequickstartsservice.blob.core.windows.net/badges/quickstarts/microsoft.analysisservices/analysis-services-create/BestPracticeResult.svg) ![Cred Scan Check](https://azurequickstartsservice.blob.core.windows.net/badges/quickstarts/microsoft.analysisservices/analysis-services-create/CredScanResult.svg) -![Bicep Version](https://azurequickstartsservice.blob.core.windows.net/badges/quickstarts/microsoft.analysisservices/analysis-services-create/BicepVersion.svg) - [![Deploy To Azure](https://raw.githubusercontent.com/Azure/azure-quickstart-templates/master/1-CONTRIBUTION-GUIDE/images/deploytoazure.svg?sanitize=true)](https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2FAzure%2Fazure-quickstart-templates%2Fmaster%2Fquickstarts%2Fmicrosoft.analysisservices%2Fanalysis-services-create%2Fazuredeploy.json) [![Visualize](https://raw.githubusercontent.com/Azure/azure-quickstart-templates/master/1-CONTRIBUTION-GUIDE/images/visualizebutton.svg?sanitize=true)](http://armviz.io/#/?load=https%3A%2F%2Fraw.githubusercontent.com%2FAzure%2Fazure-quickstart-templates%2Fmaster%2Fquickstarts%2Fmicrosoft.analysisservices%2Fanalysis-services-create%2Fazuredeploy.json) -This template allows you to deploy a new Azure Analysis Services server with a simple firewall rule. The [quickstart]() article describes how to deploy the template. +This template allows you to deploy a new AKS ARC cluster. -For more information about Azure Analysis Services, see [What is Azure Analysis Services?](https://docs.microsoft.com/azure/analysis-services/analysis-services-overview). +For more information about Azure Analysis Services, see [What is Azure Arc enabled Kuberneties](https://learn.microsoft.com/en-us/azure/azure-arc/kubernetes/overview). `Tags: Microsoft.aksarc/aks-vmware` diff --git a/quickstarts/microsoft.aksarc/aks-vmware/deploy.ps1 b/quickstarts/microsoft.aksarc/aks-vmware/deploy.ps1 deleted file mode 100644 index 15f9bfd6b6e8..000000000000 --- a/quickstarts/microsoft.aksarc/aks-vmware/deploy.ps1 +++ /dev/null @@ -1,160 +0,0 @@ -# Deploy AKS Arc clusters on vmware in batches -[CmdletBinding()] -param ( - [Parameter(Mandatory=$true)] - [string] - [ValidateScript({Test-Path $_ -PathType Leaf})] - $ControlplaneStaticIPfile = "availip.txt", - - [Parameter(Mandatory=$true)] - [ValidateScript({Test-Path $_ -PathType Leaf})] - [string] - $ArmTemplateFile = "armtemplate.json", - - [Parameter(Mandatory=$true)] - [string] - [ValidateScript({Test-Path $_ -PathType Leaf})] - $ArmTemplateParametersFile = "vmware.parameters.json", - - [Parameter(Mandatory=$true)] - [string] - $ResourceGroup = 'sarathys', - - [Parameter(Mandatory=$true)] - [string] - $ServicePrincipalId, - - [Parameter(Mandatory=$true)] - [securestring] - $ServicePrincipalSecret, - - [Parameter(Mandatory=$true)] - [string] - $TenantId = 'microsoft.onmicrosoft.com' -) - -# Path: ARMtemplates/deploy.ps1 - -function Login { - param ( - [Parameter(Mandatory=$true)] - [string] - $ServicePrincipalId, - - [Parameter(Mandatory=$true)] - [securestring] - $ServicePrincipalSecret, - - [Parameter(Mandatory=$true)] - [string] - $TenantId = 'microsoft.onmicrosoft.com' - ) - - $ErrorActionPreference = 'stop' - $ServicePrincipalSecret = ConvertFrom-SecureString -SecureString $ServicePrincipalSecret - az login --service-principal -u $ServicePrincipalId -p $ServicePrincipalSecret --tenant $TenantId -} - - -function Save-DeploymentInfo($deploymentName, $clusterName, $rg) -{ - $cluster = az aksarc show -n "$clusterName" -g $rg | ConvertFrom-Json - Write-Verbose -Message "az deployment show deployment: $deploymentName" -Verbose - $depInfo = az deployment group show -n $deploymentName -g $rg | ConvertFrom-Json - $errorInfo = $null - if($null -ne $depInfo) - { - if($cluster.properties.provisioningState -eq 'Failed') - { - Write-Verbose -Message "cluster $clusterName provisioning has failed" -Verbose - $errorInfo = @{ClusterName = "$clusterName" - Error = $cluster.properties.status.errorMessage - AddOnNotReady = ($c.properties.status.controlPlaneStatus | ? {$_.ready -ne 'True'} ) - ArmDeployment = $depInfo.name - ArmDeployError = ($depInfo.properties.error.details | select message).message - ArmDeployDuration = $depInfo.properties.duration - } - } - else - { - Write-Verbose -Message "cluster $clusterName provisioning has succeeded." -Verbose - } - } - - $deployInfo = @{DeploymentName = $deploymentName; ClusterName = $clusterName; ErrorInfo = $errorInfo} - - Write-Verbose -Message "Deployment info for deployment: $deploymentName clusterName: $clusterName saved to $resultsFile" -Verbose - $deployInfo | ConvertTo-Json | Out-File $resultsFile -Append -} - - -# main - -$ErrorActionPreference = 'continue' - -# get mmdd prefix -$prefix = (Get-Date).ToString("MMdd") -$armDeployPrefix = "a$prefix-" -$clusPrefix = "c$prefix-" - -$ips = Get-Content $ControlplaneStaticIPfile -ErrorAction Stop - -$batchSize = 10 -$batchNum = 0 -$r = [System.Random]::new() -$batchSize = $r.Next(1, 10) -$iteration = 0 -$rg = 'sarathys' - -mkdir c:\aksarc -Force -$resultsFile = "C:\aksarc\results.json" - -Login -ServicePrincipalId $ServicePrincipalId -ServicePrincipalSecret $ServicePrincipalSecret -TenantId $TenantId - -while($true) -{ - $iteration++ - Write-Verbose -Message "[$(Get-Date)] START iteration $iteration" -Verbose - for($i=0; $i -lt $ips.Count; $i = $i + $batchSize) - { - $batchNum++ - Write-Verbose -Message "[$(Get-Date)] START batch $batchNum deployment, batch size = $batchSize" -Verbose - for($j=$i; ($j -lt ($i + $batchSize)) -and ($j -lt $ips.Count - 1); $j++) - { - $controlPlaneIp = $ips[$j] - $controlPlaneIpRes = $controlPlaneIp.Replace('.','-') - $deploymentName = "$armDeployPrefix$controlPlaneIpRes" - $clusterName = "$clusPrefix$controlPlaneIpRes" - Write-Verbose -Message "[$(Get-Date)] Starting template deployment $deploymentName with control plane IP: $controlPlaneIp clusterName $clusterName" -Verbose - az deployment group create --name $deploymentName --resource-group sarathys --template-file .\armtemplate.json --parameters `@vmware.parametersLoop.json ` - --parameters controlPlaneIp=$controlPlaneIp --parameters provisionedClusterName=$clusterName --no-wait - } - - for($j=$i; ($j -lt ($i + $batchSize)) -and ($j -lt $ips.Count - 1); $j++) - { - $controlPlaneIp = $ips[$j] - $controlPlaneIpRes = $controlPlaneIp.Replace('.','-') - $deploymentName = "$armDeployPrefix$controlPlaneIpRes" - - Write-Verbose -Message "[$(Get-Date)] WAIT for deployment $deploymentName to be created, timeout 1h." -Verbose - az deployment group wait --name $deploymentName --resource-group sarathys --created - } - - - for($j=$i; ($j -lt ($i + $batchSize)) -and ($j -lt $ips.Count - 1); $j++) - { - $controlPlaneIp = $ips[$j] - $controlPlaneIpRes = $controlPlaneIp.Replace('.','-') - $deploymentName = "$armDeployPrefix$controlPlaneIpRes" - - Save-DeploymentInfo -deploymentName $deploymentName -clusterName $clusterName -rg $rg - Write-Verbose -Message "[$(Get-Date)] DELETE deployment $deploymentName to be created, timeout 1h." -Verbose - az deployment group delete --name $deploymentName --resource-group sarathys --no-wait - } - - - Write-Verbose -Message "[$(Get-Date)] END batch $batchNum" -Verbose - $batchSize = $r.Next(1, 10) - } - Write-Verbose -Message "[$(Get-Date)] END iteration $iteration" -Verbose -} diff --git a/quickstarts/microsoft.aksarc/aks-vmware/getDeployStatus.ps1 b/quickstarts/microsoft.aksarc/aks-vmware/getDeployStatus.ps1 deleted file mode 100644 index ecf7c412718a..000000000000 --- a/quickstarts/microsoft.aksarc/aks-vmware/getDeployStatus.ps1 +++ /dev/null @@ -1,51 +0,0 @@ -# script to obtain errors from ARM template deployments -# az login --service-principal -u adf4852b-132b-443d-81b0-c50493735ab9 -p ... --tenant microsoft.onmicrosoft.com -$ErrorActionPreference = 'continue' - -#todo parameterize -$start = 7 -$end = 206 -$armDeployPrefix = "armdep-0317-a" -$clusPrefix = "clus-0317-a" -$rg = 'sarathys' -$success = 0 -$fail = 0 -$errorInfo = @() - -for($i=$start; $i -lt $end; $i++) -{ - Write-Verbose -Message "AksArc show cluster: $clusPrefix$i " -Verbose - $cluster = az aksarc show -n "$clusPrefix$i" -g $rg | ConvertFrom-Json - Write-Verbose -Message "az deployment show deployment: $armDeployPrefix$i " -Verbose - $depInfo = az deployment group show -n "$armDeployPrefix$i" -g $rg | ConvertFrom-Json - if($null -ne $depInfo) - { - if($cluster.properties.provisioningState -eq 'Failed') - { - Write-Verbose -Message "cluster $clusPrefix$i provisioning has failed" -Verbose - $fail++ - $errorInfo += @{ClusterName = "$clusPrefix$i" - Error = $cluster.properties.status.errorMessage - AddOnNotReady = ($c.properties.status.controlPlaneStatus | ? {$_.ready -ne 'True'} ) - ArmDeployment = $depInfo.name - ArmDeployError = ($depInfo.properties.error.details | select message).message - ArmDeployDuration = $depInfo.properties.duration - } - } - else - { - Write-Verbose -Message "cluster $clusPrefix$i provisioning has succeeded." -Verbose - $success++ - } - } -} - -Write-Verbose -Message "Success: $success failed: $fail" -Verbose -mkdir c:\temp -Force -$errorLogFile = "c:\temp\aksvmwareerr2.txt" -$errorInfo | ConvertTo-Json | Out-File $errorLogFile -Force -Write-Verbose -Message "Error info written $errorLogFile" -Verbose - - - - From 6caa9ee95daeafdb687817ed071fca6da5efc032 Mon Sep 17 00:00:00 2001 From: ReddyVanshika Date: Mon, 11 Nov 2024 11:36:31 -0500 Subject: [PATCH 07/22] nodepool changes --- .../aks-vmware/azuredeploy.json | 203 ------------------ .../aks-vmware/azuredeploy.parameters.json | 62 ------ .../{aks-vmware => nodepool}/README.md | 4 +- .../nodepool/azuredeploy.json | 53 +++++ .../nodepool/azuredeploy.parameters.json | 30 +++ .../{aks-vmware => nodepool}/metadata.json | 4 +- 6 files changed, 87 insertions(+), 269 deletions(-) delete mode 100644 quickstarts/microsoft.aksarc/aks-vmware/azuredeploy.json delete mode 100644 quickstarts/microsoft.aksarc/aks-vmware/azuredeploy.parameters.json rename quickstarts/microsoft.aksarc/{aks-vmware => nodepool}/README.md (95%) create mode 100644 quickstarts/microsoft.aksarc/nodepool/azuredeploy.json create mode 100644 quickstarts/microsoft.aksarc/nodepool/azuredeploy.parameters.json rename quickstarts/microsoft.aksarc/{aks-vmware => nodepool}/metadata.json (58%) diff --git a/quickstarts/microsoft.aksarc/aks-vmware/azuredeploy.json b/quickstarts/microsoft.aksarc/aks-vmware/azuredeploy.json deleted file mode 100644 index 174ac66c30a0..000000000000 --- a/quickstarts/microsoft.aksarc/aks-vmware/azuredeploy.json +++ /dev/null @@ -1,203 +0,0 @@ -{ - "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#", - "contentVersion": "1.0.0.0", - "parameters": { - "provisionedClusterName": { - "type": "string", - "defaultValue": "aksarc-armcluster", - "metadata": { - "description": "The name of the AKS Arc Cluster resource." - } - }, - "location": { - "type": "string", - "defaultValue": "eastus", - "metadata": { - "description": "The location of the AKS Arc Cluster resource." - } - }, - "resourceTags": { - "type": "object", - "defaultValue": {} - }, - "sshRSAPublicKey": { - "type": "string", - "metadata": { - "description": "Configure all linux machines with the SSH RSA public key string. Your key should include three parts, for example 'ssh-rsa AAAAB...snip...UcyupgH '" - } - }, - "enableAHUB": { - "type": "string", - "defaultValue": "NotApplicable", - "metadata": { - "description": "Azure Hybrid Benefit for Windows Server licenses. NotApplicable, True, False." - } - }, - "agentName": { - "type": "string", - "defaultValue": "nodepool", - "metadata": { - "description": "The name of the node pool." - } - }, - "agentVMSize": { - "type": "string", - "defaultValue": "Standard_A4_v2", - "metadata": { - "description": "The VM size for node pools." - } - }, - "agentCount": { - "type": "int", - "defaultValue": 1, - "minValue": 1, - "maxValue": 50, - "metadata": { - "description": "The number of nodes for the cluster." - } - }, - "agentOsType": { - "type": "string", - "defaultValue": "Linux", - "metadata": { - "description": "The OS Type for the agent pool. Values are Linux and Windows." - } - }, - "loadBalancerCount": { - "type": "int", - "defaultValue": 0, - "metadata": { - "description": "The number of load balancers." - } - }, - "kubernetesVersion": { - "type": "string", - "metadata": { - "description": "The version of Kubernetes." - } - }, - "controlPlaneNodeCount": { - "type": "int", - "defaultValue": 1, - "minValue": 1, - "maxValue": 5, - "metadata": { - "description": "The number of control plane nodes for the cluster." - } - }, - "controlPlaneIp": { - "type": "string", - "defaultValue": "", - "metadata": { - "description": "Control plane IP address." - } - }, - "controlPlaneVMSize": { - "type": "string", - "defaultValue": "Standard_A4_v2", - "metadata": { - "description": "The VM size for control plane." - } - }, - "vnetSubnetIds": { - "type": "array", - "metadata": { - "description": "List of subnet Ids for the AKS cluster." - } - }, - "podCidr": { - "type": "string", - "defaultValue": "10.244.0.0/16", - "metadata": { - "description": "The VM size for control plane." - } - }, - "networkPolicy": { - "type": "string", - "defaultValue": "calico", - "metadata": { - "description": "Network policy to use for Kubernetes pods. Only options supported is calico." - } - }, - "customLocation": { - "type": "string", - "metadata": { - "description": "Fully qualified custom location ARM resource Id." - } - } - }, - "resources": [ - { - "apiVersion": "2023-11-01-preview", - "type": "Microsoft.Kubernetes/ConnectedClusters", - "kind": "ProvisionedCluster", - "location": "[parameters('location')]", - "name": "[parameters('provisionedClusterName')]", - "tags": "[parameters('resourceTags')]", - "identity": { - "type": "SystemAssigned" - }, - "properties": { - "agentPublicKeyCertificate":"" , - "aadProfile": { - "enableAzureRBAC": false - } - } - }, - { - "apiVersion": "2023-11-15-preview", - "type": "microsoft.hybridcontainerservice/provisionedclusterinstances", - "name": "default", - "scope": "[concat('Microsoft.Kubernetes/ConnectedClusters', '/', parameters('provisionedClusterName'))]", - "dependsOn": [ - "[resourceId('Microsoft.Kubernetes/ConnectedClusters', parameters('provisionedClusterName'))]" - ], - "properties": { - "agentPoolProfiles": [ - { - "count": "[parameters('agentCount')]", - "name":"[parameters('agentName')]", - "osType": "[parameters('agentOsType')]", - "vmSize": "[parameters('agentVMSize')]" - } - ], - "cloudProviderProfile": { - "infraNetworkProfile": { - "vnetSubnetIds": "[parameters('vnetSubnetIds')]" - } - }, - "controlPlane": { - "count": "[parameters('controlPlaneNodeCount')]", - "controlPlaneEndpoint": { - "hostIP": "[parameters('controlPlaneIp')]" - }, - "vmSize": "[parameters('controlPlaneVMSize')]" - }, - "licenseProfile": { - "azureHybridBenefit": "[parameters('enableAHUB')]" - }, - "kubernetesVersion": "[parameters('kubernetesVersion')]", - "linuxProfile": { - "ssh": { - "publicKeys": [ - { - "keyData": "[parameters('sshRSAPublicKey')]" - } - ] - } - }, - "networkProfile": { - "loadBalancerProfile": { - "count": "[parameters('loadBalancerCount')]" - }, - "networkPolicy": "[parameters('networkPolicy')]", - "podCidr": "[parameters('podCidr')]" - } - } - // "extendedLocation": { - // "name": "[parameters('customLocation')]", - // "type": "CustomLocation" - // } - } - ] - } diff --git a/quickstarts/microsoft.aksarc/aks-vmware/azuredeploy.parameters.json b/quickstarts/microsoft.aksarc/aks-vmware/azuredeploy.parameters.json deleted file mode 100644 index ebb432c61c05..000000000000 --- a/quickstarts/microsoft.aksarc/aks-vmware/azuredeploy.parameters.json +++ /dev/null @@ -1,62 +0,0 @@ -{ - "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#", - "contentVersion": "1.0.0.0", - "parameters": { - "provisionedClusterName": { - "value": "TODO: Add cluster name here." - }, - "location": { - "value": "eastus" - }, - "resourceTags": { - "value": {} - }, - "sshRSAPublicKey": { - "value": "TODO: Add your SSH RSA public key here." - }, - "enableAHUB": { - "value": "NotApplicable" - }, - "agentName": { - "value": "nodepool" - }, - "agentVMSize": { - "value": "Standard_A4_v2" - }, - "agentCount": { - "value": 1 - }, - "agentOsType": { - "value": "Linux" - }, - "loadBalancerCount": { - "value": 0 - }, - "kubernetesVersion": { - "value": "1.26.6" - }, - "controlPlaneNodeCount": { - "value": 1 - }, - "controlPlaneIp": { - "value": "100.65.180.140" - }, - "controlPlaneVMSize": { - "value": "Standard_D4s_v3" - }, - "vnetSubnetIds": { - "value": [ - "TODO: Add your subnet ARM ID here." - ] - }, - "podCidr": { - "value": "10.244.0.0/16" - }, - "networkPolicy": { - "value": "calico" - }, - "customLocation": { - "value": "TODO: Add your custom location ARM ID here." - } - } -} \ No newline at end of file diff --git a/quickstarts/microsoft.aksarc/aks-vmware/README.md b/quickstarts/microsoft.aksarc/nodepool/README.md similarity index 95% rename from quickstarts/microsoft.aksarc/aks-vmware/README.md rename to quickstarts/microsoft.aksarc/nodepool/README.md index e01870eeed0f..07cd9ae44ea9 100644 --- a/quickstarts/microsoft.aksarc/aks-vmware/README.md +++ b/quickstarts/microsoft.aksarc/nodepool/README.md @@ -1,10 +1,10 @@ --- -description: This template creates an AKS ARC provision cluster. +description: Deploys a provisioned cluster page_type: sample products: - azure - azure-resource-manager -urlFragment: AKS-VMWare +urlFragment: nodepool languages: - json - bicep diff --git a/quickstarts/microsoft.aksarc/nodepool/azuredeploy.json b/quickstarts/microsoft.aksarc/nodepool/azuredeploy.json new file mode 100644 index 000000000000..413575aa6765 --- /dev/null +++ b/quickstarts/microsoft.aksarc/nodepool/azuredeploy.json @@ -0,0 +1,53 @@ +{ + "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#", + "contentVersion": "1.0.0.0", + "parameters" : { + "provisionedClusterName": { + "type": "string" + }, + "connectedClustersApiVersion": { + "type": "string" + }, + "provisionedClustersApiVersion": { + "type": "string" + }, + "agentName": { + "type": "string" + }, + "agentVMSize": { + "type": "string" + }, + "agentCount": { + "type": "int" + }, + "agentOsType": { + "type": "string" + }, + "location": { + "type": "string" + } + }, + "resources" : [ + { + "type": "Microsoft.Kubernetes/connectedClusters", + "apiVersion": "[parameters('connectedClustersApiVersion')]", + "name": "[parameters('provisionedClusterName')]", + "location": "[parameters('location')]", + "condition" : false + }, + { + "type": "microsoft.hybridcontainerservice/provisionedclusterinstances/agentpools", + "apiVersion": "[parameters('provisionedClustersApiVersion')]", + "name": "[concat('default/', parameters('agentName'))]", + "scope": "[resourceId('microsoft.Kubernetes/connectedClusters', parameters('provisionedClusterName'))]", + "dependsOn": [ + "[resourceId('microsoft.Kubernetes/connectedClusters', parameters('provisionedClusterName'))]" + ], + "properties": { + "count": "[parameters('agentCount')]", + "osType": "[parameters('agentOsType')]", + "vmSize": "[parameters('agentVMSize')]" + } + } + ] +} \ No newline at end of file diff --git a/quickstarts/microsoft.aksarc/nodepool/azuredeploy.parameters.json b/quickstarts/microsoft.aksarc/nodepool/azuredeploy.parameters.json new file mode 100644 index 000000000000..3e102ad05cae --- /dev/null +++ b/quickstarts/microsoft.aksarc/nodepool/azuredeploy.parameters.json @@ -0,0 +1,30 @@ +{ + "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#", + "contentVersion": "1.0.0.0", + "parameters": { + "provisionedClusterName": { + "value": "TODO: AKS Arc Cluster Name" + }, + "location": { + "value": "eastus" + }, + "agentName": { + "value": "TODO: Node Pool Name" + }, + "agentVMSize": { + "value": "Standard_A4_v2" + }, + "agentCount": { + "value": 3 + }, + "agentOsType": { + "value": "Linux" + }, + "provisionedClustersApiVersion":{ + "value": "2024-01-01" + }, + "connectedClustersApiVersion" : { + "value": "2024-07-15-preview" + } + } +} \ No newline at end of file diff --git a/quickstarts/microsoft.aksarc/aks-vmware/metadata.json b/quickstarts/microsoft.aksarc/nodepool/metadata.json similarity index 58% rename from quickstarts/microsoft.aksarc/aks-vmware/metadata.json rename to quickstarts/microsoft.aksarc/nodepool/metadata.json index d648f90cf72b..1a5a3cc2b347 100644 --- a/quickstarts/microsoft.aksarc/aks-vmware/metadata.json +++ b/quickstarts/microsoft.aksarc/nodepool/metadata.json @@ -1,8 +1,8 @@ { "$schema": "https://aka.ms/azure-quickstart-templates-metadata-schema#", "type": "QuickStart", - "itemDisplayName": "Create an AKS ARC cluster", - "description": "This template creates an AKS ARC cluster with an assiciated control plane IP and Vnet", + "itemDisplayName": "Deploys a provisioned cluster", + "description": "Deploys a provisioned cluster with workload identity federation enabled and OIDC issuer URL enabled on ASZ environment.", "summary": "Create an AKS ARC cluster instance using a template", "githubUsername": "ReddyVanshika", "docOwner": "ReddyVanshika", From 90065f76d787784f580b28e9bacb7cdfafebe782 Mon Sep 17 00:00:00 2001 From: ReddyVanshika Date: Wed, 13 Nov 2024 13:08:49 -0500 Subject: [PATCH 08/22] modified ReadMe --- quickstarts/microsoft.aksarc/nodepool/README.md | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/quickstarts/microsoft.aksarc/nodepool/README.md b/quickstarts/microsoft.aksarc/nodepool/README.md index 07cd9ae44ea9..1979654f81a1 100644 --- a/quickstarts/microsoft.aksarc/nodepool/README.md +++ b/quickstarts/microsoft.aksarc/nodepool/README.md @@ -11,15 +11,20 @@ languages: --- # Create an AKS ARC Provision cluster using a template -![Azure Public Test Date]() -![Azure Public Test Result](https://azurequickstartsservice.blob.core.windows.net/badges/quickstarts/microsoft.analysisservices/analysis-services-create/PublicDeployment.svg) +![Azure Public Test Date](https://azurequickstartsservice.blob.core.windows.net/badges/quickstarts/microsoft.aksarc/nodepool/PublicLastTestDate.svg) +![Azure Public Test Result](https://azurequickstartsservice.blob.core.windows.net/badges/quickstarts/microsoft.aksarc/nodepool/PublicDeployment.svg) -![Best Practice Check](https://azurequickstartsservice.blob.core.windows.net/badges/quickstarts/microsoft.analysisservices/analysis-services-create/BestPracticeResult.svg) -![Cred Scan Check](https://azurequickstartsservice.blob.core.windows.net/badges/quickstarts/microsoft.analysisservices/analysis-services-create/CredScanResult.svg) +![Azure US Gov Last Test Date](https://azurequickstartsservice.blob.core.windows.net/badges/quickstarts/microsoft.aksarc/nodepool/FairfaxLastTestDate.svg) +![Azure US Gov Last Test Result](https://azurequickstartsservice.blob.core.windows.net/badges/quickstarts/microsoft.aksarc/nodepool/FairfaxDeployment.svg) -[![Deploy To Azure](https://raw.githubusercontent.com/Azure/azure-quickstart-templates/master/1-CONTRIBUTION-GUIDE/images/deploytoazure.svg?sanitize=true)](https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2FAzure%2Fazure-quickstart-templates%2Fmaster%2Fquickstarts%2Fmicrosoft.analysisservices%2Fanalysis-services-create%2Fazuredeploy.json) +![Best Practice Check](https://azurequickstartsservice.blob.core.windows.net/badges/quickstarts/microsoft.aksarc/nodepool/BestPracticeResult.svg) +![Cred Scan Check](https://azurequickstartsservice.blob.core.windows.net/badges/quickstarts/microsoft.aksarc/nodepool/CredScanResult.svg) -[![Visualize](https://raw.githubusercontent.com/Azure/azure-quickstart-templates/master/1-CONTRIBUTION-GUIDE/images/visualizebutton.svg?sanitize=true)](http://armviz.io/#/?load=https%3A%2F%2Fraw.githubusercontent.com%2FAzure%2Fazure-quickstart-templates%2Fmaster%2Fquickstarts%2Fmicrosoft.analysisservices%2Fanalysis-services-create%2Fazuredeploy.json) +![Bicep Version](https://azurequickstartsservice.blob.core.windows.net/badges/quickstarts/microsoft.aksarc/nodepool/BicepVersion.svg) + +[![Deploy To Azure](https://raw.githubusercontent.com/Azure/azure-quickstart-templates/master/1-CONTRIBUTION-GUIDE/images/deploytoazure.svg?sanitize=true)](https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2FAzure%2Fazure-quickstart-templates%2Fmaster%2Fquickstarts%2Fmicrosoft.aksarc%2Fnodepool%2Fazuredeploy.json) +[![Deploy To Azure US Gov](https://raw.githubusercontent.com/Azure/azure-quickstart-templates/master/1-CONTRIBUTION-GUIDE/images/deploytoazuregov.svg?sanitize=true)](https://portal.azure.us/#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2FAzure%2Fazure-quickstart-templates%2Fmaster%2Fquickstarts%2Fmicrosoft.apicenter%2Fazure-api-center-create%2Fazuredeploy.json) +[![Visualize](https://raw.githubusercontent.com/Azure/azure-quickstart-templates/master/1-CONTRIBUTION-GUIDE/images/visualizebutton.svg?sanitize=true)](http://armviz.io/#/?load=https%3A%2F%2Fraw.githubusercontent.com%2FAzure%2Fazure-quickstart-templates%2Fmaster%2Fquickstarts%2Fmicrosoft.apicenter%2Fazure-api-center-create%2Fazuredeploy.json) This template allows you to deploy a new AKS ARC cluster. From 39171a791fbfb9d668b3644e9844c4e4a297ac83 Mon Sep 17 00:00:00 2001 From: ReddyVanshika Date: Wed, 13 Nov 2024 13:22:11 -0500 Subject: [PATCH 09/22] modified ReadMe --- quickstarts/microsoft.aksarc/nodepool/README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/quickstarts/microsoft.aksarc/nodepool/README.md b/quickstarts/microsoft.aksarc/nodepool/README.md index 1979654f81a1..c8127c33ba35 100644 --- a/quickstarts/microsoft.aksarc/nodepool/README.md +++ b/quickstarts/microsoft.aksarc/nodepool/README.md @@ -23,11 +23,11 @@ languages: ![Bicep Version](https://azurequickstartsservice.blob.core.windows.net/badges/quickstarts/microsoft.aksarc/nodepool/BicepVersion.svg) [![Deploy To Azure](https://raw.githubusercontent.com/Azure/azure-quickstart-templates/master/1-CONTRIBUTION-GUIDE/images/deploytoazure.svg?sanitize=true)](https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2FAzure%2Fazure-quickstart-templates%2Fmaster%2Fquickstarts%2Fmicrosoft.aksarc%2Fnodepool%2Fazuredeploy.json) -[![Deploy To Azure US Gov](https://raw.githubusercontent.com/Azure/azure-quickstart-templates/master/1-CONTRIBUTION-GUIDE/images/deploytoazuregov.svg?sanitize=true)](https://portal.azure.us/#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2FAzure%2Fazure-quickstart-templates%2Fmaster%2Fquickstarts%2Fmicrosoft.apicenter%2Fazure-api-center-create%2Fazuredeploy.json) -[![Visualize](https://raw.githubusercontent.com/Azure/azure-quickstart-templates/master/1-CONTRIBUTION-GUIDE/images/visualizebutton.svg?sanitize=true)](http://armviz.io/#/?load=https%3A%2F%2Fraw.githubusercontent.com%2FAzure%2Fazure-quickstart-templates%2Fmaster%2Fquickstarts%2Fmicrosoft.apicenter%2Fazure-api-center-create%2Fazuredeploy.json) +[![Deploy To Azure US Gov](https://raw.githubusercontent.com/Azure/azure-quickstart-templates/master/1-CONTRIBUTION-GUIDE/images/deploytoazuregov.svg?sanitize=true)](https://portal.azure.us/#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2FAzure%2Fazure-quickstart-templates%2Fmaster%2Fquickstarts%2Fmicrosoft.aksarc%2Fnodepool%2Fazuredeploy.json) +[![Visualize](https://raw.githubusercontent.com/Azure/azure-quickstart-templates/master/1-CONTRIBUTION-GUIDE/images/visualizebutton.svg?sanitize=true)](http://armviz.io/#/?load=https%3A%2F%2Fraw.githubusercontent.com%2FAzure%2Fazure-quickstart-templates%2Fmaster%2Fquickstarts%2Fmicrosoft.aksarc%2Fnodepool%2Fazuredeploy.json) This template allows you to deploy a new AKS ARC cluster. For more information about Azure Analysis Services, see [What is Azure Arc enabled Kuberneties](https://learn.microsoft.com/en-us/azure/azure-arc/kubernetes/overview). -`Tags: Microsoft.aksarc/aks-vmware` +`Tags: Microsoft.aksarc/nodepool` From fb2146c2c3a35dccb514950f2b925f480537dab7 Mon Sep 17 00:00:00 2001 From: ReddyVanshika Date: Wed, 13 Nov 2024 15:25:05 -0500 Subject: [PATCH 10/22] fixed best practices --- quickstarts/microsoft.aksarc/nodepool/azuredeploy.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/quickstarts/microsoft.aksarc/nodepool/azuredeploy.json b/quickstarts/microsoft.aksarc/nodepool/azuredeploy.json index 413575aa6765..4b6a5b736879 100644 --- a/quickstarts/microsoft.aksarc/nodepool/azuredeploy.json +++ b/quickstarts/microsoft.aksarc/nodepool/azuredeploy.json @@ -30,14 +30,14 @@ "resources" : [ { "type": "Microsoft.Kubernetes/connectedClusters", - "apiVersion": "[parameters('connectedClustersApiVersion')]", + "apiVersion": "2024-01-01", "name": "[parameters('provisionedClusterName')]", "location": "[parameters('location')]", "condition" : false }, { "type": "microsoft.hybridcontainerservice/provisionedclusterinstances/agentpools", - "apiVersion": "[parameters('provisionedClustersApiVersion')]", + "apiVersion": "2024-01-01", "name": "[concat('default/', parameters('agentName'))]", "scope": "[resourceId('microsoft.Kubernetes/connectedClusters', parameters('provisionedClusterName'))]", "dependsOn": [ From aabc4d97101fd190cebe4c60ad80ae744ec0179b Mon Sep 17 00:00:00 2001 From: ReddyVanshika Date: Wed, 13 Nov 2024 15:41:35 -0500 Subject: [PATCH 11/22] fixed best practices --- quickstarts/microsoft.aksarc/nodepool/azuredeploy.json | 6 ------ .../microsoft.aksarc/nodepool/azuredeploy.parameters.json | 8 +------- 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/quickstarts/microsoft.aksarc/nodepool/azuredeploy.json b/quickstarts/microsoft.aksarc/nodepool/azuredeploy.json index 4b6a5b736879..ecc7b10514d9 100644 --- a/quickstarts/microsoft.aksarc/nodepool/azuredeploy.json +++ b/quickstarts/microsoft.aksarc/nodepool/azuredeploy.json @@ -5,12 +5,6 @@ "provisionedClusterName": { "type": "string" }, - "connectedClustersApiVersion": { - "type": "string" - }, - "provisionedClustersApiVersion": { - "type": "string" - }, "agentName": { "type": "string" }, diff --git a/quickstarts/microsoft.aksarc/nodepool/azuredeploy.parameters.json b/quickstarts/microsoft.aksarc/nodepool/azuredeploy.parameters.json index 3e102ad05cae..cb56b970adcf 100644 --- a/quickstarts/microsoft.aksarc/nodepool/azuredeploy.parameters.json +++ b/quickstarts/microsoft.aksarc/nodepool/azuredeploy.parameters.json @@ -19,12 +19,6 @@ }, "agentOsType": { "value": "Linux" - }, - "provisionedClustersApiVersion":{ - "value": "2024-01-01" - }, - "connectedClustersApiVersion" : { - "value": "2024-07-15-preview" - } + } } } \ No newline at end of file From d787372190f40ca12ad3eedd69207d9c4f62e618 Mon Sep 17 00:00:00 2001 From: ReddyVanshika Date: Thu, 14 Nov 2024 11:37:32 -0500 Subject: [PATCH 12/22] testing params --- .../microsoft.aksarc/nodepool/azuredeploy.parameters.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/quickstarts/microsoft.aksarc/nodepool/azuredeploy.parameters.json b/quickstarts/microsoft.aksarc/nodepool/azuredeploy.parameters.json index cb56b970adcf..4bc22179a55c 100644 --- a/quickstarts/microsoft.aksarc/nodepool/azuredeploy.parameters.json +++ b/quickstarts/microsoft.aksarc/nodepool/azuredeploy.parameters.json @@ -3,13 +3,13 @@ "contentVersion": "1.0.0.0", "parameters": { "provisionedClusterName": { - "value": "TODO: AKS Arc Cluster Name" + "value": "AKSArcClusterName" }, "location": { "value": "eastus" }, "agentName": { - "value": "TODO: Node Pool Name" + "value": "NodePoolName" }, "agentVMSize": { "value": "Standard_A4_v2" From c1ae7d13d47731ae3db22bf210e831dc68846783 Mon Sep 17 00:00:00 2001 From: ReddyVanshika Date: Thu, 14 Nov 2024 11:58:21 -0500 Subject: [PATCH 13/22] checking if template creation works --- .../nodepool/azuredeploy.json | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/quickstarts/microsoft.aksarc/nodepool/azuredeploy.json b/quickstarts/microsoft.aksarc/nodepool/azuredeploy.json index ecc7b10514d9..0c04c5f68e71 100644 --- a/quickstarts/microsoft.aksarc/nodepool/azuredeploy.json +++ b/quickstarts/microsoft.aksarc/nodepool/azuredeploy.json @@ -28,20 +28,20 @@ "name": "[parameters('provisionedClusterName')]", "location": "[parameters('location')]", "condition" : false - }, - { - "type": "microsoft.hybridcontainerservice/provisionedclusterinstances/agentpools", - "apiVersion": "2024-01-01", - "name": "[concat('default/', parameters('agentName'))]", - "scope": "[resourceId('microsoft.Kubernetes/connectedClusters', parameters('provisionedClusterName'))]", - "dependsOn": [ - "[resourceId('microsoft.Kubernetes/connectedClusters', parameters('provisionedClusterName'))]" - ], - "properties": { - "count": "[parameters('agentCount')]", - "osType": "[parameters('agentOsType')]", - "vmSize": "[parameters('agentVMSize')]" - } } + // { + // "type": "microsoft.hybridcontainerservice/provisionedclusterinstances/agentpools", + // "apiVersion": "2024-01-01", + // "name": "[concat('default/', parameters('agentName'))]", + // "scope": "[resourceId('microsoft.Kubernetes/connectedClusters', parameters('provisionedClusterName'))]", + // "dependsOn": [ + // "[resourceId('microsoft.Kubernetes/connectedClusters', parameters('provisionedClusterName'))]" + // ], + // "properties": { + // "count": "[parameters('agentCount')]", + // "osType": "[parameters('agentOsType')]", + // "vmSize": "[parameters('agentVMSize')]" + // } + // } ] } \ No newline at end of file From 92ba35e9da4a212d46b4c5787cdb37f150a42bb3 Mon Sep 17 00:00:00 2001 From: ReddyVanshika Date: Thu, 14 Nov 2024 12:15:36 -0500 Subject: [PATCH 14/22] adding nodepool --- .../nodepool/azuredeploy.json | 29 ++++++++++--------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/quickstarts/microsoft.aksarc/nodepool/azuredeploy.json b/quickstarts/microsoft.aksarc/nodepool/azuredeploy.json index 0c04c5f68e71..9a946d8c376c 100644 --- a/quickstarts/microsoft.aksarc/nodepool/azuredeploy.json +++ b/quickstarts/microsoft.aksarc/nodepool/azuredeploy.json @@ -28,20 +28,21 @@ "name": "[parameters('provisionedClusterName')]", "location": "[parameters('location')]", "condition" : false + }, + { + // "type": "microsoft.hybridcontainerservice/provisionedclusterinstances/agentpools", + "type": "Microsoft.HybridContainerService/provisionedClusters/agentPools", + "apiVersion": "2024-01-01", + "name": "[concat('default/', parameters('agentName'))]", + "scope": "[resourceId('microsoft.Kubernetes/connectedClusters', parameters('provisionedClusterName'))]", + "dependsOn": [ + "[resourceId('microsoft.Kubernetes/connectedClusters', parameters('provisionedClusterName'))]" + ], + "properties": { + "count": "[parameters('agentCount')]", + "osType": "[parameters('agentOsType')]", + "vmSize": "[parameters('agentVMSize')]" + } } - // { - // "type": "microsoft.hybridcontainerservice/provisionedclusterinstances/agentpools", - // "apiVersion": "2024-01-01", - // "name": "[concat('default/', parameters('agentName'))]", - // "scope": "[resourceId('microsoft.Kubernetes/connectedClusters', parameters('provisionedClusterName'))]", - // "dependsOn": [ - // "[resourceId('microsoft.Kubernetes/connectedClusters', parameters('provisionedClusterName'))]" - // ], - // "properties": { - // "count": "[parameters('agentCount')]", - // "osType": "[parameters('agentOsType')]", - // "vmSize": "[parameters('agentVMSize')]" - // } - // } ] } \ No newline at end of file From 30f32225267fd9c59ef07bdb93ba4c0ff14acf26 Mon Sep 17 00:00:00 2001 From: ReddyVanshika Date: Thu, 14 Nov 2024 12:25:08 -0500 Subject: [PATCH 15/22] fixed capitalization --- quickstarts/microsoft.aksarc/nodepool/azuredeploy.json | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/quickstarts/microsoft.aksarc/nodepool/azuredeploy.json b/quickstarts/microsoft.aksarc/nodepool/azuredeploy.json index 9a946d8c376c..1f9acee46908 100644 --- a/quickstarts/microsoft.aksarc/nodepool/azuredeploy.json +++ b/quickstarts/microsoft.aksarc/nodepool/azuredeploy.json @@ -30,13 +30,12 @@ "condition" : false }, { - // "type": "microsoft.hybridcontainerservice/provisionedclusterinstances/agentpools", - "type": "Microsoft.HybridContainerService/provisionedClusters/agentPools", + "type": "Microsoft.HybridContainerService/provisionedClusterInstances/agentPools", "apiVersion": "2024-01-01", "name": "[concat('default/', parameters('agentName'))]", - "scope": "[resourceId('microsoft.Kubernetes/connectedClusters', parameters('provisionedClusterName'))]", + "scope": "[resourceId('Microsoft.Kubernetes/connectedClusters', parameters('provisionedClusterName'))]", "dependsOn": [ - "[resourceId('microsoft.Kubernetes/connectedClusters', parameters('provisionedClusterName'))]" + "[resourceId('Microsoft.Kubernetes/connectedClusters', parameters('provisionedClusterName'))]" ], "properties": { "count": "[parameters('agentCount')]", From 54044fb57242623df2179dcf6f0e6a4001d7f892 Mon Sep 17 00:00:00 2001 From: ReddyVanshika Date: Thu, 14 Nov 2024 13:27:13 -0500 Subject: [PATCH 16/22] modified readMe --- quickstarts/microsoft.aksarc/nodepool/README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/quickstarts/microsoft.aksarc/nodepool/README.md b/quickstarts/microsoft.aksarc/nodepool/README.md index c8127c33ba35..a6c7021921c0 100644 --- a/quickstarts/microsoft.aksarc/nodepool/README.md +++ b/quickstarts/microsoft.aksarc/nodepool/README.md @@ -1,5 +1,5 @@ --- -description: Deploys a provisioned cluster +description: Deploys a nodepool on an existing provisioned cluster page_type: sample products: - azure @@ -9,7 +9,7 @@ languages: - json - bicep --- -# Create an AKS ARC Provision cluster using a template +# Create an AKS ARC nodepool on an existing provisioned cluster using a template ![Azure Public Test Date](https://azurequickstartsservice.blob.core.windows.net/badges/quickstarts/microsoft.aksarc/nodepool/PublicLastTestDate.svg) ![Azure Public Test Result](https://azurequickstartsservice.blob.core.windows.net/badges/quickstarts/microsoft.aksarc/nodepool/PublicDeployment.svg) @@ -26,8 +26,8 @@ languages: [![Deploy To Azure US Gov](https://raw.githubusercontent.com/Azure/azure-quickstart-templates/master/1-CONTRIBUTION-GUIDE/images/deploytoazuregov.svg?sanitize=true)](https://portal.azure.us/#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2FAzure%2Fazure-quickstart-templates%2Fmaster%2Fquickstarts%2Fmicrosoft.aksarc%2Fnodepool%2Fazuredeploy.json) [![Visualize](https://raw.githubusercontent.com/Azure/azure-quickstart-templates/master/1-CONTRIBUTION-GUIDE/images/visualizebutton.svg?sanitize=true)](http://armviz.io/#/?load=https%3A%2F%2Fraw.githubusercontent.com%2FAzure%2Fazure-quickstart-templates%2Fmaster%2Fquickstarts%2Fmicrosoft.aksarc%2Fnodepool%2Fazuredeploy.json) -This template allows you to deploy a new AKS ARC cluster. +This template allows you to deploy a new AKS ARC nodepool on an existing provisioned cluster. -For more information about Azure Analysis Services, see [What is Azure Arc enabled Kuberneties](https://learn.microsoft.com/en-us/azure/azure-arc/kubernetes/overview). +For more information about Azure Kuberneties Service, see [What is Azure Arc enabled Kuberneties](https://learn.microsoft.com/en-us/azure/azure-arc/kubernetes/overview). `Tags: Microsoft.aksarc/nodepool` From a77a4df9bc79ba1c80455f664f7a4f9d644fa635 Mon Sep 17 00:00:00 2001 From: ReddyVanshika Date: Fri, 15 Nov 2024 13:16:03 -0500 Subject: [PATCH 17/22] used gen-unique --- .../microsoft.aksarc/nodepool/azuredeploy.parameters.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/quickstarts/microsoft.aksarc/nodepool/azuredeploy.parameters.json b/quickstarts/microsoft.aksarc/nodepool/azuredeploy.parameters.json index 4bc22179a55c..b17b20a55021 100644 --- a/quickstarts/microsoft.aksarc/nodepool/azuredeploy.parameters.json +++ b/quickstarts/microsoft.aksarc/nodepool/azuredeploy.parameters.json @@ -3,13 +3,13 @@ "contentVersion": "1.0.0.0", "parameters": { "provisionedClusterName": { - "value": "AKSArcClusterName" + "value": "GEN-UNIQUE" }, "location": { "value": "eastus" }, "agentName": { - "value": "NodePoolName" + "value": "GEN-UNIQUE" }, "agentVMSize": { "value": "Standard_A4_v2" From b2aade808f6a74bbf44198269ffbbaebc945fe62 Mon Sep 17 00:00:00 2001 From: ReddyVanshika Date: Fri, 15 Nov 2024 14:04:07 -0500 Subject: [PATCH 18/22] updated metadata --- quickstarts/microsoft.aksarc/nodepool/metadata.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/quickstarts/microsoft.aksarc/nodepool/metadata.json b/quickstarts/microsoft.aksarc/nodepool/metadata.json index 1a5a3cc2b347..dc7f937d6e55 100644 --- a/quickstarts/microsoft.aksarc/nodepool/metadata.json +++ b/quickstarts/microsoft.aksarc/nodepool/metadata.json @@ -1,10 +1,10 @@ { "$schema": "https://aka.ms/azure-quickstart-templates-metadata-schema#", "type": "QuickStart", - "itemDisplayName": "Deploys a provisioned cluster", - "description": "Deploys a provisioned cluster with workload identity federation enabled and OIDC issuer URL enabled on ASZ environment.", - "summary": "Create an AKS ARC cluster instance using a template", + "itemDisplayName": "Deploys a nodepool", + "description": "Deploys a nodepool on an existing provisioned cluster with workload identity federation enabled and OIDC issuer URL enabled on ASZ environment.", + "summary": "Create a nodepool instance using a template", "githubUsername": "ReddyVanshika", "docOwner": "ReddyVanshika", - "dateUpdated": "2024-11-05" + "dateUpdated": "2024-11-15" } \ No newline at end of file From 80955e43a3f153e343be9a4c0ec2ccf239a6e6e8 Mon Sep 17 00:00:00 2001 From: ReddyVanshika Date: Fri, 15 Nov 2024 14:34:09 -0500 Subject: [PATCH 19/22] commenting depedns on --- quickstarts/microsoft.aksarc/nodepool/azuredeploy.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/quickstarts/microsoft.aksarc/nodepool/azuredeploy.json b/quickstarts/microsoft.aksarc/nodepool/azuredeploy.json index 1f9acee46908..573ad7ce3ac1 100644 --- a/quickstarts/microsoft.aksarc/nodepool/azuredeploy.json +++ b/quickstarts/microsoft.aksarc/nodepool/azuredeploy.json @@ -34,9 +34,9 @@ "apiVersion": "2024-01-01", "name": "[concat('default/', parameters('agentName'))]", "scope": "[resourceId('Microsoft.Kubernetes/connectedClusters', parameters('provisionedClusterName'))]", - "dependsOn": [ - "[resourceId('Microsoft.Kubernetes/connectedClusters', parameters('provisionedClusterName'))]" - ], + // "dependsOn": [ + // "[resourceId('Microsoft.Kubernetes/connectedClusters', parameters('provisionedClusterName'))]" + // ], "properties": { "count": "[parameters('agentCount')]", "osType": "[parameters('agentOsType')]", From 63c08f2f307ba4907adbf423bf6914cb0b902f8d Mon Sep 17 00:00:00 2001 From: ReddyVanshika Date: Fri, 15 Nov 2024 15:56:31 -0500 Subject: [PATCH 20/22] reverting --- quickstarts/microsoft.aksarc/nodepool/azuredeploy.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/quickstarts/microsoft.aksarc/nodepool/azuredeploy.json b/quickstarts/microsoft.aksarc/nodepool/azuredeploy.json index 573ad7ce3ac1..1f9acee46908 100644 --- a/quickstarts/microsoft.aksarc/nodepool/azuredeploy.json +++ b/quickstarts/microsoft.aksarc/nodepool/azuredeploy.json @@ -34,9 +34,9 @@ "apiVersion": "2024-01-01", "name": "[concat('default/', parameters('agentName'))]", "scope": "[resourceId('Microsoft.Kubernetes/connectedClusters', parameters('provisionedClusterName'))]", - // "dependsOn": [ - // "[resourceId('Microsoft.Kubernetes/connectedClusters', parameters('provisionedClusterName'))]" - // ], + "dependsOn": [ + "[resourceId('Microsoft.Kubernetes/connectedClusters', parameters('provisionedClusterName'))]" + ], "properties": { "count": "[parameters('agentCount')]", "osType": "[parameters('agentOsType')]", From 8dad09153c1a08fe62ec5d41fb7f531aa094fcdd Mon Sep 17 00:00:00 2001 From: ReddyVanshika Date: Tue, 26 Nov 2024 13:01:32 -0500 Subject: [PATCH 21/22] changed provisioned cluster type --- .../microsoft.aksarc/nodepool/azuredeploy.json | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/quickstarts/microsoft.aksarc/nodepool/azuredeploy.json b/quickstarts/microsoft.aksarc/nodepool/azuredeploy.json index 1f9acee46908..9fdde12d6c03 100644 --- a/quickstarts/microsoft.aksarc/nodepool/azuredeploy.json +++ b/quickstarts/microsoft.aksarc/nodepool/azuredeploy.json @@ -22,8 +22,15 @@ } }, "resources" : [ + // { + // "type": "Microsoft.Kubernetes/connectedClusters", + // "apiVersion": "2024-01-01", + // "name": "[parameters('provisionedClusterName')]", + // "location": "[parameters('location')]", + // "condition" : false + // }, { - "type": "Microsoft.Kubernetes/connectedClusters", + "type": "Microsoft.HybridContainerService/provisionedClusterInstances", "apiVersion": "2024-01-01", "name": "[parameters('provisionedClusterName')]", "location": "[parameters('location')]", @@ -33,9 +40,9 @@ "type": "Microsoft.HybridContainerService/provisionedClusterInstances/agentPools", "apiVersion": "2024-01-01", "name": "[concat('default/', parameters('agentName'))]", - "scope": "[resourceId('Microsoft.Kubernetes/connectedClusters', parameters('provisionedClusterName'))]", + // "scope": "[resourceId('Microsoft.Kubernetes/connectedClusters', parameters('provisionedClusterName'))]", "dependsOn": [ - "[resourceId('Microsoft.Kubernetes/connectedClusters', parameters('provisionedClusterName'))]" + "[resourceId('Microsoft.HybridContainerService/provisionedClusterInstances', parameters('provisionedClusterName'))]" ], "properties": { "count": "[parameters('agentCount')]", From 99001dd52227307217d591bd9400ab20ee1e74dc Mon Sep 17 00:00:00 2001 From: ReddyVanshika Date: Tue, 26 Nov 2024 13:10:42 -0500 Subject: [PATCH 22/22] changed provisioned cluster type back emoved scope --- .../microsoft.aksarc/nodepool/azuredeploy.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/quickstarts/microsoft.aksarc/nodepool/azuredeploy.json b/quickstarts/microsoft.aksarc/nodepool/azuredeploy.json index 9fdde12d6c03..99c384484351 100644 --- a/quickstarts/microsoft.aksarc/nodepool/azuredeploy.json +++ b/quickstarts/microsoft.aksarc/nodepool/azuredeploy.json @@ -22,27 +22,27 @@ } }, "resources" : [ - // { - // "type": "Microsoft.Kubernetes/connectedClusters", - // "apiVersion": "2024-01-01", - // "name": "[parameters('provisionedClusterName')]", - // "location": "[parameters('location')]", - // "condition" : false - // }, { - "type": "Microsoft.HybridContainerService/provisionedClusterInstances", + "type": "Microsoft.Kubernetes/connectedClusters", "apiVersion": "2024-01-01", "name": "[parameters('provisionedClusterName')]", "location": "[parameters('location')]", "condition" : false }, + // { + // "type": "Microsoft.HybridContainerService/provisionedClusterInstances", + // "apiVersion": "2024-01-01", + // "name": "[parameters('provisionedClusterName')]", + // "location": "[parameters('location')]", + // "condition" : false + // }, { "type": "Microsoft.HybridContainerService/provisionedClusterInstances/agentPools", "apiVersion": "2024-01-01", "name": "[concat('default/', parameters('agentName'))]", // "scope": "[resourceId('Microsoft.Kubernetes/connectedClusters', parameters('provisionedClusterName'))]", "dependsOn": [ - "[resourceId('Microsoft.HybridContainerService/provisionedClusterInstances', parameters('provisionedClusterName'))]" + "[resourceId('Microsoft.Kubernetes/connectedClusters', parameters('provisionedClusterName'))]" ], "properties": { "count": "[parameters('agentCount')]",