From 2b9fab91ac9fed3d5bb5cee22d4005d2a134f454 Mon Sep 17 00:00:00 2001 From: Tom Wieczorek Date: Thu, 29 Aug 2024 15:26:36 +0200 Subject: [PATCH] Bump metrics-server to v0.7.2 https://github.com/kubernetes-sigs/metrics-server/releases/tag/v0.7.2 Signed-off-by: Tom Wieczorek (cherry picked from commit 709eba522b9e68043b05d201ee4da9c9e2fb3955) (cherry picked from commit 0aab08354eb017078ba9450d10fc7026c493299f) --- docs/configuration.md | 6 +++--- docs/raspberry-pi4.md | 2 +- pkg/apis/k0s/v1beta1/images_test.go | 6 +++--- pkg/constant/constant_shared.go | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/docs/configuration.md b/docs/configuration.md index ceeb70f7faf6..0da6902e9f30 100644 --- a/docs/configuration.md +++ b/docs/configuration.md @@ -471,11 +471,11 @@ images: image: calico/kube-controllers version: v3.16.2 metricsserver: - image: quay.io/k0sproject/metrics-server - version: v0.7.1-0 + image: registry.k8s.io/metrics-server/metrics-server + version: v0.7.2 ``` -In the runtime the image names are calculated as `my.own.repo/calico/kube-controllers:v3.16.2` and `my.own.repo/k0sproject/metrics-server:v0.7.1-0`. This only affects the the imgages pull location, and thus omitting an image specification here will not disable component deployment. +In the runtime the image names are calculated as `my.own.repo/calico/kube-controllers:v3.16.2` and `my.own.repo/metrics-server/metrics-server:v0.7.2`. This only affects the the imgages pull location, and thus omitting an image specification here will not disable component deployment. ### `spec.extensions.helm` diff --git a/docs/raspberry-pi4.md b/docs/raspberry-pi4.md index cab1618816cc..dd3fd424d2de 100644 --- a/docs/raspberry-pi4.md +++ b/docs/raspberry-pi4.md @@ -507,7 +507,7 @@ node/ubuntu Ready 5m1s v{{{ extra.k8s_version }}}+k0s 10.152.5 NAMESPACE NAME READY UP-TO-DATE AVAILABLE AGE CONTAINERS IMAGES SELECTOR kube-system deployment.apps/coredns 1/1 1 1 33m coredns registry.k8s.io/coredns/coredns:v1.7.0 k8s-app=kube-dns -kube-system deployment.apps/metrics-server 1/1 1 1 33m metrics-server quay.io/k0sproject/metrics-server:v0.7.1-0 k8s-app=metrics-server +kube-system deployment.apps/metrics-server 1/1 1 1 33m metrics-server registry.k8s.io/metrics-server/metrics-server:v0.7.2 k8s-app=metrics-server NAMESPACE NAME READY STATUS RESTARTS AGE IP NODE NOMINATED NODE READINESS GATES kube-system pod/coredns-88b745646-pkk5w 1/1 Running 0 33m 10.244.0.5 ubuntu diff --git a/pkg/apis/k0s/v1beta1/images_test.go b/pkg/apis/k0s/v1beta1/images_test.go index ceaef67c3afe..3fbbb6acca25 100644 --- a/pkg/apis/k0s/v1beta1/images_test.go +++ b/pkg/apis/k0s/v1beta1/images_test.go @@ -53,7 +53,7 @@ spec: assert.Equal(t, "custom-repository/my-custom-konnectivity-image:v0.0.1", a.Konnectivity.URI()) assert.Equal(t, "1.0.0", a.CoreDNS.Version) assert.Equal(t, "custom.io/coredns/coredns", a.CoreDNS.Image) - assert.Equal(t, "quay.io/k0sproject/metrics-server", a.MetricsServer.Image) + assert.Equal(t, "registry.k8s.io/metrics-server/metrics-server", a.MetricsServer.Image) } func TestImagesRepoOverrideInConfiguration(t *testing.T) { @@ -64,7 +64,7 @@ func TestImagesRepoOverrideInConfiguration(t *testing.T) { var testingConfig *ClusterConfig require.NoError(t, yaml.Unmarshal(getConfigYAML(t, cfg), &testingConfig)) require.Equal(t, fmt.Sprintf("my.repo/k0sproject/apiserver-network-proxy-agent:%s", constant.KonnectivityImageVersion), testingConfig.Spec.Images.Konnectivity.URI()) - require.Equal(t, fmt.Sprintf("my.repo/k0sproject/metrics-server:%s", constant.MetricsImageVersion), testingConfig.Spec.Images.MetricsServer.URI()) + require.Equal(t, fmt.Sprintf("my.repo/metrics-server/metrics-server:%s", constant.MetricsImageVersion), testingConfig.Spec.Images.MetricsServer.URI()) require.Equal(t, fmt.Sprintf("my.repo/k0sproject/kube-proxy:%s", constant.KubeProxyImageVersion), testingConfig.Spec.Images.KubeProxy.URI()) require.Equal(t, fmt.Sprintf("my.repo/k0sproject/coredns:%s", constant.CoreDNSImageVersion), testingConfig.Spec.Images.CoreDNS.URI()) require.Equal(t, fmt.Sprintf("my.repo/k0sproject/calico-cni:%s", constant.CalicoComponentImagesVersion), testingConfig.Spec.Images.Calico.CNI.URI()) @@ -84,7 +84,7 @@ func TestImagesRepoOverrideInConfiguration(t *testing.T) { var testingConfig *ClusterConfig require.NoError(t, yaml.Unmarshal(getConfigYAML(t, cfg), &testingConfig)) require.Equal(t, fmt.Sprintf("my.repo/my-custom-image:%s", constant.KonnectivityImageVersion), testingConfig.Spec.Images.Konnectivity.URI()) - require.Equal(t, fmt.Sprintf("my.repo/k0sproject/metrics-server:%s", constant.MetricsImageVersion), testingConfig.Spec.Images.MetricsServer.URI()) + require.Equal(t, fmt.Sprintf("my.repo/metrics-server/metrics-server:%s", constant.MetricsImageVersion), testingConfig.Spec.Images.MetricsServer.URI()) require.Equal(t, fmt.Sprintf("my.repo/k0sproject/kube-proxy:%s", constant.KubeProxyImageVersion), testingConfig.Spec.Images.KubeProxy.URI()) require.Equal(t, fmt.Sprintf("my.repo/k0sproject/coredns:%s", constant.CoreDNSImageVersion), testingConfig.Spec.Images.CoreDNS.URI()) require.Equal(t, fmt.Sprintf("my.repo/k0sproject/calico-cni:%s", constant.CalicoComponentImagesVersion), testingConfig.Spec.Images.Calico.CNI.URI()) diff --git a/pkg/constant/constant_shared.go b/pkg/constant/constant_shared.go index 4aadc4cfd2ae..cdbd536e1a9f 100644 --- a/pkg/constant/constant_shared.go +++ b/pkg/constant/constant_shared.go @@ -75,8 +75,8 @@ const ( KonnectivityImageVersion = "v0.1.4" PushGatewayImage = "quay.io/k0sproject/pushgateway-ttl" PushGatewayImageVersion = "1.4.0-k0s.0" - MetricsImage = "quay.io/k0sproject/metrics-server" - MetricsImageVersion = "v0.7.1-0" + MetricsImage = "registry.k8s.io/metrics-server/metrics-server" + MetricsImageVersion = "v0.7.2" KubeProxyImage = "quay.io/k0sproject/kube-proxy" KubeProxyImageVersion = "v1.29.8" CoreDNSImage = "quay.io/k0sproject/coredns"