From 738b6618d0f04d4e816ca41bcb6188dbaf7dd32b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sertac=CC=A7=20O=CC=88zercan?= Date: Wed, 9 May 2018 18:44:38 -0700 Subject: [PATCH 1/3] autofill ACI Connector credentials --- examples/addons/aci-connector/README.md | 5 - .../kubernetes-aci-connector.json | 96 ++++++++----------- ...masteraddons-aci-connector-deployment.yaml | 14 +++ parts/k8s/kubernetescustomscript.sh | 21 +++- parts/k8s/kubernetesmastercustomdata.yml | 3 - parts/k8s/kubernetesmastervars.t | 8 +- parts/k8s/kubernetesparams.t | 42 ++------ pkg/acsengine/engine.go | 42 ++------ 8 files changed, 88 insertions(+), 143 deletions(-) diff --git a/examples/addons/aci-connector/README.md b/examples/addons/aci-connector/README.md index 0f1ddef3d2..13fd429c2c 100644 --- a/examples/addons/aci-connector/README.md +++ b/examples/addons/aci-connector/README.md @@ -15,11 +15,6 @@ This is the ACI Connector add-on. Add this add-on to your json file as shown be "name": "aci-connector", "enabled" : true, "config": { - "clientId": "", - "clientKey": "", - "tenantId": "", - "subscriptionId": "", - "resourceGroup": "", "region": "", "nodeName": "", "os": "", diff --git a/examples/addons/aci-connector/kubernetes-aci-connector.json b/examples/addons/aci-connector/kubernetes-aci-connector.json index f9686e92ec..ce3495e4d6 100644 --- a/examples/addons/aci-connector/kubernetes-aci-connector.json +++ b/examples/addons/aci-connector/kubernetes-aci-connector.json @@ -1,61 +1,43 @@ { - "apiVersion": "vlabs", - "properties": { - "orchestratorProfile": { - "orchestratorType": "Kubernetes", - "kubernetesConfig": { - "addons": [ - { - "name": "aci-connector", - "enabled" : true, - "config": { - "clientId": "", - "clientKey": "", - "tenantId": "", - "subscriptionId": "", - "resourceGroup": "", - "region": "eastus" - }, - "containers": [ - { - "name": "aci-connector", - "image": "microsoft/aci-connector-k8s:latest", - "cpuRequests": "50m", - "memoryRequests": "150Mi", - "cpuLimits": "50m", - "memoryLimits": "150Mi" - } - ] - } - ] - } - }, - "masterProfile": { - "count": 1, - "dnsPrefix": "", - "vmSize": "Standard_DS2_v2" - }, - "agentPoolProfiles": [ - { - "name": "agentpool", - "count": 3, - "vmSize": "Standard_DS2_v2", - "availabilityProfile": "AvailabilitySet" - } - ], - "linuxProfile": { - "adminUsername": "azureuser", - "ssh": { - "publicKeys": [ - { - "keyData": "" - } - ] - } - }, - "servicePrincipalProfile": { - "clientId": "", - "secret": "" + "apiVersion": "vlabs", + "properties": { + "orchestratorProfile": { + "orchestratorType": "Kubernetes", + "kubernetesConfig": { + "addons": [ + { + "name": "aci-connector", + "enabled": true + } + ] } + }, + "masterProfile": { + "count": 1, + "dnsPrefix": "", + "vmSize": "Standard_DS2_v2" + }, + "agentPoolProfiles": [ + { + "name": "agentpool", + "count": 3, + "vmSize": "Standard_DS2_v2", + "availabilityProfile": "VirtualMachineScaleSets" + } + ], + "linuxProfile": { + "adminUsername": "azureuser", + "ssh": { + "publicKeys": [ + { + "keyData": "" + } + ] + } + }, + "servicePrincipalProfile": { + "clientId": "", + "secret": "" } } +} \ No newline at end of file diff --git a/parts/k8s/addons/kubernetesmasteraddons-aci-connector-deployment.yaml b/parts/k8s/addons/kubernetesmasteraddons-aci-connector-deployment.yaml index ae4e4d6e44..8be565a186 100644 --- a/parts/k8s/addons/kubernetesmasteraddons-aci-connector-deployment.yaml +++ b/parts/k8s/addons/kubernetesmasteraddons-aci-connector-deployment.yaml @@ -58,6 +58,8 @@ metadata: type: Opaque data: credentials.json: + cert.pem: + key.pem: --- apiVersion: extensions/v1beta1 kind: Deployment @@ -77,17 +79,29 @@ spec: app: aci-connector spec: serviceAccountName: aci-connector + nodeSelector: + beta.kubernetes.io/os: linux containers: - name: aci-connector image: imagePullPolicy: Always env: + - name: KUBELET_PORT + value: "10250" - name: AZURE_AUTH_LOCATION value: /etc/virtual-kubelet/credentials.json - name: ACI_RESOURCE_GROUP value: - name: ACI_REGION value: + - name: APISERVER_CERT_LOCATION + value: /etc/virtual-kubelet/cert.pem + - name: APISERVER_KEY_LOCATION + value: /etc/virtual-kubelet/key.pem + - name: VKUBELET_POD_IP + valueFrom: + fieldRef: + fieldPath: status.podIP resources: requests: cpu: diff --git a/parts/k8s/kubernetescustomscript.sh b/parts/k8s/kubernetescustomscript.sh index dca566c6fe..f330cc11b2 100644 --- a/parts/k8s/kubernetescustomscript.sh +++ b/parts/k8s/kubernetescustomscript.sh @@ -432,10 +432,27 @@ function configClusterAutoscalerAddon() { sed -i "s||$(echo $PRIMARY_SCALE_SET)|g" "/etc/kubernetes/addons/cluster-autoscaler-deployment.yaml" } -function configAddons() { +configACIConnectorAddon() { + ACI_CONNECTOR_CREDENTIALS=$(printf "{\"clientId\": \"$(echo $SERVICE_PRINCIPAL_CLIENT_ID)\", \"clientSecret\": \"$(echo $SERVICE_PRINCIPAL_CLIENT_SECRET)\", \"tenantId\": \"$(echo $TENANT_ID)\", \"subscriptionId\": \"$(echo $SUBSCRIPTION_ID)\", \"activeDirectoryEndpointUrl\": \"https://login.microsoftonline.com\",\"resourceManagerEndpointUrl\": \"https://management.azure.com/\", \"activeDirectoryGraphResourceId\": \"https://graph.windows.net/\", \"sqlManagementEndpointUrl\": \"https://management.core.windows.net:8443/\", \"galleryEndpointUrl\": \"https://gallery.azure.com/\", \"managementEndpointUrl\": \"https://management.core.windows.net/\"}" | base64 -w 0) + + openssl req -newkey rsa:4096 -new -nodes -x509 -days 3650 -keyout /etc/kubernetes/certs/aci-connector-key.pem -out /etc/kubernetes/certs/aci-connector-cert.pem -subj "/C=US/ST=CA/L=virtualkubelet/O=virtualkubelet/OU=virtualkubelet/CN=virtualkubelet" + ACI_CONNECTOR_KEY=$(base64 /etc/kubernetes/certs/aci-connector-key.pem -w0) + ACI_CONNECTOR_CERT=$(base64 /etc/kubernetes/certs/aci-connector-cert.pem -w0) + + sed -i "s||$ACI_CONNECTOR_CREDENTIALS|g" "/etc/kubernetes/addons/aci-connector-deployment.yaml" + sed -i "s||$(echo $RESOURCE_GROUP)|g" "/etc/kubernetes/addons/aci-connector-deployment.yaml" + sed -i "s||$(echo $ACI_CONNECTOR_CERT)|g" "/etc/kubernetes/addons/aci-connector-deployment.yaml" + sed -i "s||$(echo $ACI_CONNECTOR_KEY)|g" "/etc/kubernetes/addons/aci-connector-deployment.yaml" +} + +configAddons() { if [[ "${CLUSTER_AUTOSCALER_ADDON}" = True ]]; then configClusterAutoscalerAddon fi + + if [[ "${ACI_CONNECTOR_ADDON}" = True ]]; then + configACIConnectorAddon + fi } if [[ $OS == $UBUNTU_OS_NAME ]]; then @@ -444,7 +461,7 @@ if [[ $OS == $UBUNTU_OS_NAME ]]; then echo `date`,`hostname`, apt-get_update_end>>/opt/m # make sure walinuxagent doesn't get updated in the middle of running this script retrycmd_if_failure 20 5 30 apt-mark hold walinuxagent || exit $ERR_HOLD_WALINUXAGENT - + fi waitForCloudInit diff --git a/parts/k8s/kubernetesmastercustomdata.yml b/parts/k8s/kubernetesmastercustomdata.yml index f0bb6496c0..60cd578e2d 100644 --- a/parts/k8s/kubernetesmastercustomdata.yml +++ b/parts/k8s/kubernetesmastercustomdata.yml @@ -237,10 +237,7 @@ MASTER_ARTIFACTS_CONFIG_PLACEHOLDER {{end}} {{if .OrchestratorProfile.KubernetesConfig.IsACIConnectorEnabled}} - ACI_CONNECTOR_CREDENTIALS=$(printf "{\"clientId\": \"{{WrapAsVariable "kubernetesACIConnectorClientId"}}\", \"clientSecret\": \"{{WrapAsVariable "kubernetesACIConnectorClientKey"}}\", \"tenantId\": \"{{WrapAsVariable "kubernetesACIConnectorTenantId"}}\", \"subscriptionId\": \"{{WrapAsVariable "kubernetesACIConnectorSubscriptionId"}}\", \"activeDirectoryEndpointUrl\": \"https://login.microsoftonline.com\",\"resourceManagerEndpointUrl\": \"https://management.azure.com/\", \"activeDirectoryGraphResourceId\": \"https://graph.windows.net/\", \"sqlManagementEndpointUrl\": \"https://management.core.windows.net:8443/\", \"galleryEndpointUrl\": \"https://gallery.azure.com/\", \"managementEndpointUrl\": \"https://management.core.windows.net/\"}" | base64 -w 0) sed -i "s||{{WrapAsVariable "kubernetesACIConnectorSpec"}}|g" "/etc/kubernetes/addons/aci-connector-deployment.yaml" - sed -i "s||$ACI_CONNECTOR_CREDENTIALS|g" "/etc/kubernetes/addons/aci-connector-deployment.yaml" - sed -i "s||{{WrapAsVariable "kubernetesACIConnectorResourceGroup"}}|g" "/etc/kubernetes/addons/aci-connector-deployment.yaml" sed -i "s||{{WrapAsVariable "kubernetesACIConnectorNodeName"}}|g" "/etc/kubernetes/addons/aci-connector-deployment.yaml" sed -i "s||{{WrapAsVariable "kubernetesACIConnectorOS"}}|g" "/etc/kubernetes/addons/aci-connector-deployment.yaml" sed -i "s||{{WrapAsVariable "kubernetesACIConnectorTaint"}}|g" "/etc/kubernetes/addons/aci-connector-deployment.yaml" diff --git a/parts/k8s/kubernetesmastervars.t b/parts/k8s/kubernetesmastervars.t index d7aacd41af..b8cdd5461a 100644 --- a/parts/k8s/kubernetesmastervars.t +++ b/parts/k8s/kubernetesmastervars.t @@ -95,12 +95,8 @@ "kubernetesTillerCPULimit": "[parameters('kubernetesTillerCPULimit')]", "kubernetesTillerMemoryLimit": "[parameters('kubernetesTillerMemoryLimit')]", "kubernetesTillerMaxHistory": "[parameters('kubernetesTillerMaxHistory')]", + "kubernetesACIConnectorEnabled": "[parameters('kubernetesACIConnectorEnabled')]", "kubernetesACIConnectorSpec": "[parameters('kubernetesACIConnectorSpec')]", - "kubernetesACIConnectorClientId": "[parameters('kubernetesACIConnectorClientId')]", - "kubernetesACIConnectorClientKey": "[parameters('kubernetesACIConnectorClientKey')]", - "kubernetesACIConnectorTenantId": "[parameters('kubernetesACIConnectorTenantId')]", - "kubernetesACIConnectorSubscriptionId": "[parameters('kubernetesACIConnectorSubscriptionId')]", - "kubernetesACIConnectorResourceGroup": "[parameters('kubernetesACIConnectorResourceGroup')]", "kubernetesACIConnectorNodeName": "[parameters('kubernetesACIConnectorNodeName')]", "kubernetesACIConnectorOS": "[parameters('kubernetesACIConnectorOS')]", "kubernetesACIConnectorTaint": "[parameters('kubernetesACIConnectorTaint')]", @@ -237,7 +233,7 @@ "mountetcdScript": "{{GetKubernetesB64Mountetcd}}", {{if not IsOpenShift}} {{if not IsHostedMaster}} - "provisionScriptParametersMaster": "[concat('MASTER_VM_NAME=',variables('masterVMNames')[variables('masterOffset')],' ETCD_PEER_URL=',variables('masterEtcdPeerURLs')[variables('masterOffset')],' ETCD_CLIENT_URL=',variables('masterEtcdClientURLs')[variables('masterOffset')],' MASTER_NODE=true CLUSTER_AUTOSCALER_ADDON=',variables('kubernetesClusterAutoscalerEnabled'),' APISERVER_PRIVATE_KEY=',variables('apiServerPrivateKey'),' CA_CERTIFICATE=',variables('caCertificate'),' CA_PRIVATE_KEY=',variables('caPrivateKey'),' MASTER_FQDN=',variables('masterFqdnPrefix'),' KUBECONFIG_CERTIFICATE=',variables('kubeConfigCertificate'),' KUBECONFIG_KEY=',variables('kubeConfigPrivateKey'),' ETCD_SERVER_CERTIFICATE=',variables('etcdServerCertificate'),' ETCD_CLIENT_CERTIFICATE=',variables('etcdClientCertificate'),' ETCD_SERVER_PRIVATE_KEY=',variables('etcdServerPrivateKey'),' ETCD_CLIENT_PRIVATE_KEY=',variables('etcdClientPrivateKey'),' ETCD_PEER_CERTIFICATES=',string(variables('etcdPeerCertificates')),' ETCD_PEER_PRIVATE_KEYS=',string(variables('etcdPeerPrivateKeys')))]", + "provisionScriptParametersMaster": "[concat('MASTER_VM_NAME=',variables('masterVMNames')[variables('masterOffset')],' ETCD_PEER_URL=',variables('masterEtcdPeerURLs')[variables('masterOffset')],' ETCD_CLIENT_URL=',variables('masterEtcdClientURLs')[variables('masterOffset')],' MASTER_NODE=true CLUSTER_AUTOSCALER_ADDON=',variables('kubernetesClusterAutoscalerEnabled'),' ACI_CONNECTOR_ADDON=',variables('kubernetesACIConnectorEnabled'),' APISERVER_PRIVATE_KEY=',variables('apiServerPrivateKey'),' CA_CERTIFICATE=',variables('caCertificate'),' CA_PRIVATE_KEY=',variables('caPrivateKey'),' MASTER_FQDN=',variables('masterFqdnPrefix'),' KUBECONFIG_CERTIFICATE=',variables('kubeConfigCertificate'),' KUBECONFIG_KEY=',variables('kubeConfigPrivateKey'),' ETCD_SERVER_CERTIFICATE=',variables('etcdServerCertificate'),' ETCD_CLIENT_CERTIFICATE=',variables('etcdClientCertificate'),' ETCD_SERVER_PRIVATE_KEY=',variables('etcdServerPrivateKey'),' ETCD_CLIENT_PRIVATE_KEY=',variables('etcdClientPrivateKey'),' ETCD_PEER_CERTIFICATES=',string(variables('etcdPeerCertificates')),' ETCD_PEER_PRIVATE_KEYS=',string(variables('etcdPeerPrivateKeys')))]", {{if EnableEncryptionWithExternalKms}} {{ if not UseManagedIdentity}} "servicePrincipalObjectId": "[parameters('servicePrincipalObjectId')]", diff --git a/parts/k8s/kubernetesparams.t b/parts/k8s/kubernetesparams.t index c90462830c..f068df1897 100644 --- a/parts/k8s/kubernetesparams.t +++ b/parts/k8s/kubernetesparams.t @@ -346,45 +346,17 @@ }, "type": "string" }, - "kubernetesACIConnectorSpec": { - {{PopulateClassicModeDefaultValue "kubernetesACIConnectorSpec"}} - "metadata": { - "description": "The container spec for ACI Connector." - }, - "type": "string" - }, - "kubernetesACIConnectorClientId": { - {{PopulateClassicModeDefaultValue "kubernetesACIConnectorClientId"}} - "metadata": { - "description": "Client id for ACI Connector." - }, - "type": "string" - }, - "kubernetesACIConnectorClientKey": { - {{PopulateClassicModeDefaultValue "kubernetesACIConnectorClientKey"}} - "metadata": { - "description": "Client key for ACI Connector." - }, - "type": "string" - }, - "kubernetesACIConnectorTenantId": { - {{PopulateClassicModeDefaultValue "kubernetesACIConnectorTenantId"}} - "metadata": { - "description": "Tenant id for ACI Connector." - }, - "type": "string" - }, - "kubernetesACIConnectorSubscriptionId": { - {{PopulateClassicModeDefaultValue "kubernetesACIConnectorSubscriptionId"}} + "kubernetesACIConnectorEnabled": { + {{PopulateClassicModeDefaultValue "kubernetesACIConnectorEnabled"}} "metadata": { - "description": "Subscription id for ACI Connector." + "description": "ACI Connector Status" }, - "type": "string" + "type": "bool" }, - "kubernetesACIConnectorResourceGroup": { - {{PopulateClassicModeDefaultValue "kubernetesACIConnectorResourceGroup"}} + "kubernetesACIConnectorSpec": { + {{PopulateClassicModeDefaultValue "kubernetesACIConnectorSpec"}} "metadata": { - "description": "Resource group for ACI Connector." + "description": "The container spec for ACI Connector." }, "type": "string" }, diff --git a/pkg/acsengine/engine.go b/pkg/acsengine/engine.go index 8049213788..294ab2e080 100644 --- a/pkg/acsengine/engine.go +++ b/pkg/acsengine/engine.go @@ -669,11 +669,7 @@ func getParameters(cs *api.ContainerService, isClassicMode bool, generatorCode s aciConnectorAddon := getAddonByName(properties.OrchestratorProfile.KubernetesConfig.Addons, DefaultACIConnectorAddonName) c = getAddonContainersIndexByName(aciConnectorAddon.Containers, DefaultACIConnectorAddonName) if c > -1 { - addValue(parametersMap, "kubernetesACIConnectorClientId", aciConnectorAddon.Config["clientId"]) - addSecret(parametersMap, "kubernetesACIConnectorClientKey", aciConnectorAddon.Config["clientKey"], false) - addValue(parametersMap, "kubernetesACIConnectorTenantId", aciConnectorAddon.Config["tenantId"]) - addValue(parametersMap, "kubernetesACIConnectorSubscriptionId", aciConnectorAddon.Config["subscriptionId"]) - addValue(parametersMap, "kubernetesACIConnectorResourceGroup", aciConnectorAddon.Config["resourceGroup"]) + addValue(parametersMap, "kubernetesACIConnectorEnabled", aciConnectorAddon.Enabled) addValue(parametersMap, "kubernetesACIConnectorNodeName", aciConnectorAddon.Config["nodeName"]) addValue(parametersMap, "kubernetesACIConnectorOS", aciConnectorAddon.Config["os"]) addValue(parametersMap, "kubernetesACIConnectorTaint", aciConnectorAddon.Config["taint"]) @@ -1658,36 +1654,6 @@ func (t *TemplateGenerator) getTemplateFuncMap(cs *api.ContainerService) templat val = cloudSpecConfig.KubernetesSpecConfig.ACIConnectorImageBase + KubeConfigs[k8sVersion][DefaultACIConnectorAddonName] } } - case "kubernetesACIConnectorClientId": - if aC > -1 { - val = aciConnectorAddon.Config["clientId"] - } else { - val = "" - } - case "kubernetesACIConnectorClientKey": - if aC > -1 { - val = aciConnectorAddon.Config["clientKey"] - } else { - val = "" - } - case "kubernetesACIConnectorTenantId": - if aC > -1 { - val = aciConnectorAddon.Config["tenantId"] - } else { - val = "" - } - case "kubernetesACIConnectorSubscriptionId": - if aC > -1 { - val = aciConnectorAddon.Config["subscriptionId"] - } else { - val = "" - } - case "kubernetesACIConnectorResourceGroup": - if aC > -1 { - val = aciConnectorAddon.Config["resourceGroup"] - } else { - val = "" - } case "kubernetesACIConnectorNodeName": if aC > -1 { val = aciConnectorAddon.Config["nodeName"] @@ -1736,6 +1702,12 @@ func (t *TemplateGenerator) getTemplateFuncMap(cs *api.ContainerService) templat } else { val = "" } + case "kubernetesACIConnectorEnabled": + if aC > -1 { + val = strconv.FormatBool(*aciConnectorAddon.Enabled) + } else { + val = "false" + } case "kubernetesClusterAutoscalerSpec": if aS > -1 { if clusterAutoscalerAddon.Containers[aS].Image != "" { From 35a1aed6b68228e0b487139d81b9623b712c2c8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sertac=CC=A7=20O=CC=88zercan?= Date: Wed, 9 May 2018 19:49:24 -0700 Subject: [PATCH 2/3] update docs --- examples/addons/aci-connector/README.md | 43 ++++++++----------------- 1 file changed, 13 insertions(+), 30 deletions(-) diff --git a/examples/addons/aci-connector/README.md b/examples/addons/aci-connector/README.md index 13fd429c2c..cc7a499319 100644 --- a/examples/addons/aci-connector/README.md +++ b/examples/addons/aci-connector/README.md @@ -3,7 +3,7 @@ This is the ACI Connector add-on. Add this add-on to your json file as shown below to automatically enable ACI Connector in your new Kubernetes cluster. -``` +```json { "apiVersion": "vlabs", "properties": { @@ -19,16 +19,7 @@ This is the ACI Connector add-on. Add this add-on to your json file as shown be "nodeName": "", "os": "", "taint": "" - }, - "containers": [ - { - "name": "aci-connector", - "cpuRequests": "50m", - "memoryRequests": "150Mi", - "cpuLimits": "50m", - "memoryLimits": "150Mi" - } - ] + } } ] } @@ -43,7 +34,7 @@ This is the ACI Connector add-on. Add this add-on to your json file as shown be "name": "agentpool", "count": 3, "vmSize": "Standard_DS2_v2", - "availabilityProfile": "AvailabilitySet" + "availabilityProfile": "VirtualMachineScaleSets" } ], "linuxProfile": { @@ -67,32 +58,24 @@ This is the ACI Connector add-on. Add this add-on to your json file as shown be You can validate that the add-on is running as expected with the following commands: -Make sure to create resource group: -``` -az group create \ - --name "[resource group name]" \ - --location "[location]" -``` +You should see ACI Connector as `Running` after executing: -You should see ACI Connector as running after running: -``` -$ kubectl get pods -n kube-system +```bash +kubectl get pods -n kube-system ``` -You should see ACI Connector node after running: -``` -$ kubectl get nodes +You should see ACI Connector node after executing: + +```bash +kubectl get nodes ``` Follow the README at https://github.com/virtual-kubelet/virtual-kubelet for examples. -# Configuration +## Configuration + |Name|Required|Description|Default Value| |---|---|---|---| -|clientId|yes|your client id|| -|clientKey|yes|your client key|| -|tenantId|yes|your tenant id|| -|resourceGroup|yes|your resource group|| |region|no|Azure region|"westus"| |nodeName|no|node name|"aci-connector"| |os|no|operating system (Linux/Windows)|"Linux"| @@ -104,6 +87,6 @@ Follow the README at https://github.com/virtual-kubelet/virtual-kubelet for exam |cpuLimits|no|cpu limits for the container|"50m"| |memoryLimits|no|memory limits for the container|"150Mi"| +## Supported Orchestrators -# Supported Orchestrators Kubernetes \ No newline at end of file From 4ca3fc2a6af497e6c320c665fd78829ef5a8c2d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sertac=CC=A7=20O=CC=88zercan?= Date: Thu, 10 May 2018 14:01:21 -0700 Subject: [PATCH 3/3] update default value --- parts/k8s/kubernetesparams.t | 2 +- pkg/acsengine/engine.go | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/parts/k8s/kubernetesparams.t b/parts/k8s/kubernetesparams.t index f068df1897..d958f35ea6 100644 --- a/parts/k8s/kubernetesparams.t +++ b/parts/k8s/kubernetesparams.t @@ -347,7 +347,7 @@ "type": "string" }, "kubernetesACIConnectorEnabled": { - {{PopulateClassicModeDefaultValue "kubernetesACIConnectorEnabled"}} + "defaultValue": false, "metadata": { "description": "ACI Connector Status" }, diff --git a/pkg/acsengine/engine.go b/pkg/acsengine/engine.go index 294ab2e080..c3114bfc6b 100644 --- a/pkg/acsengine/engine.go +++ b/pkg/acsengine/engine.go @@ -1702,12 +1702,6 @@ func (t *TemplateGenerator) getTemplateFuncMap(cs *api.ContainerService) templat } else { val = "" } - case "kubernetesACIConnectorEnabled": - if aC > -1 { - val = strconv.FormatBool(*aciConnectorAddon.Enabled) - } else { - val = "false" - } case "kubernetesClusterAutoscalerSpec": if aS > -1 { if clusterAutoscalerAddon.Containers[aS].Image != "" {