Skip to content
This repository has been archived by the owner on Oct 24, 2023. It is now read-only.

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

Merged
merged 5 commits into from
Apr 20, 2020
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9665d01
fix: update cluster-proportional-autoscaler path at MCR
mboersma Apr 17, 2020
63fc761
chore: add other cluster-prop-auto versions to Linux VHD
mboersma Apr 17, 2020
b72979c
fix: remove DNSAutoscalerAddonName after rebase fail
mboersma Apr 17, 2020
3755fae
chore: remove unreferenced c-a-p version from Linux VHD
mboersma Apr 17, 2020
433008f
refactor: remove kubernetesImageBase prefix from calico c-p-a
mboersma Apr 20, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion pkg/api/addons.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -367,7 +367,7 @@ func (cs *ContainerService) setAddonsConfig(isUpgrade bool) {
},
{
Name: common.CalicoClusterAutoscalerComponentName,
Image: kubernetesImageBase + k8sComponents[common.CalicoClusterAutoscalerComponentName],
Image: k8sComponents[common.CalicoClusterAutoscalerComponentName],
},
},
}
Expand Down
4 changes: 2 additions & 2 deletions pkg/api/addons_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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],
},
},
},
Expand Down Expand Up @@ -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],
},
},
},
Expand Down
2 changes: 1 addition & 1 deletion pkg/api/k8s_versions.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 1 addition & 0 deletions vhd/packer/install-dependencies.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Expand Down