fix: update cluster-proportional-autoscaler path at MCR (#3091)

* fix: update cluster-proportional-autoscaler path at MCR * chore: add other cluster-prop-auto versions to Linux VHD * fix: remove DNSAutoscalerAddonName after rebase fail * chore: remove unreferenced c-a-p version from Linux VHD * refactor: remove kubernetesImageBase prefix from calico c-p-a
Azure · Apr 20, 2020 · b8a1018 · b8a1018
1 parent 8f6f1ea
commit b8a1018
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/pkg/api/addons.go b/pkg/api/addons.go
@@ -367,7 +367,7 @@ func (cs *ContainerService) setAddonsConfig(isUpgrade bool) {
 			},
 			{
 				Name:  common.CalicoClusterAutoscalerComponentName,
-				Image: kubernetesImageBase + k8sComponents[common.CalicoClusterAutoscalerComponentName],
+				Image: k8sComponents[common.CalicoClusterAutoscalerComponentName],
 			},
 		},
 	}

diff --git a/pkg/api/addons_test.go b/pkg/api/addons_test.go
@@ -1717,7 +1717,7 @@ func TestSetAddonsConfig(t *testing.T) {
 						},
 						{
 							Name:  common.CalicoClusterAutoscalerComponentName,
-							Image: specConfig.MCRKubernetesImageBase + k8sComponentsByVersionMap["1.15.4"][common.CalicoClusterAutoscalerComponentName],
+							Image: k8sComponentsByVersionMap["1.15.4"][common.CalicoClusterAutoscalerComponentName],
 						},
 					},
 				},
@@ -1795,7 +1795,7 @@ func TestSetAddonsConfig(t *testing.T) {
 						},
 						{
 							Name:  common.CalicoClusterAutoscalerComponentName,
-							Image: specConfig.MCRKubernetesImageBase + k8sComponentsByVersionMap["1.15.4"][common.CalicoClusterAutoscalerComponentName],
+							Image: k8sComponentsByVersionMap["1.15.4"][common.CalicoClusterAutoscalerComponentName],
 						},
 					},
 				},

diff --git a/pkg/api/k8s_versions.go b/pkg/api/k8s_versions.go
@@ -19,7 +19,7 @@ const (
 	calicoCNIImageReference                           string = "cni:v3.8.0"
 	calicoNodeImageReference                          string = "node:v3.8.0"
 	calicoPod2DaemonImageReference                    string = "pod2daemon-flexvol:v3.8.0"
-	calicoClusterProportionalAutoscalerImageReference string = "cluster-proportional-autoscaler-amd64:1.1.2-r2"
+	calicoClusterProportionalAutoscalerImageReference string = "mcr.microsoft.com/oss/kubernetes/autoscaler/cluster-proportional-autoscaler:1.1.2-r2"
 	ciliumAgentImageReference                         string = "docker.io/cilium/cilium:v1.4"
 	ciliumCleanStateImageReference                    string = "docker.io/cilium/cilium-init:2018-10-16"
 	ciliumOperatorImageReference                      string = "docker.io/cilium/operator:v1.4"

diff --git a/vhd/packer/install-dependencies.sh b/vhd/packer/install-dependencies.sh
@@ -498,6 +498,7 @@ done
 
 CLUSTER_PROPORTIONAL_AUTOSCALER_VERSIONS="
 1.7.1
+1.1.2-r2
 "
 for CLUSTER_PROPORTIONAL_AUTOSCALER_VERSION in ${CLUSTER_PROPORTIONAL_AUTOSCALER_VERSIONS}; do
   CONTAINER_IMAGE="mcr.microsoft.com/oss/kubernetes/autoscaler/cluster-proportional-autoscaler:${CLUSTER_PROPORTIONAL_AUTOSCALER_VERSION}"