From 22a58190344a2de3ead4bfaf92fa26319ac721cd Mon Sep 17 00:00:00 2001 From: MrMCake Date: Wed, 9 Feb 2022 14:19:43 +0100 Subject: [PATCH 1/2] Fixed LB deployment by adding additional public ip --- .../platformPipelines/platform.dependencies.yml | 3 +++ .github/workflows/platform.dependencies.yml | 1 + .../loadBalancers/.parameters/min.parameters.json | 2 +- .../parameters/lb.min.parameters.json | 15 +++++++++++++++ 4 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 utilities/pipelines/dependencies/Microsoft.Network/publicIPAddresses/parameters/lb.min.parameters.json diff --git a/.azuredevops/platformPipelines/platform.dependencies.yml b/.azuredevops/platformPipelines/platform.dependencies.yml index e6b7c4321f..dd0300fa33 100644 --- a/.azuredevops/platformPipelines/platform.dependencies.yml +++ b/.azuredevops/platformPipelines/platform.dependencies.yml @@ -483,6 +483,9 @@ stages: - path: $(dependencyPath)/$(resourceType)/parameters/lb.parameters.json templateFilePath: $(templateFilePath) displayName: Load balancer Public IP + - path: $(dependencyPath)/$(resourceType)/parameters/lb.min.parameters.json + templateFilePath: $(templateFilePath) + displayName: Min Load balancer Public IP - path: $(dependencyPath)/$(resourceType)/parameters/fw.parameters.json templateFilePath: $(templateFilePath) displayName: Firewall Public IP diff --git a/.github/workflows/platform.dependencies.yml b/.github/workflows/platform.dependencies.yml index 0a1619f510..8a0a079b5d 100644 --- a/.github/workflows/platform.dependencies.yml +++ b/.github/workflows/platform.dependencies.yml @@ -667,6 +667,7 @@ jobs: 'apgw.parameters.json', 'bas.parameters.json', 'lb.parameters.json', + 'lb.min.parameters.json', 'fw.parameters.json', ] steps: diff --git a/arm/Microsoft.Network/loadBalancers/.parameters/min.parameters.json b/arm/Microsoft.Network/loadBalancers/.parameters/min.parameters.json index 053c530c71..dac87cc927 100644 --- a/arm/Microsoft.Network/loadBalancers/.parameters/min.parameters.json +++ b/arm/Microsoft.Network/loadBalancers/.parameters/min.parameters.json @@ -9,7 +9,7 @@ "value": [ { "name": "publicIPConfig1", - "publicIPAddressId": "/subscriptions/<>/resourceGroups/validation-rg/providers/Microsoft.Network/publicIPAddresses/adp-<>-az-pip-x-lb", + "publicIPAddressId": "/subscriptions/<>/resourceGroups/validation-rg/providers/Microsoft.Network/publicIPAddresses/adp-<>-az-pip-min-lb", "subnetId": "", "privateIPAddress": "" } diff --git a/utilities/pipelines/dependencies/Microsoft.Network/publicIPAddresses/parameters/lb.min.parameters.json b/utilities/pipelines/dependencies/Microsoft.Network/publicIPAddresses/parameters/lb.min.parameters.json new file mode 100644 index 0000000000..4c6dd53fc6 --- /dev/null +++ b/utilities/pipelines/dependencies/Microsoft.Network/publicIPAddresses/parameters/lb.min.parameters.json @@ -0,0 +1,15 @@ +{ + "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#", + "contentVersion": "1.0.0.0", + "parameters": { + "name": { + "value": "adp-<>-az-pip-min-lb" + }, + "skuName": { + "value": "Standard" + }, + "publicIPAllocationMethod": { + "value": "Static" + } + } +} From d96c8a7486b2451a74c986a8a086d608eaf24840 Mon Sep 17 00:00:00 2001 From: MrMCake Date: Wed, 9 Feb 2022 14:23:40 +0100 Subject: [PATCH 2/2] Updated managed cluster API --- .../managedClusters/deploy.bicep | 18 +++++++++--------- .../managedClusters/readme.md | 4 ++-- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/arm/Microsoft.ContainerService/managedClusters/deploy.bicep b/arm/Microsoft.ContainerService/managedClusters/deploy.bicep index 3d8abb13df..60dab758d0 100644 --- a/arm/Microsoft.ContainerService/managedClusters/deploy.bicep +++ b/arm/Microsoft.ContainerService/managedClusters/deploy.bicep @@ -262,7 +262,7 @@ module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { params: {} } -resource managedCluster 'Microsoft.ContainerService/managedClusters@2021-07-01' = { +resource managedCluster 'Microsoft.ContainerService/managedClusters@2021-10-01' = { name: name location: location tags: (empty(tags) ? null : tags) @@ -284,7 +284,7 @@ resource managedCluster 'Microsoft.ContainerService/managedClusters@2021-07-01' omsagent: { enabled: omsAgentEnabled && !empty(monitoringWorkspaceId) config: { - logAnalyticsWorkspaceResourceID: !empty(monitoringWorkspaceId) ? monitoringWorkspaceId : null + logAnalyticsWorkspaceResourceID: !empty(monitoringWorkspaceId) ? any(monitoringWorkspaceId) : null } } aciConnectorLinux: { @@ -303,15 +303,15 @@ resource managedCluster 'Microsoft.ContainerService/managedClusters@2021-07-01' enableRBAC: aadProfileEnableAzureRBAC nodeResourceGroup: nodeResourceGroup networkProfile: { - networkPlugin: (empty(aksClusterNetworkPlugin) ? null : aksClusterNetworkPlugin) - networkPolicy: (empty(aksClusterNetworkPolicy) ? null : aksClusterNetworkPolicy) - podCidr: (empty(aksClusterPodCidr) ? null : aksClusterPodCidr) - serviceCidr: (empty(aksClusterServiceCidr) ? null : aksClusterServiceCidr) - dnsServiceIP: (empty(aksClusterDnsServiceIP) ? null : aksClusterDnsServiceIP) - dockerBridgeCidr: (empty(aksClusterDockerBridgeCidr) ? null : aksClusterDockerBridgeCidr) + networkPlugin: !empty(aksClusterNetworkPlugin) ? any(aksClusterNetworkPlugin) : null + networkPolicy: !empty(aksClusterNetworkPolicy) ? any(aksClusterNetworkPolicy) : null + podCidr: !empty(aksClusterPodCidr) ? aksClusterPodCidr : null + serviceCidr: !empty(aksClusterServiceCidr) ? aksClusterServiceCidr : null + dnsServiceIP: !empty(aksClusterDnsServiceIP) ? aksClusterDnsServiceIP : null + dockerBridgeCidr: !empty(aksClusterDockerBridgeCidr) ? aksClusterDockerBridgeCidr : null outboundType: aksClusterOutboundType loadBalancerSku: aksClusterLoadBalancerSku - loadBalancerProfile: ((managedOutboundIPCount == 0) ? null : lbProfile) + loadBalancerProfile: managedOutboundIPCount != 0 ? lbProfile : null } aadProfile: { clientAppID: aadProfileClientAppID diff --git a/arm/Microsoft.ContainerService/managedClusters/readme.md b/arm/Microsoft.ContainerService/managedClusters/readme.md index 05c78d5ef5..e2755effe2 100644 --- a/arm/Microsoft.ContainerService/managedClusters/readme.md +++ b/arm/Microsoft.ContainerService/managedClusters/readme.md @@ -8,7 +8,7 @@ This module deploys Azure Kubernetes Cluster (AKS). | :-- | :-- | | `Microsoft.Authorization/locks` | 2017-04-01 | | `Microsoft.Authorization/roleAssignments` | 2021-04-01-preview | -| `Microsoft.ContainerService/managedClusters` | 2021-07-01 | +| `Microsoft.ContainerService/managedClusters` | 2021-10-01 | | `Microsoft.ContainerService/managedClusters/agentPools` | 2021-08-01 | | `Microsoft.Insights/diagnosticSettings` | 2021-05-01-preview | @@ -209,6 +209,6 @@ You can specify multiple user assigned identities to a resource by providing add - [Diagnosticsettings](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Insights/2021-05-01-preview/diagnosticSettings) - [Locks](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Authorization/2017-04-01/locks) -- [Managedclusters](https://docs.microsoft.com/en-us/azure/templates/Microsoft.ContainerService/2021-07-01/managedClusters) +- [Managedclusters](https://docs.microsoft.com/en-us/azure/templates/Microsoft.ContainerService/2021-10-01/managedClusters) - [Managedclusters/Agentpools](https://docs.microsoft.com/en-us/azure/templates/Microsoft.ContainerService/2021-08-01/managedClusters/agentPools) - [Roleassignments](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Authorization/roleAssignments)