Merge pull request #4913 from twz123/bump-metrics-server

Bump metrics-server to v0.7.2
k0sproject · Sep 17, 2024 · 347134a · 347134a
2 parents 356c893 + 709eba5
commit 347134a
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/docs/configuration.md b/docs/configuration.md
@@ -505,13 +505,13 @@ images:
       image: quay.io/k0sproject/calico-kube-controllers
       version: v3.27.3-0
   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/k0sproject/calico-kube-controllers:v3.27.3-0` and
-`my.own.repo/k0sproject/metrics-server:v0.7.1-0`. This only affects the the
+`my.own.repo/metrics-server/metrics-server:v0.7.2`. This only affects the the
 images pull location, and thus omitting an image specification here will not
 disable component deployment.
 

diff --git a/docs/raspberry-pi4.md b/docs/raspberry-pi4.md
@@ -508,7 +508,7 @@ node/ubuntu   Ready    <none>   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   <none>           <none>

diff --git 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.go b/pkg/constant/constant.go
@@ -81,8 +81,8 @@ const (
 	KonnectivityImageVersion           = "v0.30.3"
 	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"
 	KubePauseContainerImage            = "registry.k8s.io/pause"
 	KubePauseContainerImageVersion     = "3.9"
 	KubeProxyImage                     = "quay.io/k0sproject/kube-proxy"