From 1805c98a71ac9946b7cfb888cdfba92b3c3846c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julian=20Pei=C3=9Fker?= <30857628+JPEasier@users.noreply.github.com> Date: Sat, 14 Dec 2024 00:33:32 +0100 Subject: [PATCH] feat: Update AKS Automatic mode examples to indicate PREVIEW status (#3920) ## Description Add documentation to test files to indicate that the AKS Automatic mode examples are in preview. Reduce count in test files. ## Pipeline Reference | Pipeline | | -------- | | [![avm.res.container-service.managed-cluster](https://github.com/JPEasier/bicep-registry-modules/actions/workflows/avm.res.container-service.managed-cluster.yml/badge.svg?branch=users%2Fjpeasier%2FpreviewAksDoc)](https://github.com/JPEasier/bicep-registry-modules/actions/workflows/avm.res.container-service.managed-cluster.yml) | ## Type of Change - [ ] Update to CI Environment or utilities (Non-module affecting changes) - [ ] Azure Verified Module updates: - [ ] Bugfix containing backwards-compatible bug fixes, and I have NOT bumped the MAJOR or MINOR version in `version.json`: - [ ] Someone has opened a bug report issue, and I have included "Closes #{bug_report_issue_number}" in the PR description. - [ ] The bug was found by the module author, and no one has opened an issue to report it yet. - [ ] Feature update backwards compatible feature updates, and I have bumped the MINOR version in `version.json`. - [ ] Breaking changes and I have bumped the MAJOR version in `version.json`. - [x] Update to documentation ## Checklist - [x] I'm sure there are no other open Pull Requests for the same update/change - [x] I have run `Set-AVMModule` locally to generate the supporting module files. - [x] My corresponding pipelines / checks run clean and green without any errors or warnings --- .../managed-cluster/README.md | 273 +++++------------- .../managed-cluster/main.bicep | 36 ++- .../managed-cluster/main.json | 16 +- .../tests/e2e/automatic/main.test.bicep | 17 +- .../tests/e2e/azure/main.test.bicep | 6 +- .../tests/e2e/defaults/main.test.bicep | 2 +- .../tests/e2e/istio/main.test.bicep | 4 +- .../tests/e2e/kubenet/main.test.bicep | 24 +- .../tests/e2e/non-aad-cluster/main.test.bicep | 2 +- .../tests/e2e/priv/main.test.bicep | 24 +- .../tests/e2e/waf-aligned/main.test.bicep | 12 +- 11 files changed, 141 insertions(+), 275 deletions(-) diff --git a/avm/res/container-service/managed-cluster/README.md b/avm/res/container-service/managed-cluster/README.md index df3ae5fcb5..b54834deaa 100644 --- a/avm/res/container-service/managed-cluster/README.md +++ b/avm/res/container-service/managed-cluster/README.md @@ -32,7 +32,7 @@ The following section provides usage examples for the module, which were used to >**Note**: To reference the module, please use the following syntax `br/public:avm/res/container-service/managed-cluster:`. -- [Using only defaults and use AKS Automatic mode](#example-1-using-only-defaults-and-use-aks-automatic-mode) +- [Using only defaults and use AKS Automatic mode (PREVIEW)](#example-1-using-only-defaults-and-use-aks-automatic-mode-preview) - [Using Azure CNI Network Plugin.](#example-2-using-azure-cni-network-plugin) - [Using only defaults](#example-3-using-only-defaults) - [Using Istio Service Mesh add-on](#example-4-using-istio-service-mesh-add-on) @@ -41,9 +41,15 @@ The following section provides usage examples for the module, which were used to - [Using Private Cluster.](#example-7-using-private-cluster) - [WAF-aligned](#example-8-waf-aligned) -### Example 1: _Using only defaults and use AKS Automatic mode_ +### Example 1: _Using only defaults and use AKS Automatic mode (PREVIEW)_ + +This instance deploys the module with the set of automatic parameters.' + +Node autoprovisioning (NAP) for AKS is currently in PREVIEW. +Register the NodeAutoProvisioningPreview feature flag using the az feature register command. + +MICROSOFT MAY NOT PROVIDE SUPPORT FOR THIS, PLEASE CHECK THE [PRODUCT DOCS](https://learn.microsoft.com/en-us/azure/aks/node-autoprovision?tabs=azure-cli#enable-node-autoprovisioning) FOR CLARIFICATION. -This instance deploys the module with the set of automatic parameters.
@@ -58,7 +64,7 @@ module managedCluster 'br/public:avm/res/container-service/managed-cluster:' param name = 'csauto001' param primaryAgentPoolProfiles = [ { - count: 3 + count: 1 mode: 'System' name: 'systempool' vmSize: 'Standard_DS4_v2' @@ -279,9 +281,7 @@ param maintenanceConfigurations = [ param managedIdentities = { systemAssigned: true } -param nodeProvisioningProfile = { - mode: 'Auto' -} +param nodeProvisioningProfileMode = 'Auto' param nodeResourceGroupProfile = { restrictionLevel: 'ReadOnly' } @@ -328,7 +328,7 @@ module managedCluster 'br/public:avm/res/container-service/managed-cluster:' } ] @@ -357,7 +357,7 @@ module managedCluster 'br/public:avm/res/container-service/managed-cluster:' } { @@ -378,7 +378,7 @@ module managedCluster 'br/public:avm/res/container-service/managed-cluster:' } ] @@ -588,7 +588,7 @@ module managedCluster 'br/public:avm/res/container-service/managed-cluster:" } ] @@ -621,7 +621,7 @@ module managedCluster 'br/public:avm/res/container-service/managed-cluster:" }, { @@ -642,7 +642,7 @@ module managedCluster 'br/public:avm/res/container-service/managed-cluster:" } ] @@ -906,7 +906,7 @@ param primaryAgentPoolProfiles = [ osDiskSizeGB: 0 osType: 'Linux' type: 'VirtualMachineScaleSets' - vmSize: 'Standard_DS2_v2' + vmSize: 'Standard_DS4_v2' vnetSubnetResourceId: '' } ] @@ -935,7 +935,7 @@ param agentPools = [ scaleSetEvictionPolicy: 'Delete' scaleSetPriority: 'Regular' type: 'VirtualMachineScaleSets' - vmSize: 'Standard_DS2_v2' + vmSize: 'Standard_DS4_v2' vnetSubnetResourceId: '' } { @@ -956,7 +956,7 @@ param agentPools = [ scaleSetEvictionPolicy: 'Delete' scaleSetPriority: 'Regular' type: 'VirtualMachineScaleSets' - vmSize: 'Standard_DS2_v2' + vmSize: 'Standard_DS4_v2' vnetSubnetResourceId: '' } ] @@ -1152,7 +1152,7 @@ module managedCluster 'br/public:avm/res/container-service/managed-cluster:' param name = 'csist001' param primaryAgentPoolProfiles = [ { - count: 3 + count: 2 mode: 'System' name: 'systempool' - vmSize: 'Standard_DS2_v2' + vmSize: 'Standard_DS4_v2' } ] // Non-required parameters @@ -1449,7 +1449,7 @@ module managedCluster 'br/public:avm/res/container-service/managed-cluster:' param name = 'csnonaad001' param primaryAgentPoolProfiles = [ { - count: 3 + count: 1 mode: 'System' name: 'systempool' vmSize: 'Standard_DS2_v2' @@ -1973,7 +1913,7 @@ module managedCluster 'br/public:avm/res/container-service/managed-cluster:' } ] @@ -2001,29 +1941,9 @@ module managedCluster 'br/public:avm/res/container-service/managed-cluster:' } - { - availabilityZones: [ - 3 - ] - count: 2 - enableAutoScaling: true - maxCount: 3 - maxPods: 30 - minCount: 1 - minPods: 2 - mode: 'User' - name: 'userpool2' - nodeLabels: {} - osDiskSizeGB: 128 - osType: 'Linux' - scaleSetEvictionPolicy: 'Delete' - scaleSetPriority: 'Regular' - type: 'VirtualMachineScaleSets' - vmSize: 'Standard_DS2_v2' - } ] dnsServiceIP: '10.10.200.10' enablePrivateCluster: true @@ -2076,7 +1996,7 @@ module managedCluster 'br/public:avm/res/container-service/managed-cluster:" } ] @@ -2108,28 +2028,8 @@ module managedCluster 'br/public:avm/res/container-service/managed-cluster:" - }, - { - "availabilityZones": [ - 3 - ], - "count": 2, - "enableAutoScaling": true, - "maxCount": 3, - "maxPods": 30, - "minCount": 1, - "minPods": 2, - "mode": "User", - "name": "userpool2", - "nodeLabels": {}, - "osDiskSizeGB": 128, - "osType": "Linux", - "scaleSetEvictionPolicy": "Delete", - "scaleSetPriority": "Regular", - "type": "VirtualMachineScaleSets", - "vmSize": "Standard_DS2_v2" } ] }, @@ -2195,7 +2095,7 @@ param primaryAgentPoolProfiles = [ osDiskSizeGB: 0 osType: 'Linux' type: 'VirtualMachineScaleSets' - vmSize: 'Standard_DS2_v2' + vmSize: 'Standard_DS4_v2' vnetSubnetResourceId: '' } ] @@ -2223,29 +2123,9 @@ param agentPools = [ scaleSetEvictionPolicy: 'Delete' scaleSetPriority: 'Regular' type: 'VirtualMachineScaleSets' - vmSize: 'Standard_DS2_v2' + vmSize: 'Standard_DS4_v2' vnetSubnetResourceId: '' } - { - availabilityZones: [ - 3 - ] - count: 2 - enableAutoScaling: true - maxCount: 3 - maxPods: 30 - minCount: 1 - minPods: 2 - mode: 'User' - name: 'userpool2' - nodeLabels: {} - osDiskSizeGB: 128 - osType: 'Linux' - scaleSetEvictionPolicy: 'Delete' - scaleSetPriority: 'Regular' - type: 'VirtualMachineScaleSets' - vmSize: 'Standard_DS2_v2' - } ] param dnsServiceIP = '10.10.200.10' param enablePrivateCluster = true @@ -2284,7 +2164,7 @@ module managedCluster 'br/public:avm/res/container-service/managed-cluster:' } ] @@ -2311,7 +2191,7 @@ module managedCluster 'br/public:avm/res/container-service/managed-cluster:' } { availabilityZones: [ 3 ] - count: 3 + count: 2 enableAutoScaling: true maxCount: 3 maxPods: 50 @@ -2348,7 +2228,7 @@ module managedCluster 'br/public:avm/res/container-service/managed-cluster:" } ] @@ -2492,7 +2372,7 @@ module managedCluster 'br/public:avm/res/container-service/managed-cluster:" }, { "availabilityZones": [ 3 ], - "count": 3, + "count": 2, "enableAutoScaling": true, "maxCount": 3, "maxPods": 50, @@ -2529,7 +2409,7 @@ module managedCluster 'br/public:avm/res/container-service/managed-cluster:' } ] @@ -2701,7 +2581,7 @@ param agentPools = [ availabilityZones: [ 3 ] - count: 3 + count: 2 enableAutoScaling: true maxCount: 3 maxPods: 50 @@ -2716,14 +2596,14 @@ param agentPools = [ scaleSetEvictionPolicy: 'Delete' scaleSetPriority: 'Regular' type: 'VirtualMachineScaleSets' - vmSize: 'Standard_DS2_v2' + vmSize: 'Standard_DS4_v2' vnetSubnetResourceId: '' } { availabilityZones: [ 3 ] - count: 3 + count: 2 enableAutoScaling: true maxCount: 3 maxPods: 50 @@ -2738,7 +2618,7 @@ param agentPools = [ scaleSetEvictionPolicy: 'Delete' scaleSetPriority: 'Regular' type: 'VirtualMachineScaleSets' - vmSize: 'Standard_DS2_v2' + vmSize: 'Standard_DS4_v2' } ] param autoNodeOsUpgradeProfileUpgradeChannel = 'Unmanaged' @@ -2933,7 +2813,7 @@ param tags = { | [`networkPlugin`](#parameter-networkplugin) | string | Specifies the network plugin used for building Kubernetes network. | | [`networkPluginMode`](#parameter-networkpluginmode) | string | Network plugin mode used for building the Kubernetes network. Not compatible with kubenet network plugin. | | [`networkPolicy`](#parameter-networkpolicy) | string | Specifies the network policy used for building Kubernetes network. - calico or azure. | -| [`nodeProvisioningProfile`](#parameter-nodeprovisioningprofile) | object | Node provisioning settings that apply to the whole cluster. | +| [`nodeProvisioningProfileMode`](#parameter-nodeprovisioningprofilemode) | string | Node provisioning settings that apply to the whole cluster. AUTO MODE IS A PARAMETER USED FOR A PREVIEW FEATURE, MICROSOFT MAY NOT PROVIDE SUPPORT FOR THIS, PLEASE CHECK THE [PRODUCT DOCS](https://learn.microsoft.com/en-us/azure/aks/learn/quick-kubernetes-automatic-deploy?pivots=bicep#before-you-begin) FOR CLARIFICATION. | | [`nodeResourceGroup`](#parameter-noderesourcegroup) | string | Name of the resource group containing agent pool nodes. | | [`nodeResourceGroupProfile`](#parameter-noderesourcegroupprofile) | object | The node resource group configuration profile. | | [`omsAgentEnabled`](#parameter-omsagentenabled) | bool | Specifies whether the OMS agent is enabled. | @@ -2948,7 +2828,7 @@ param tags = { | [`publicNetworkAccess`](#parameter-publicnetworkaccess) | string | Allow or deny public network access for AKS. | | [`roleAssignments`](#parameter-roleassignments) | array | Array of role assignments to create. | | [`serviceCidr`](#parameter-servicecidr) | string | A CIDR notation IP range from which to assign service cluster IPs. It must not overlap with any Subnet IP ranges. | -| [`skuName`](#parameter-skuname) | string | Name of a managed cluster SKU. | +| [`skuName`](#parameter-skuname) | string | Name of a managed cluster SKU. AUTOMATIC CLUSTER SKU IS A PARAMETER USED FOR A PREVIEW FEATURE, MICROSOFT MAY NOT PROVIDE SUPPORT FOR THIS, PLEASE CHECK THE [PRODUCT DOCS](https://learn.microsoft.com/en-us/azure/aks/learn/quick-kubernetes-automatic-deploy?pivots=bicep#before-you-begin) FOR CLARIFICATION. | | [`skuTier`](#parameter-skutier) | string | Tier of a managed cluster SKU. | | [`sshPublicKey`](#parameter-sshpublickey) | string | Specifies the SSH RSA public key string for the Linux nodes. | | [`supportPlan`](#parameter-supportplan) | string | The support plan for the Managed Cluster. | @@ -4874,12 +4754,19 @@ Specifies the network policy used for building Kubernetes network. - calico or a ] ``` -### Parameter: `nodeProvisioningProfile` +### Parameter: `nodeProvisioningProfileMode` -Node provisioning settings that apply to the whole cluster. +Node provisioning settings that apply to the whole cluster. AUTO MODE IS A PARAMETER USED FOR A PREVIEW FEATURE, MICROSOFT MAY NOT PROVIDE SUPPORT FOR THIS, PLEASE CHECK THE [PRODUCT DOCS](https://learn.microsoft.com/en-us/azure/aks/learn/quick-kubernetes-automatic-deploy?pivots=bicep#before-you-begin) FOR CLARIFICATION. - Required: No -- Type: object +- Type: string +- Allowed: + ```Bicep + [ + 'Auto' + 'Manual' + ] + ``` ### Parameter: `nodeResourceGroup` @@ -5115,7 +5002,7 @@ A CIDR notation IP range from which to assign service cluster IPs. It must not o ### Parameter: `skuName` -Name of a managed cluster SKU. +Name of a managed cluster SKU. AUTOMATIC CLUSTER SKU IS A PARAMETER USED FOR A PREVIEW FEATURE, MICROSOFT MAY NOT PROVIDE SUPPORT FOR THIS, PLEASE CHECK THE [PRODUCT DOCS](https://learn.microsoft.com/en-us/azure/aks/learn/quick-kubernetes-automatic-deploy?pivots=bicep#before-you-begin) FOR CLARIFICATION. - Required: No - Type: string diff --git a/avm/res/container-service/managed-cluster/main.bicep b/avm/res/container-service/managed-cluster/main.bicep index 4f43bef58a..802fbcbd31 100644 --- a/avm/res/container-service/managed-cluster/main.bicep +++ b/avm/res/container-service/managed-cluster/main.bicep @@ -77,7 +77,7 @@ param backendPoolType string = 'NodeIPConfiguration' ]) param outboundType string = 'loadBalancer' -@description('Optional. Name of a managed cluster SKU.') +@description('Optional. Name of a managed cluster SKU. AUTOMATIC CLUSTER SKU IS A PARAMETER USED FOR A PREVIEW FEATURE, MICROSOFT MAY NOT PROVIDE SUPPORT FOR THIS, PLEASE CHECK THE [PRODUCT DOCS](https://learn.microsoft.com/en-us/azure/aks/learn/quick-kubernetes-automatic-deploy?pivots=bicep#before-you-begin) FOR CLARIFICATION.') @allowed([ 'Base' 'Automatic' @@ -113,8 +113,12 @@ param enableRBAC bool = true @description('Optional. If set to true, getting static credentials will be disabled for this cluster. This must only be used on Managed Clusters that are AAD enabled.') param disableLocalAccounts bool = true -@description('Optional. Node provisioning settings that apply to the whole cluster.') -param nodeProvisioningProfile object? +@description('Optional. Node provisioning settings that apply to the whole cluster. AUTO MODE IS A PARAMETER USED FOR A PREVIEW FEATURE, MICROSOFT MAY NOT PROVIDE SUPPORT FOR THIS, PLEASE CHECK THE [PRODUCT DOCS](https://learn.microsoft.com/en-us/azure/aks/learn/quick-kubernetes-automatic-deploy?pivots=bicep#before-you-begin) FOR CLARIFICATION.') +@allowed([ + 'Auto' + 'Manual' +]) +param nodeProvisioningProfileMode string? @description('Optional. Name of the resource group containing agent pool nodes.') param nodeResourceGroup string = '${resourceGroup().name}_aks_${name}_nodes' @@ -689,7 +693,11 @@ resource managedCluster 'Microsoft.ContainerService/managedClusters@2024-03-02-p disableLocalAccounts: disableLocalAccounts nodeResourceGroup: nodeResourceGroup nodeResourceGroupProfile: nodeResourceGroupProfile - nodeProvisioningProfile: nodeProvisioningProfile + nodeProvisioningProfile: !empty(nodeProvisioningProfileMode) + ? { + mode: nodeProvisioningProfileMode + } + : null enablePodSecurityPolicy: enablePodSecurityPolicy workloadAutoScalerProfile: { keda: { @@ -720,15 +728,17 @@ resource managedCluster 'Microsoft.ContainerService/managedClusters@2024-03-02-p } } publicNetworkAccess: publicNetworkAccess - aadProfile: !empty(aadProfile) ? { - clientAppID: aadProfile.?aadProfileClientAppID - serverAppID: aadProfile.?aadProfileServerAppID - serverAppSecret: aadProfile.?aadProfileServerAppSecret - managed: aadProfile.?aadProfileManaged - enableAzureRBAC: aadProfile.?aadProfileEnableAzureRBAC - adminGroupObjectIDs: aadProfile.?aadProfileAdminGroupObjectIDs - tenantID: aadProfile.?aadProfileTenantId - } : null + aadProfile: !empty(aadProfile) + ? { + clientAppID: aadProfile.?aadProfileClientAppID + serverAppID: aadProfile.?aadProfileServerAppID + serverAppSecret: aadProfile.?aadProfileServerAppSecret + managed: aadProfile.?aadProfileManaged + enableAzureRBAC: aadProfile.?aadProfileEnableAzureRBAC + adminGroupObjectIDs: aadProfile.?aadProfileAdminGroupObjectIDs + tenantID: aadProfile.?aadProfileTenantId + } + : null autoScalerProfile: { 'balance-similar-node-groups': toLower(string(autoScalerProfileBalanceSimilarNodeGroups)) expander: autoScalerProfileExpander diff --git a/avm/res/container-service/managed-cluster/main.json b/avm/res/container-service/managed-cluster/main.json index 084e45dd75..af2023e345 100644 --- a/avm/res/container-service/managed-cluster/main.json +++ b/avm/res/container-service/managed-cluster/main.json @@ -6,7 +6,7 @@ "_generator": { "name": "bicep", "version": "0.32.4.45862", - "templateHash": "4928183195543464139" + "templateHash": "15234959045281729347" }, "name": "Azure Kubernetes Service (AKS) Managed Clusters", "description": "This module deploys an Azure Kubernetes Service (AKS) Managed Cluster.", @@ -949,7 +949,7 @@ "Automatic" ], "metadata": { - "description": "Optional. Name of a managed cluster SKU." + "description": "Optional. Name of a managed cluster SKU. AUTOMATIC CLUSTER SKU IS A PARAMETER USED FOR A PREVIEW FEATURE, MICROSOFT MAY NOT PROVIDE SUPPORT FOR THIS, PLEASE CHECK THE [PRODUCT DOCS](https://learn.microsoft.com/en-us/azure/aks/learn/quick-kubernetes-automatic-deploy?pivots=bicep#before-you-begin) FOR CLARIFICATION." } }, "skuTier": { @@ -1013,11 +1013,15 @@ "description": "Optional. If set to true, getting static credentials will be disabled for this cluster. This must only be used on Managed Clusters that are AAD enabled." } }, - "nodeProvisioningProfile": { - "type": "object", + "nodeProvisioningProfileMode": { + "type": "string", "nullable": true, + "allowedValues": [ + "Auto", + "Manual" + ], "metadata": { - "description": "Optional. Node provisioning settings that apply to the whole cluster." + "description": "Optional. Node provisioning settings that apply to the whole cluster. AUTO MODE IS A PARAMETER USED FOR A PREVIEW FEATURE, MICROSOFT MAY NOT PROVIDE SUPPORT FOR THIS, PLEASE CHECK THE [PRODUCT DOCS](https://learn.microsoft.com/en-us/azure/aks/learn/quick-kubernetes-automatic-deploy?pivots=bicep#before-you-begin) FOR CLARIFICATION." } }, "nodeResourceGroup": { @@ -1790,7 +1794,7 @@ "disableLocalAccounts": "[parameters('disableLocalAccounts')]", "nodeResourceGroup": "[parameters('nodeResourceGroup')]", "nodeResourceGroupProfile": "[parameters('nodeResourceGroupProfile')]", - "nodeProvisioningProfile": "[parameters('nodeProvisioningProfile')]", + "nodeProvisioningProfile": "[if(not(empty(parameters('nodeProvisioningProfileMode'))), createObject('mode', parameters('nodeProvisioningProfileMode')), null())]", "enablePodSecurityPolicy": "[parameters('enablePodSecurityPolicy')]", "workloadAutoScalerProfile": { "keda": { diff --git a/avm/res/container-service/managed-cluster/tests/e2e/automatic/main.test.bicep b/avm/res/container-service/managed-cluster/tests/e2e/automatic/main.test.bicep index ae07f983d5..eaf73bd0a7 100644 --- a/avm/res/container-service/managed-cluster/tests/e2e/automatic/main.test.bicep +++ b/avm/res/container-service/managed-cluster/tests/e2e/automatic/main.test.bicep @@ -1,7 +1,14 @@ targetScope = 'subscription' -metadata name = 'Using only defaults and use AKS Automatic mode' -metadata description = 'This instance deploys the module with the set of automatic parameters.' +metadata name = 'Using only defaults and use AKS Automatic mode (PREVIEW)' +metadata description = ''' +This instance deploys the module with the set of automatic parameters.' + +Node autoprovisioning (NAP) for AKS is currently in PREVIEW. +Register the NodeAutoProvisioningPreview feature flag using the az feature register command. + +MICROSOFT MAY NOT PROVIDE SUPPORT FOR THIS, PLEASE CHECK THE [PRODUCT DOCS](https://learn.microsoft.com/en-us/azure/aks/node-autoprovision?tabs=azure-cli#enable-node-autoprovisioning) FOR CLARIFICATION. +''' // ========== // // Parameters // @@ -72,9 +79,7 @@ module testDeployment '../../../main.bicep' = [ managedIdentities: { systemAssigned: true } - nodeProvisioningProfile: { - mode: 'Auto' - } + nodeProvisioningProfileMode: 'Auto' nodeResourceGroupProfile: { restrictionLevel: 'ReadOnly' } @@ -82,7 +87,7 @@ module testDeployment '../../../main.bicep' = [ primaryAgentPoolProfiles: [ { name: 'systempool' - count: 3 + count: 1 vmSize: 'Standard_DS4_v2' mode: 'System' } diff --git a/avm/res/container-service/managed-cluster/tests/e2e/azure/main.test.bicep b/avm/res/container-service/managed-cluster/tests/e2e/azure/main.test.bicep index 2661197b64..bfa6c5eac0 100644 --- a/avm/res/container-service/managed-cluster/tests/e2e/azure/main.test.bicep +++ b/avm/res/container-service/managed-cluster/tests/e2e/azure/main.test.bicep @@ -98,7 +98,7 @@ module testDeployment '../../../main.bicep' = [ osDiskSizeGB: 0 osType: 'Linux' type: 'VirtualMachineScaleSets' - vmSize: 'Standard_DS2_v2' + vmSize: 'Standard_DS4_v2' vnetSubnetResourceId: nestedDependencies.outputs.subnetResourceIds[0] } ] @@ -121,7 +121,7 @@ module testDeployment '../../../main.bicep' = [ scaleSetEvictionPolicy: 'Delete' scaleSetPriority: 'Regular' type: 'VirtualMachineScaleSets' - vmSize: 'Standard_DS2_v2' + vmSize: 'Standard_DS4_v2' vnetSubnetResourceId: nestedDependencies.outputs.subnetResourceIds[1] proximityPlacementGroupResourceId: nestedDependencies.outputs.proximityPlacementGroupResourceId } @@ -143,7 +143,7 @@ module testDeployment '../../../main.bicep' = [ scaleSetEvictionPolicy: 'Delete' scaleSetPriority: 'Regular' type: 'VirtualMachineScaleSets' - vmSize: 'Standard_DS2_v2' + vmSize: 'Standard_DS4_v2' vnetSubnetResourceId: nestedDependencies.outputs.subnetResourceIds[2] } ] diff --git a/avm/res/container-service/managed-cluster/tests/e2e/defaults/main.test.bicep b/avm/res/container-service/managed-cluster/tests/e2e/defaults/main.test.bicep index e102cf788a..020a79f825 100644 --- a/avm/res/container-service/managed-cluster/tests/e2e/defaults/main.test.bicep +++ b/avm/res/container-service/managed-cluster/tests/e2e/defaults/main.test.bicep @@ -46,7 +46,7 @@ module testDeployment '../../../main.bicep' = [ { name: 'systempool' count: 3 - vmSize: 'Standard_DS2_v2' + vmSize: 'Standard_DS4_v2' mode: 'System' } ] diff --git a/avm/res/container-service/managed-cluster/tests/e2e/istio/main.test.bicep b/avm/res/container-service/managed-cluster/tests/e2e/istio/main.test.bicep index b84fd45cf9..a7b15c4285 100644 --- a/avm/res/container-service/managed-cluster/tests/e2e/istio/main.test.bicep +++ b/avm/res/container-service/managed-cluster/tests/e2e/istio/main.test.bicep @@ -62,8 +62,8 @@ module testDeployment '../../../main.bicep' = [ primaryAgentPoolProfiles: [ { name: 'systempool' - count: 3 - vmSize: 'Standard_DS2_v2' + count: 2 + vmSize: 'Standard_DS4_v2' mode: 'System' } ] diff --git a/avm/res/container-service/managed-cluster/tests/e2e/kubenet/main.test.bicep b/avm/res/container-service/managed-cluster/tests/e2e/kubenet/main.test.bicep index 2c7ab3d445..33a1b4a956 100644 --- a/avm/res/container-service/managed-cluster/tests/e2e/kubenet/main.test.bicep +++ b/avm/res/container-service/managed-cluster/tests/e2e/kubenet/main.test.bicep @@ -85,7 +85,7 @@ module testDeployment '../../../main.bicep' = [ osDiskSizeGB: 0 osType: 'Linux' type: 'VirtualMachineScaleSets' - vmSize: 'Standard_DS2_v2' + vmSize: 'Standard_DS4_v2' } ] agentPools: [ @@ -107,27 +107,7 @@ module testDeployment '../../../main.bicep' = [ scaleSetEvictionPolicy: 'Delete' scaleSetPriority: 'Regular' type: 'VirtualMachineScaleSets' - vmSize: 'Standard_DS2_v2' - } - { - availabilityZones: [ - 3 - ] - count: 2 - enableAutoScaling: true - maxCount: 3 - maxPods: 30 - minCount: 1 - minPods: 2 - mode: 'User' - name: 'userpool2' - nodeLabels: {} - osDiskSizeGB: 128 - osType: 'Linux' - scaleSetEvictionPolicy: 'Delete' - scaleSetPriority: 'Regular' - type: 'VirtualMachineScaleSets' - vmSize: 'Standard_DS2_v2' + vmSize: 'Standard_DS4_v2' } ] networkPlugin: 'kubenet' diff --git a/avm/res/container-service/managed-cluster/tests/e2e/non-aad-cluster/main.test.bicep b/avm/res/container-service/managed-cluster/tests/e2e/non-aad-cluster/main.test.bicep index 8ff8dea9d2..a7dc99a7f9 100644 --- a/avm/res/container-service/managed-cluster/tests/e2e/non-aad-cluster/main.test.bicep +++ b/avm/res/container-service/managed-cluster/tests/e2e/non-aad-cluster/main.test.bicep @@ -45,7 +45,7 @@ module testDeployment '../../../main.bicep' = [ primaryAgentPoolProfiles: [ { name: 'systempool' - count: 3 + count: 1 vmSize: 'Standard_DS2_v2' mode: 'System' } diff --git a/avm/res/container-service/managed-cluster/tests/e2e/priv/main.test.bicep b/avm/res/container-service/managed-cluster/tests/e2e/priv/main.test.bicep index 4ec0952e53..88f1361552 100644 --- a/avm/res/container-service/managed-cluster/tests/e2e/priv/main.test.bicep +++ b/avm/res/container-service/managed-cluster/tests/e2e/priv/main.test.bicep @@ -77,7 +77,7 @@ module testDeployment '../../../main.bicep' = [ osDiskSizeGB: 0 osType: 'Linux' type: 'VirtualMachineScaleSets' - vmSize: 'Standard_DS2_v2' + vmSize: 'Standard_DS4_v2' vnetSubnetResourceId: '${nestedDependencies.outputs.vNetResourceId}/subnets/defaultSubnet' } ] @@ -100,29 +100,9 @@ module testDeployment '../../../main.bicep' = [ scaleSetEvictionPolicy: 'Delete' scaleSetPriority: 'Regular' type: 'VirtualMachineScaleSets' - vmSize: 'Standard_DS2_v2' + vmSize: 'Standard_DS4_v2' vnetSubnetResourceId: '${nestedDependencies.outputs.vNetResourceId}/subnets/defaultSubnet' } - { - availabilityZones: [ - 3 - ] - count: 2 - enableAutoScaling: true - maxCount: 3 - maxPods: 30 - minCount: 1 - minPods: 2 - mode: 'User' - name: 'userpool2' - nodeLabels: {} - osDiskSizeGB: 128 - osType: 'Linux' - scaleSetEvictionPolicy: 'Delete' - scaleSetPriority: 'Regular' - type: 'VirtualMachineScaleSets' - vmSize: 'Standard_DS2_v2' - } ] networkPlugin: 'azure' skuTier: 'Standard' diff --git a/avm/res/container-service/managed-cluster/tests/e2e/waf-aligned/main.test.bicep b/avm/res/container-service/managed-cluster/tests/e2e/waf-aligned/main.test.bicep index 91dc51b876..e385049760 100644 --- a/avm/res/container-service/managed-cluster/tests/e2e/waf-aligned/main.test.bicep +++ b/avm/res/container-service/managed-cluster/tests/e2e/waf-aligned/main.test.bicep @@ -76,7 +76,7 @@ module testDeployment '../../../main.bicep' = [ availabilityZones: [ 3 ] - count: 3 + count: 1 enableAutoScaling: true maxCount: 3 maxPods: 50 @@ -89,7 +89,7 @@ module testDeployment '../../../main.bicep' = [ osDiskSizeGB: 0 osType: 'Linux' type: 'VirtualMachineScaleSets' - vmSize: 'Standard_DS2_v2' + vmSize: 'Standard_DS4_v2' vnetSubnetResourceId: '${nestedDependencies.outputs.vNetResourceId}/subnets/defaultSubnet' } ] @@ -98,7 +98,7 @@ module testDeployment '../../../main.bicep' = [ availabilityZones: [ 3 ] - count: 3 + count: 2 enableAutoScaling: true maxCount: 3 maxPods: 50 @@ -113,14 +113,14 @@ module testDeployment '../../../main.bicep' = [ scaleSetEvictionPolicy: 'Delete' scaleSetPriority: 'Regular' type: 'VirtualMachineScaleSets' - vmSize: 'Standard_DS2_v2' + vmSize: 'Standard_DS4_v2' vnetSubnetResourceId: '${nestedDependencies.outputs.vNetResourceId}/subnets/defaultSubnet' } { availabilityZones: [ 3 ] - count: 3 + count: 2 enableAutoScaling: true maxCount: 3 maxPods: 50 @@ -135,7 +135,7 @@ module testDeployment '../../../main.bicep' = [ scaleSetEvictionPolicy: 'Delete' scaleSetPriority: 'Regular' type: 'VirtualMachineScaleSets' - vmSize: 'Standard_DS2_v2' + vmSize: 'Standard_DS4_v2' } ] autoUpgradeProfileUpgradeChannel: 'stable'