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

chore: upgrade metrics-server to v0.3.7 #3669

Merged
merged 9 commits into from Aug 14, 2020
Merged

chore: upgrade metrics-server to v0.3.7 #3669

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
d2b8b2e
chore: upgrade metrics-server to v0.3.7
jackfrancis Aug 5, 2020
dd2d5a1
chore: use new URL
jackfrancis Aug 5, 2020
51a11b7
chore: update metrics-server spec in 1.15
jackfrancis Aug 7, 2020
82b17ca
try this
jackfrancis Aug 10, 2020
85e9f76
revert 1.15 changes
jackfrancis Aug 10, 2020
a94c54c
add v0.2.1 back to VHD spec
jackfrancis Aug 11, 2020
55b06d6
stop testing 1.15 base
jackfrancis Aug 11, 2020
e7f80cc
restore 1.15 for base config test
jackfrancis Aug 12, 2020
df48a0a
fix: whoops!
jackfrancis Aug 13, 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
16 changes: 8 additions & 8 deletions pkg/api/k8s_versions.go
View file
Open in desktop
Expand Up @@ -116,25 +116,25 @@ var kubernetesImageBaseVersionedImages = map[string]map[string]map[string]string
common.KubernetesImageBaseTypeGCR: {
"1.19": {
common.AddonResizerComponentName: "addon-resizer:1.8.7",
common.MetricsServerAddonName: "metrics-server-amd64:v0.3.6",
common.MetricsServerAddonName: "metrics-server/metrics-server:v0.3.7",
common.AddonManagerComponentName: "kube-addon-manager-amd64:v9.1.1",
common.ClusterAutoscalerAddonName: "cluster-autoscaler:v1.18.0",
},
"1.18": {
common.AddonResizerComponentName: "addon-resizer:1.8.7",
common.MetricsServerAddonName: "metrics-server-amd64:v0.3.6",
common.MetricsServerAddonName: "metrics-server/metrics-server:v0.3.7",
common.AddonManagerComponentName: "kube-addon-manager-amd64:v9.1.1",
common.ClusterAutoscalerAddonName: "cluster-autoscaler:v1.18.0",
},
"1.17": {
common.AddonResizerComponentName: "addon-resizer:1.8.7",
common.MetricsServerAddonName: "metrics-server-amd64:v0.3.6",
common.MetricsServerAddonName: "metrics-server/metrics-server:v0.3.7",
common.AddonManagerComponentName: "kube-addon-manager-amd64:v9.1.1",
common.ClusterAutoscalerAddonName: "cluster-autoscaler:v1.17.1",
},
"1.16": {
common.AddonResizerComponentName: "addon-resizer:1.8.7",
common.MetricsServerAddonName: "metrics-server-amd64:v0.3.4",
common.MetricsServerAddonName: "metrics-server/metrics-server:v0.2.1",
mboersma marked this conversation as resolved.
Show resolved Hide resolved
common.AddonManagerComponentName: "kube-addon-manager-amd64:v9.1.1",
common.ClusterAutoscalerAddonName: "cluster-autoscaler:v1.16.4",
},
Expand Down Expand Up @@ -222,25 +222,25 @@ var kubernetesImageBaseVersionedImages = map[string]map[string]map[string]string
common.KubernetesImageBaseTypeMCR: {
"1.19": {
common.AddonResizerComponentName: "oss/kubernetes/autoscaler/addon-resizer:1.8.7",
common.MetricsServerAddonName: "oss/kubernetes/metrics-server:v0.3.6",
common.MetricsServerAddonName: "oss/kubernetes/metrics-server:v0.3.7",
common.AddonManagerComponentName: "oss/kubernetes/kube-addon-manager:v9.1.1",
common.ClusterAutoscalerAddonName: "oss/kubernetes/autoscaler/cluster-autoscaler:v1.19.0",
},
"1.18": {
common.AddonResizerComponentName: "oss/kubernetes/autoscaler/addon-resizer:1.8.7",
common.MetricsServerAddonName: "oss/kubernetes/metrics-server:v0.3.6",
common.MetricsServerAddonName: "oss/kubernetes/metrics-server:v0.3.7",
common.AddonManagerComponentName: "oss/kubernetes/kube-addon-manager:v9.1.1",
common.ClusterAutoscalerAddonName: "oss/kubernetes/autoscaler/cluster-autoscaler:v1.18.2",
},
"1.17": {
common.AddonResizerComponentName: "oss/kubernetes/autoscaler/addon-resizer:1.8.7",
common.MetricsServerAddonName: "oss/kubernetes/metrics-server:v0.3.6",
common.MetricsServerAddonName: "oss/kubernetes/metrics-server:v0.3.7",
common.AddonManagerComponentName: "oss/kubernetes/kube-addon-manager:v9.1.1",
common.ClusterAutoscalerAddonName: "oss/kubernetes/autoscaler/cluster-autoscaler:v1.17.3",
},
"1.16": {
common.AddonResizerComponentName: "oss/kubernetes/autoscaler/addon-resizer:1.8.7",
common.MetricsServerAddonName: "oss/kubernetes/metrics-server:v0.3.4",
common.MetricsServerAddonName: "oss/kubernetes/metrics-server:v0.3.7",
common.AddonManagerComponentName: "oss/kubernetes/kube-addon-manager:v9.1.1",
common.ClusterAutoscalerAddonName: "oss/kubernetes/autoscaler/cluster-autoscaler:v1.16.6",
},
Expand Down
13 changes: 8 additions & 5 deletions vhd/packer/install-dependencies.sh
View file
Open in desktop
Expand Up @@ -153,20 +153,23 @@ for ADDON_RESIZER_VERSION in ${ADDON_RESIZER_VERSIONS}; do
done

METRICS_SERVER_VERSIONS="
0.3.6
0.3.5
0.3.4
0.2.1
0.3.7
"
for METRICS_SERVER_VERSION in ${METRICS_SERVER_VERSIONS}; do
CONTAINER_IMAGE="k8s.gcr.io/metrics-server-amd64:v${METRICS_SERVER_VERSION}"
CONTAINER_IMAGE="k8s.gcr.io/metrics-server/metrics-server:v${METRICS_SERVER_VERSION}"
pullContainerImage "docker" ${CONTAINER_IMAGE}
echo " - ${CONTAINER_IMAGE}" >> ${VHD_LOGS_FILEPATH}
CONTAINER_IMAGE="mcr.microsoft.com/oss/kubernetes/metrics-server:v${METRICS_SERVER_VERSION}"
pullContainerImage "docker" ${CONTAINER_IMAGE}
echo " - ${CONTAINER_IMAGE}" >> ${VHD_LOGS_FILEPATH}
done

# gcr URL for metrics-server v0.2.1 is different, so we can't (easily) re-use the above enumeration
# so let's just do it boutique-style below until we no longer have to build images for k8s 1.15
METRICS_SERVER_VERSION_FOR_K8S_1DOT15="v0.2.1"
pullContainerImage "docker" k8s.gcr.io/metrics-server-amd64:$METRICS_SERVER_VERSION_FOR_K8S_1DOT15
pullContainerImage "docker" mcr.microsoft.com/oss/kubernetes/metrics-server:$METRICS_SERVER_VERSION_FOR_K8S_1DOT15

KUBE_DNS_VERSIONS="
1.15.4
"
Expand Down