Release 1.25.4 (#15202)

kubernetes · Mar 8, 2023 · 2f3cf15 · 2f3cf15
1 parent 1cd184c
commit 2f3cf15
Show file tree

Hide file tree

Showing 297 changed files with 666 additions and 666 deletions.
diff --git a/Makefile b/Makefile
@@ -59,13 +59,13 @@ GITSHA := $(shell cd ${KOPS_ROOT}; git describe --always)
 # We lock the versions of our controllers also
 # We need to keep in sync with:
 #   upup/models/cloudup/resources/addons/dns-controller/
-DNS_CONTROLLER_TAG=1.25.3
+DNS_CONTROLLER_TAG=1.25.4
 DNS_CONTROLLER_PUSH_TAG=$(shell tools/get_workspace_status.sh | grep STABLE_DNS_CONTROLLER_TAG | awk '{print $$2}')
 #   upup/models/cloudup/resources/addons/kops-controller.addons.k8s.io/
-KOPS_CONTROLLER_TAG=1.25.3
+KOPS_CONTROLLER_TAG=1.25.4
 KOPS_CONTROLLER_PUSH_TAG=$(shell tools/get_workspace_status.sh | grep STABLE_KOPS_CONTROLLER_TAG | awk '{print $$2}')
 #   pkg/model/components/kubeapiserver/model.go
-KUBE_APISERVER_HEALTHCHECK_TAG=1.25.3
+KUBE_APISERVER_HEALTHCHECK_TAG=1.25.4
 KUBE_APISERVER_HEALTHCHECK_PUSH_TAG=$(shell tools/get_workspace_status.sh | grep STABLE_KUBE_APISERVER_HEALTHCHECK_TAG | awk '{print $$2}')
 
 CGO_ENABLED=0

diff --git a/kops-version.go b/kops-version.go
@@ -21,8 +21,8 @@ var Version = KOPS_RELEASE_VERSION
 
 // These constants are parsed by build tooling - be careful about changing the formats
 const (
-	KOPS_RELEASE_VERSION = "1.25.3"
-	KOPS_CI_VERSION      = "1.25.4"
+	KOPS_RELEASE_VERSION = "1.25.4"
+	KOPS_CI_VERSION      = "1.25.5"
 )
 
 // GitVersion should be replaced by the makefile

diff --git a/pkg/model/components/kubeapiserver/model.go b/pkg/model/components/kubeapiserver/model.go
@@ -79,7 +79,7 @@ kind: Pod
 spec:
   containers:
   - name: healthcheck
-    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.25.3
+    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.25.4
     livenessProbe:
       httpGet:
         # The sidecar serves a healthcheck on the same port,

diff --git a/pkg/model/components/kubeapiserver/tests/minimal/tasks.yaml b/pkg/model/components/kubeapiserver/tests/minimal/tasks.yaml
@@ -10,7 +10,7 @@ Contents: |
       - --ca-cert=/secrets/ca.crt
       - --client-cert=/secrets/client.crt
       - --client-key=/secrets/client.key
-      image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.25.3
+      image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.25.4
       livenessProbe:
         httpGet:
           host: 127.0.0.1

diff --git a/...ditionalobjects/data/aws_s3_object_additionalobjects.example.com-addons-bootstrap_content b/...ditionalobjects/data/aws_s3_object_additionalobjects.example.com-addons-bootstrap_content
@@ -6,7 +6,7 @@ spec:
   addons:
   - id: k8s-1.16
     manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
-    manifestHash: 9bea07bd2eef1a55ab8959b472828628a224355b00bba442cf50d15f144815d2
+    manifestHash: 941be948af8edb76440f0544d4fc65fcb145e42141c07e8cc1b2cb04cd8bc1a5
     name: kops-controller.addons.k8s.io
     needsRollingUpdate: control-plane
     selector:
@@ -41,7 +41,7 @@ spec:
     version: 9.99.0
   - id: k8s-1.12
     manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
-    manifestHash: 7b78d3abc4cfe7acaf7cdbe62b42ebdca5868d180d3fa31448563c3bf606f106
+    manifestHash: 1748a7e24a0fee6e267801b30ffb2d8115908ed56f0855af6d506059ec0f2b8e
     name: dns-controller.addons.k8s.io
     selector:
       k8s-addon: dns-controller.addons.k8s.io

diff --git a/...object_additionalobjects.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content b/...object_additionalobjects.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
@@ -7,7 +7,7 @@ metadata:
     app.kubernetes.io/managed-by: kops
     k8s-addon: dns-controller.addons.k8s.io
     k8s-app: dns-controller
-    version: v1.25.3
+    version: v1.25.4
   name: dns-controller
   namespace: kube-system
 spec:
@@ -24,7 +24,7 @@ spec:
         k8s-addon: dns-controller.addons.k8s.io
         k8s-app: dns-controller
         kops.k8s.io/managed-by: kops
-        version: v1.25.3
+        version: v1.25.4
     spec:
       affinity:
         nodeAffinity:
@@ -48,7 +48,7 @@ spec:
         env:
         - name: KUBERNETES_SERVICE_HOST
           value: 127.0.0.1
-        image: registry.k8s.io/kops/dns-controller:1.25.3
+        image: registry.k8s.io/kops/dns-controller:1.25.4
         name: dns-controller
         resources:
           requests:

diff --git a/...bject_additionalobjects.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content b/...bject_additionalobjects.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
@@ -23,7 +23,7 @@ metadata:
     app.kubernetes.io/managed-by: kops
     k8s-addon: kops-controller.addons.k8s.io
     k8s-app: kops-controller
-    version: v1.25.3
+    version: v1.25.4
   name: kops-controller
   namespace: kube-system
 spec:
@@ -39,7 +39,7 @@ spec:
         k8s-addon: kops-controller.addons.k8s.io
         k8s-app: kops-controller
         kops.k8s.io/managed-by: kops
-        version: v1.25.3
+        version: v1.25.4
     spec:
       affinity:
         nodeAffinity:
@@ -63,7 +63,7 @@ spec:
         env:
         - name: KUBERNETES_SERVICE_HOST
           value: 127.0.0.1
-        image: registry.k8s.io/kops/kops-controller:1.25.3
+        image: registry.k8s.io/kops/kops-controller:1.25.4
         name: kops-controller
         resources:
           requests:

diff --git a/.../additionalobjects/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content b/.../additionalobjects/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
@@ -8,7 +8,7 @@ spec:
     - --ca-cert=/secrets/ca.crt
     - --client-cert=/secrets/client.crt
     - --client-key=/secrets/client.key
-    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.25.3
+    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.25.4
     livenessProbe:
       httpGet:
         host: 127.0.0.1

diff --git a/...ter/apiservernodes/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content b/...ter/apiservernodes/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
@@ -8,7 +8,7 @@ spec:
     - --ca-cert=/secrets/ca.crt
     - --client-cert=/secrets/client.crt
     - --client-key=/secrets/client.key
-    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.25.3
+    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.25.4
     livenessProbe:
       httpGet:
         host: 127.0.0.1

diff --git a/...te_cluster/apiservernodes/data/aws_s3_object_minimal.example.com-addons-bootstrap_content b/...te_cluster/apiservernodes/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
@@ -6,7 +6,7 @@ spec:
   addons:
   - id: k8s-1.16
     manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
-    manifestHash: 8b240f3c55ed695b075cadd239d72bffa7364270491466b5c668c939e2654d14
+    manifestHash: 0c8fdbbcc8bc20cbe6fd37567392b1a7d1be5eeebf56c3359a0a4547e25f375b
     name: kops-controller.addons.k8s.io
     needsRollingUpdate: control-plane
     selector:
@@ -34,7 +34,7 @@ spec:
     version: 9.99.0
   - id: k8s-1.12
     manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
-    manifestHash: 7b78d3abc4cfe7acaf7cdbe62b42ebdca5868d180d3fa31448563c3bf606f106
+    manifestHash: 1748a7e24a0fee6e267801b30ffb2d8115908ed56f0855af6d506059ec0f2b8e
     name: dns-controller.addons.k8s.io
     selector:
       k8s-addon: dns-controller.addons.k8s.io

diff --git a/...ta/aws_s3_object_minimal.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content b/...ta/aws_s3_object_minimal.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
@@ -7,7 +7,7 @@ metadata:
     app.kubernetes.io/managed-by: kops
     k8s-addon: dns-controller.addons.k8s.io
     k8s-app: dns-controller
-    version: v1.25.3
+    version: v1.25.4
   name: dns-controller
   namespace: kube-system
 spec:
@@ -24,7 +24,7 @@ spec:
         k8s-addon: dns-controller.addons.k8s.io
         k8s-app: dns-controller
         kops.k8s.io/managed-by: kops
-        version: v1.25.3
+        version: v1.25.4
     spec:
       affinity:
         nodeAffinity:
@@ -48,7 +48,7 @@ spec:
         env:
         - name: KUBERNETES_SERVICE_HOST
           value: 127.0.0.1
-        image: registry.k8s.io/kops/dns-controller:1.25.3
+        image: registry.k8s.io/kops/dns-controller:1.25.4
         name: dns-controller
         resources:
           requests:

diff --git a/...a/aws_s3_object_minimal.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content b/...a/aws_s3_object_minimal.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
@@ -23,7 +23,7 @@ metadata:
     app.kubernetes.io/managed-by: kops
     k8s-addon: kops-controller.addons.k8s.io
     k8s-app: kops-controller
-    version: v1.25.3
+    version: v1.25.4
   name: kops-controller
   namespace: kube-system
 spec:
@@ -39,7 +39,7 @@ spec:
         k8s-addon: kops-controller.addons.k8s.io
         k8s-app: kops-controller
         kops.k8s.io/managed-by: kops
-        version: v1.25.3
+        version: v1.25.4
     spec:
       affinity:
         nodeAffinity:
@@ -63,7 +63,7 @@ spec:
         env:
         - name: KUBERNETES_SERVICE_HOST
           value: 127.0.0.1
-        image: registry.k8s.io/kops/kops-controller:1.25.3
+        image: registry.k8s.io/kops/kops-controller:1.25.4
         name: kops-controller
         resources:
           requests:

diff --git a/.../aws-lb-controller/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content b/.../aws-lb-controller/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
@@ -8,7 +8,7 @@ spec:
     - --ca-cert=/secrets/ca.crt
     - --client-cert=/secrets/client.crt
     - --client-key=/secrets/client.key
-    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.25.3
+    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.25.4
     livenessProbe:
       httpGet:
         host: 127.0.0.1

diff --git a/...cluster/aws-lb-controller/data/aws_s3_object_minimal.example.com-addons-bootstrap_content b/...cluster/aws-lb-controller/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
@@ -6,7 +6,7 @@ spec:
   addons:
   - id: k8s-1.16
     manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
-    manifestHash: 09396718b704427d10f32ec53a780a63fef75c1127525d48c99297a5983229d9
+    manifestHash: 98ad409b685af3475be322383a59fbd7117109f360a313749bb099d85347ce9e
     name: kops-controller.addons.k8s.io
     needsRollingUpdate: control-plane
     selector:
@@ -34,7 +34,7 @@ spec:
     version: 9.99.0
   - id: k8s-1.12
     manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
-    manifestHash: 8d309675f28b85c0e6bdfa5b49cb518e72cf331fc89a4d218869955932017e62
+    manifestHash: 939e1a46eb2474cb8d6ec98665341c85d944542ae324c43cdd237f595d5ef503
     name: dns-controller.addons.k8s.io
     selector:
       k8s-addon: dns-controller.addons.k8s.io

diff --git a/...ta/aws_s3_object_minimal.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content b/...ta/aws_s3_object_minimal.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
@@ -7,7 +7,7 @@ metadata:
     app.kubernetes.io/managed-by: kops
     k8s-addon: dns-controller.addons.k8s.io
     k8s-app: dns-controller
-    version: v1.25.3
+    version: v1.25.4
   name: dns-controller
   namespace: kube-system
 spec:
@@ -24,7 +24,7 @@ spec:
         k8s-addon: dns-controller.addons.k8s.io
         k8s-app: dns-controller
         kops.k8s.io/managed-by: kops
-        version: v1.25.3
+        version: v1.25.4
     spec:
       affinity:
         nodeAffinity:
@@ -51,7 +51,7 @@ spec:
           value: arn:aws-test:iam::123456789012:role/dns-controller.kube-system.sa.minimal.example.com
         - name: AWS_WEB_IDENTITY_TOKEN_FILE
           value: /var/run/secrets/amazonaws.com/token
-        image: registry.k8s.io/kops/dns-controller:1.25.3
+        image: registry.k8s.io/kops/dns-controller:1.25.4
         name: dns-controller
         resources:
           requests:

diff --git a/...a/aws_s3_object_minimal.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content b/...a/aws_s3_object_minimal.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
@@ -23,7 +23,7 @@ metadata:
     app.kubernetes.io/managed-by: kops
     k8s-addon: kops-controller.addons.k8s.io
     k8s-app: kops-controller
-    version: v1.25.3
+    version: v1.25.4
   name: kops-controller
   namespace: kube-system
 spec:
@@ -39,7 +39,7 @@ spec:
         k8s-addon: kops-controller.addons.k8s.io
         k8s-app: kops-controller
         kops.k8s.io/managed-by: kops
-        version: v1.25.3
+        version: v1.25.4
     spec:
       affinity:
         nodeAffinity:
@@ -63,7 +63,7 @@ spec:
         env:
         - name: KUBERNETES_SERVICE_HOST
           value: 127.0.0.1
-        image: registry.k8s.io/kops/kops-controller:1.25.3
+        image: registry.k8s.io/kops/kops-controller:1.25.4
         name: kops-controller
         resources:
           requests:

diff --git a/...itional_user-data/data/aws_s3_object_bastionuserdata.example.com-addons-bootstrap_content b/...itional_user-data/data/aws_s3_object_bastionuserdata.example.com-addons-bootstrap_content
@@ -6,7 +6,7 @@ spec:
   addons:
   - id: k8s-1.16
     manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
-    manifestHash: 4d3502c711eaed1ca62656a95f0d4f101ad8fc5308d1e422caa657aee3dd4d83
+    manifestHash: b8f5c2c8fdbb77fdb4d7efe58346aa31898475e3c9fbe263cdc6522aacfdea05
     name: kops-controller.addons.k8s.io
     needsRollingUpdate: control-plane
     selector:
@@ -34,7 +34,7 @@ spec:
     version: 9.99.0
   - id: k8s-1.12
     manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
-    manifestHash: 7b78d3abc4cfe7acaf7cdbe62b42ebdca5868d180d3fa31448563c3bf606f106
+    manifestHash: 1748a7e24a0fee6e267801b30ffb2d8115908ed56f0855af6d506059ec0f2b8e
     name: dns-controller.addons.k8s.io
     selector:
       k8s-addon: dns-controller.addons.k8s.io

diff --git a/...3_object_bastionuserdata.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content b/...3_object_bastionuserdata.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content
@@ -7,7 +7,7 @@ metadata:
     app.kubernetes.io/managed-by: kops
     k8s-addon: dns-controller.addons.k8s.io
     k8s-app: dns-controller
-    version: v1.25.3
+    version: v1.25.4
   name: dns-controller
   namespace: kube-system
 spec:
@@ -24,7 +24,7 @@ spec:
         k8s-addon: dns-controller.addons.k8s.io
         k8s-app: dns-controller
         kops.k8s.io/managed-by: kops
-        version: v1.25.3
+        version: v1.25.4
     spec:
       affinity:
         nodeAffinity:
@@ -48,7 +48,7 @@ spec:
         env:
         - name: KUBERNETES_SERVICE_HOST
           value: 127.0.0.1
-        image: registry.k8s.io/kops/dns-controller:1.25.3
+        image: registry.k8s.io/kops/dns-controller:1.25.4
         name: dns-controller
         resources:
           requests:

diff --git a/..._object_bastionuserdata.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content b/..._object_bastionuserdata.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content
@@ -23,7 +23,7 @@ metadata:
     app.kubernetes.io/managed-by: kops
     k8s-addon: kops-controller.addons.k8s.io
     k8s-app: kops-controller
-    version: v1.25.3
+    version: v1.25.4
   name: kops-controller
   namespace: kube-system
 spec:
@@ -39,7 +39,7 @@ spec:
         k8s-addon: kops-controller.addons.k8s.io
         k8s-app: kops-controller
         kops.k8s.io/managed-by: kops
-        version: v1.25.3
+        version: v1.25.4
     spec:
       affinity:
         nodeAffinity:
@@ -63,7 +63,7 @@ spec:
         env:
         - name: KUBERNETES_SERVICE_HOST
           value: 127.0.0.1
-        image: registry.k8s.io/kops/kops-controller:1.25.3
+        image: registry.k8s.io/kops/kops-controller:1.25.4
         name: kops-controller
         resources:
           requests:

diff --git a/...ditional_user-data/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content b/...ditional_user-data/data/aws_s3_object_manifests-static-kube-apiserver-healthcheck_content
@@ -8,7 +8,7 @@ spec:
     - --ca-cert=/secrets/ca.crt
     - --client-cert=/secrets/client.crt
     - --client-key=/secrets/client.key
-    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.25.3
+    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.25.4
     livenessProbe:
       httpGet:
         host: 127.0.0.1

diff --git a/...on/update_cluster/complex/data/aws_s3_object_complex.example.com-addons-bootstrap_content b/...on/update_cluster/complex/data/aws_s3_object_complex.example.com-addons-bootstrap_content
@@ -6,7 +6,7 @@ spec:
   addons:
   - id: k8s-1.16
     manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
-    manifestHash: 864baa217f5b77b76812d0c51b0a584f047f6e5e6488bc87fadc0df4553aaee2
+    manifestHash: 5d52d45eba756a15c1b1465992a16e6ab014ca116746d51b8e5b592d771c1496
     name: kops-controller.addons.k8s.io
     needsRollingUpdate: control-plane
     selector:
@@ -41,7 +41,7 @@ spec:
     version: 9.99.0
   - id: k8s-1.12
     manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
-    manifestHash: 7b78d3abc4cfe7acaf7cdbe62b42ebdca5868d180d3fa31448563c3bf606f106
+    manifestHash: 1748a7e24a0fee6e267801b30ffb2d8115908ed56f0855af6d506059ec0f2b8e
     name: dns-controller.addons.k8s.io
     selector:
       k8s-addon: dns-controller.addons.k8s.io