From 37483d120573786b3752eca3e5c924017042dc36 Mon Sep 17 00:00:00 2001 From: Ciprian Hacman Date: Sun, 9 Mar 2025 06:57:23 +0200 Subject: [PATCH 1/2] Update metrics-server to v0.7.2 --- .../addons/metrics-server.addons.k8s.io/k8s-1.11.yaml.template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/upup/models/cloudup/resources/addons/metrics-server.addons.k8s.io/k8s-1.11.yaml.template b/upup/models/cloudup/resources/addons/metrics-server.addons.k8s.io/k8s-1.11.yaml.template index 31cd9ae1de..bcab310e85 100644 --- a/upup/models/cloudup/resources/addons/metrics-server.addons.k8s.io/k8s-1.11.yaml.template +++ b/upup/models/cloudup/resources/addons/metrics-server.addons.k8s.io/k8s-1.11.yaml.template @@ -145,7 +145,7 @@ spec: {{ if WithDefaultBool .MetricsServer.Insecure true }} - --kubelet-insecure-tls {{ end }} - image: {{ or .MetricsServer.Image "registry.k8s.io/metrics-server/metrics-server:v0.7.1" }} + image: {{ or .MetricsServer.Image "registry.k8s.io/metrics-server/metrics-server:v0.7.2" }} imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 3 From e62966dad20532711126c74bfdcd3e84e34547b0 Mon Sep 17 00:00:00 2001 From: Ciprian Hacman Date: Sun, 9 Mar 2025 07:00:10 +0200 Subject: [PATCH 2/2] hack/update-expected.sh --- .../aws_s3_object_minimal.example.com-addons-bootstrap_content | 2 +- ...ple.com-addons-metrics-server.addons.k8s.io-k8s-1.11_content | 2 +- .../aws_s3_object_minimal.example.com-addons-bootstrap_content | 2 +- ...ple.com-addons-metrics-server.addons.k8s.io-k8s-1.11_content | 2 +- .../aws_s3_object_minimal.example.com-addons-bootstrap_content | 2 +- ...ple.com-addons-metrics-server.addons.k8s.io-k8s-1.11_content | 2 +- ...s_s3_object_many-addons.example.com-addons-bootstrap_content | 2 +- ...ple.com-addons-metrics-server.addons.k8s.io-k8s-1.11_content | 2 +- .../metrics-server/insecure-1.19/manifest.yaml | 2 +- .../insecure-1.19/metrics-server.addons.k8s.io-k8s-1.11.yaml | 2 +- .../metrics-server/secure-1.19/manifest.yaml | 2 +- .../secure-1.19/metrics-server.addons.k8s.io-k8s-1.11.yaml | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_minimal.example.com-addons-bootstrap_content index bb6c25a23c..d529a29021 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_minimal.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_minimal.example.com-addons-bootstrap_content @@ -48,7 +48,7 @@ spec: version: 9.99.0 - id: k8s-1.11 manifest: metrics-server.addons.k8s.io/k8s-1.11.yaml - manifestHash: 5a79936723087694804b3f2dd19917119822494bb92c2ea8f8554729bb293e9f + manifestHash: f858a160d2ed56d622fb7d3cbcb589ddbb2aa2b83677a505f46330ba42c81bb7 name: metrics-server.addons.k8s.io needsPKI: true selector: diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_minimal.example.com-addons-metrics-server.addons.k8s.io-k8s-1.11_content b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_minimal.example.com-addons-metrics-server.addons.k8s.io-k8s-1.11_content index 658d9975d5..0906ed596e 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_minimal.example.com-addons-metrics-server.addons.k8s.io-k8s-1.11_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_minimal.example.com-addons-metrics-server.addons.k8s.io-k8s-1.11_content @@ -176,7 +176,7 @@ spec: - --kubelet-preferred-address-types=Hostname - --cert-dir=/tmp - --kubelet-insecure-tls - image: registry.k8s.io/metrics-server/metrics-server:v0.7.1 + image: registry.k8s.io/metrics-server/metrics-server:v0.7.2 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 3 diff --git a/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_minimal.example.com-addons-bootstrap_content index c75d2e8be4..46a45135f4 100644 --- a/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_minimal.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_minimal.example.com-addons-bootstrap_content @@ -48,7 +48,7 @@ spec: version: 9.99.0 - id: k8s-1.11 manifest: metrics-server.addons.k8s.io/k8s-1.11.yaml - manifestHash: 5a79936723087694804b3f2dd19917119822494bb92c2ea8f8554729bb293e9f + manifestHash: f858a160d2ed56d622fb7d3cbcb589ddbb2aa2b83677a505f46330ba42c81bb7 name: metrics-server.addons.k8s.io needsPKI: true selector: diff --git a/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_minimal.example.com-addons-metrics-server.addons.k8s.io-k8s-1.11_content b/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_minimal.example.com-addons-metrics-server.addons.k8s.io-k8s-1.11_content index 658d9975d5..0906ed596e 100644 --- a/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_minimal.example.com-addons-metrics-server.addons.k8s.io-k8s-1.11_content +++ b/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_minimal.example.com-addons-metrics-server.addons.k8s.io-k8s-1.11_content @@ -176,7 +176,7 @@ spec: - --kubelet-preferred-address-types=Hostname - --cert-dir=/tmp - --kubelet-insecure-tls - image: registry.k8s.io/metrics-server/metrics-server:v0.7.1 + image: registry.k8s.io/metrics-server/metrics-server:v0.7.2 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 3 diff --git a/tests/integration/update_cluster/many-addons-gce/data/aws_s3_object_minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/many-addons-gce/data/aws_s3_object_minimal.example.com-addons-bootstrap_content index a3dc4a7b63..8f68b4e3fe 100644 --- a/tests/integration/update_cluster/many-addons-gce/data/aws_s3_object_minimal.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/many-addons-gce/data/aws_s3_object_minimal.example.com-addons-bootstrap_content @@ -48,7 +48,7 @@ spec: version: 9.99.0 - id: k8s-1.11 manifest: metrics-server.addons.k8s.io/k8s-1.11.yaml - manifestHash: f5a15bd72ed37b6a3e36df1bddd77c6440f6b067c3b97f3d216e24d2ed014826 + manifestHash: 20fc8a62a91b813e570401ad440cc0bc3ebc6423b365b38378d44f1b19e0c69c name: metrics-server.addons.k8s.io needsPKI: true selector: diff --git a/tests/integration/update_cluster/many-addons-gce/data/aws_s3_object_minimal.example.com-addons-metrics-server.addons.k8s.io-k8s-1.11_content b/tests/integration/update_cluster/many-addons-gce/data/aws_s3_object_minimal.example.com-addons-metrics-server.addons.k8s.io-k8s-1.11_content index f577aac2f1..0df7ed08bc 100644 --- a/tests/integration/update_cluster/many-addons-gce/data/aws_s3_object_minimal.example.com-addons-metrics-server.addons.k8s.io-k8s-1.11_content +++ b/tests/integration/update_cluster/many-addons-gce/data/aws_s3_object_minimal.example.com-addons-metrics-server.addons.k8s.io-k8s-1.11_content @@ -176,7 +176,7 @@ spec: - --kubelet-preferred-address-types=InternalIP - --cert-dir=/tmp - --kubelet-insecure-tls - image: registry.k8s.io/metrics-server/metrics-server:v0.7.1 + image: registry.k8s.io/metrics-server/metrics-server:v0.7.2 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 3 diff --git a/tests/integration/update_cluster/many-addons/data/aws_s3_object_many-addons.example.com-addons-bootstrap_content b/tests/integration/update_cluster/many-addons/data/aws_s3_object_many-addons.example.com-addons-bootstrap_content index af2286f974..049df2ef17 100644 --- a/tests/integration/update_cluster/many-addons/data/aws_s3_object_many-addons.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/many-addons/data/aws_s3_object_many-addons.example.com-addons-bootstrap_content @@ -48,7 +48,7 @@ spec: version: 9.99.0 - id: k8s-1.11 manifest: metrics-server.addons.k8s.io/k8s-1.11.yaml - manifestHash: 5a79936723087694804b3f2dd19917119822494bb92c2ea8f8554729bb293e9f + manifestHash: f858a160d2ed56d622fb7d3cbcb589ddbb2aa2b83677a505f46330ba42c81bb7 name: metrics-server.addons.k8s.io needsPKI: true selector: diff --git a/tests/integration/update_cluster/many-addons/data/aws_s3_object_many-addons.example.com-addons-metrics-server.addons.k8s.io-k8s-1.11_content b/tests/integration/update_cluster/many-addons/data/aws_s3_object_many-addons.example.com-addons-metrics-server.addons.k8s.io-k8s-1.11_content index 658d9975d5..0906ed596e 100644 --- a/tests/integration/update_cluster/many-addons/data/aws_s3_object_many-addons.example.com-addons-metrics-server.addons.k8s.io-k8s-1.11_content +++ b/tests/integration/update_cluster/many-addons/data/aws_s3_object_many-addons.example.com-addons-metrics-server.addons.k8s.io-k8s-1.11_content @@ -176,7 +176,7 @@ spec: - --kubelet-preferred-address-types=Hostname - --cert-dir=/tmp - --kubelet-insecure-tls - image: registry.k8s.io/metrics-server/metrics-server:v0.7.1 + image: registry.k8s.io/metrics-server/metrics-server:v0.7.2 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 3 diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/metrics-server/insecure-1.19/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/metrics-server/insecure-1.19/manifest.yaml index 4e87916cf1..7148f6adb5 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/metrics-server/insecure-1.19/manifest.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/metrics-server/insecure-1.19/manifest.yaml @@ -41,7 +41,7 @@ spec: version: 9.99.0 - id: k8s-1.11 manifest: metrics-server.addons.k8s.io/k8s-1.11.yaml - manifestHash: 5a79936723087694804b3f2dd19917119822494bb92c2ea8f8554729bb293e9f + manifestHash: f858a160d2ed56d622fb7d3cbcb589ddbb2aa2b83677a505f46330ba42c81bb7 name: metrics-server.addons.k8s.io selector: k8s-app: metrics-server diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/metrics-server/insecure-1.19/metrics-server.addons.k8s.io-k8s-1.11.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/metrics-server/insecure-1.19/metrics-server.addons.k8s.io-k8s-1.11.yaml index 658d9975d5..0906ed596e 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/metrics-server/insecure-1.19/metrics-server.addons.k8s.io-k8s-1.11.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/metrics-server/insecure-1.19/metrics-server.addons.k8s.io-k8s-1.11.yaml @@ -176,7 +176,7 @@ spec: - --kubelet-preferred-address-types=Hostname - --cert-dir=/tmp - --kubelet-insecure-tls - image: registry.k8s.io/metrics-server/metrics-server:v0.7.1 + image: registry.k8s.io/metrics-server/metrics-server:v0.7.2 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 3 diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/metrics-server/secure-1.19/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/metrics-server/secure-1.19/manifest.yaml index c4a2f9dc55..38c183432d 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/metrics-server/secure-1.19/manifest.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/metrics-server/secure-1.19/manifest.yaml @@ -41,7 +41,7 @@ spec: version: 9.99.0 - id: k8s-1.11 manifest: metrics-server.addons.k8s.io/k8s-1.11.yaml - manifestHash: 1a15a7fb5f16c2df150971afbcf554671713453759fb0aaec2040369138d75b3 + manifestHash: ce64b6db009e467b9d24a4aa1153e814d5ee903ecff084cd61579320edf55bc7 name: metrics-server.addons.k8s.io needsPKI: true selector: diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/metrics-server/secure-1.19/metrics-server.addons.k8s.io-k8s-1.11.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/metrics-server/secure-1.19/metrics-server.addons.k8s.io-k8s-1.11.yaml index 28beea863b..a3ea8662d1 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/metrics-server/secure-1.19/metrics-server.addons.k8s.io-k8s-1.11.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/metrics-server/secure-1.19/metrics-server.addons.k8s.io-k8s-1.11.yaml @@ -176,7 +176,7 @@ spec: - --kubelet-preferred-address-types=Hostname - --tls-cert-file=/srv/tls.crt - --tls-private-key-file=/srv/tls.key - image: registry.k8s.io/metrics-server/metrics-server:v0.7.1 + image: registry.k8s.io/metrics-server/metrics-server:v0.7.2 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 3