feat: Support configurable tags and `enableMultipleStandardLoadBala…

…ncers`
Azure · Nov 18, 2020 · 1264ac3 · 1264ac3
1 parent 71de031
commit 1264ac3
Show file tree

Hide file tree

Showing 8 changed files with 259 additions and 222 deletions.
diff --git a/docs/topics/clusterdefinitions.md b/docs/topics/clusterdefinitions.md
@@ -97,6 +97,8 @@ $ aks-engine get-versions
 | cloudProviderRateLimitQPSWrite    | no                        | QPS for Azure cloudprovider write request rate limiter enforcement. Follows the same defaults calculation as cloudProviderRateLimitQPS.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              |
 | cloudProviderDisableOutboundSNAT  | no                        | For clusters w/ Standard LB only: enforces the disabling of outbound NAT for that load balancing rule. See [here](https://docs.microsoft.com/en-us/azure/load-balancer/load-balancer-outbound-rules-overview#disablesnat) for more details. Defaults to `false`.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     |
 | microsoftAptRepositoryURL         | no                        | You may configure certain Microsoft-curated apt packages to be sourced from a custom repository so long as it acts as a mirror to the data at "https://packages.microsoft.com/" (the default value).                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 |
+| enableMultipleStandardLoadBalancers | no                      | Using multiple standard load balancers per cluster. The `loadBalancerSku` must be `standard`. Default to false.                                                                                                                                                                                                                                                                                                                                                                                                           |
+| tags                                | no                      | Specify the tags which will be applied to all of the resources managed by the cloud provider, with the format `a=b,c=d`.                                                                                                                                                                                                                                                                                                                                                                                                  |
 
 #### addons
 

diff --git a/parts/k8s/cloud-init/artifacts/cse_config.sh b/parts/k8s/cloud-init/artifacts/cse_config.sh
@@ -208,7 +208,9 @@ configureK8s() {
     "providerVaultName": "${KMS_PROVIDER_VAULT_NAME}",
     "maximumLoadBalancerRuleCount": ${MAXIMUM_LOADBALANCER_RULE_COUNT},
     "providerKeyName": "k8s",
-    "providerKeyVersion": ""
+    "providerKeyVersion": "",
+    "enableMultipleStandardLoadBalancers": ${ENABLE_MULTIPLE_STANDARD_LOAD_BALANCERS},
+    "tags": "${TAGS}"
 }
 EOF
   set -x

diff --git a/pkg/api/convertertoapi.go b/pkg/api/convertertoapi.go
@@ -313,6 +313,8 @@ func convertVLabsKubernetesConfig(vlabs *vlabs.KubernetesConfig, api *Kubernetes
 	api.CloudProviderDisableOutboundSNAT = vlabs.CloudProviderDisableOutboundSNAT
 	api.KubeReservedCgroup = vlabs.KubeReservedCgroup
 	api.MicrosoftAptRepositoryURL = vlabs.MicrosoftAptRepositoryURL
+	api.EnableMultipleStandardLoadBalancers = vlabs.EnableMultipleStandardLoadBalancers
+	api.Tags = vlabs.Tags
 	convertComponentsToAPI(vlabs, api)
 	convertAddonsToAPI(vlabs, api)
 	convertKubeletConfigToAPI(vlabs, api)