chore: deprecate aci-connector addon

cmd/generate_test.go

@@ -342,11 +342,6 @@ func TestExampleAPIModels(t *testing.T) {
 			apiModelPath: "../examples/addons/aad-pod-identity/kubernetes-aad-pod-identity.json",
 			setArgs:      defaultSet,
 		},
-		{
-			name:         "ACI connector",
-			apiModelPath: "../examples/addons/aci-connector/kubernetes-aci-connector.json",
-			setArgs:      defaultSet,
-		},
 		{
 			name:         "App gateway ingress",
 			apiModelPath: "../examples/addons/appgw-ingress/kubernetes-appgw-ingress.json",

docs/topics/azure-stack.md

@@ -156,7 +156,6 @@ AKS Engine includes a number of optional [addons](../topics/clusterdefinitions.m
 The list below includes the addons currently unsupported on Azure Stack Hub:
 
 * AAD Pod Identity
-* ACI Connector
 * Blobfuse Flex Volume
 * Cluster Autoscaler
 * KeyVault Flex Volume

examples/e2e-tests/kubernetes/kubernetes-config/addons-disabled.json

@@ -8,10 +8,6 @@
             "name": "tiller",
             "enabled": false
           },
-          {
-            "name": "aci-connector",
-            "enabled": false
-          },
           {
             "name": "blobfuse-flexvolume",
             "enabled": false

examples/e2e-tests/kubernetes/kubernetes-config/addons-enabled.json

@@ -8,10 +8,6 @@
             "name": "tiller",
             "enabled": true
           },
-          {
-            "name": "aci-connector",
-            "enabled": true
-          },
           {
             "name": "blobfuse-flexvolume",
             "enabled": true

parts/k8s/cloud-init/artifacts/cse_config.sh

@@ -550,20 +550,6 @@ configClusterAutoscalerAddon() {
   sed -i "s|<rg>|$(echo $RESOURCE_GROUP | base64)|g" $f
 }
 {{end}}
-{{- if IsACIConnectorAddonEnabled}}
-configACIConnectorAddon() {
-  local creds key cert f=$ADDONS_DIR/aci-connector-deployment.yaml
-  creds=$(printf '{"clientId": "%s", "clientSecret": "%s", "tenantId": "%s", "subscriptionId": "%s", "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/"}' "$SERVICE_PRINCIPAL_CLIENT_ID" "$SERVICE_PRINCIPAL_CLIENT_SECRET" "$TENANT_ID" "$SUBSCRIPTION_ID" | 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"
-  key=$(base64 /etc/kubernetes/certs/aci-connector-key.pem -w0)
-  cert=$(base64 /etc/kubernetes/certs/aci-connector-cert.pem -w0)
-  wait_for_file 1200 1 $f || exit {{GetCSEErrorCode "ERR_FILE_WATCH_TIMEOUT"}}
-  sed -i "s|<creds>|$creds|g" $f
-  sed -i "s|<rgName>|$RESOURCE_GROUP|g" $f
-  sed -i "s|<cert>|$cert|g" $f
-  sed -i "s|<key>|$key|g" $f
-}
-{{end}}
 {{- if IsAzurePolicyAddonEnabled}}
 configAzurePolicyAddon() {
   sed -i "s|<resourceId>|/subscriptions/$SUBSCRIPTION_ID/resourceGroups/$RESOURCE_GROUP|g" $ADDONS_DIR/azure-policy-deployment.yaml
@@ -576,11 +562,6 @@ configAddons() {
     configClusterAutoscalerAddon
   fi
   {{end}}
-  {{if IsACIConnectorAddonEnabled}}
-  if [[ ${ACI_CONNECTOR_ADDON} == True ]]; then
-    configACIConnectorAddon
-  fi
-  {{end}}
   {{if IsAzurePolicyAddonEnabled}}
   configAzurePolicyAddon
   {{end}}

parts/k8s/kubernetesparams.t

@@ -189,12 +189,6 @@
       "type": "bool"
     },
 {{end}}
-    "kubernetesACIConnectorEnabled": {
-      "metadata": {
-        "description": "ACI Connector Status"
-      },
-      "type": "bool"
-    },
     "cloudproviderConfig": {
       "type": "object",
       "defaultValue": {

pkg/api/addons.go

@@ -68,27 +68,6 @@ func (cs *ContainerService) setAddonsConfig(isUpgrade bool) {
 		},
 	}
 
-	defaultACIConnectorAddonsConfig := KubernetesAddon{
-		Name:    common.ACIConnectorAddonName,
-		Enabled: to.BoolPtr(DefaultACIConnectorAddonEnabled && !cs.Properties.IsAzureStackCloud()),
-		Config: map[string]string{
-			"region":   "westus",
-			"nodeName": "aci-connector",
-			"os":       "Linux",
-			"taint":    "azure.com/aci",
-		},
-		Containers: []KubernetesContainerSpec{
-			{
-				Name:           common.ACIConnectorAddonName,
-				CPURequests:    "50m",
-				MemoryRequests: "150Mi",
-				CPULimits:      "50m",
-				MemoryLimits:   "150Mi",
-				Image:          specConfig.ACIConnectorImageBase + k8sComponents[common.ACIConnectorAddonName],
-			},
-		},
-	}
-
 	defaultClusterAutoscalerAddonsConfig := KubernetesAddon{
 		Name:    common.ClusterAutoscalerAddonName,
 		Enabled: to.BoolPtr(DefaultClusterAutoscalerAddonEnabled && !cs.Properties.IsAzureStackCloud()),
@@ -888,7 +867,6 @@ func (cs *ContainerService) setAddonsConfig(isUpgrade bool) {
 
 	defaultAddons := []KubernetesAddon{
 		defaultTillerAddonsConfig,
-		defaultACIConnectorAddonsConfig,
 		defaultClusterAutoscalerAddonsConfig,
 		defaultBlobfuseFlexVolumeAddonsConfig,
 		defaultSMBFlexVolumeAddonsConfig,