Release 1.26.4 (#15511)

kubernetes · Jun 17, 2023 · 165ad24 · 165ad24
1 parent 9f2d31d
commit 165ad24
Show file tree

Hide file tree

Showing 330 changed files with 735 additions and 735 deletions.
diff --git a/Makefile b/Makefile
@@ -66,13 +66,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.26.3
+DNS_CONTROLLER_TAG=1.26.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.26.3
+KOPS_CONTROLLER_TAG=1.26.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.26.3
+KUBE_APISERVER_HEALTHCHECK_TAG=1.26.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.26.3"
-	KOPS_CI_VERSION      = "1.26.4"
+	KOPS_RELEASE_VERSION = "1.26.4"
+	KOPS_CI_VERSION      = "1.26.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.26.3
+    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.26.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.26.3
+      image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.26.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: e99c3e18c20da07a60c9fd9fdc7f906eca58cbc8d0bced8da4cf4838926c6a28
+    manifestHash: 41a0101c2f27574e62e3c45045c8a0aa43cb95178eef2675f9b7978d1d701e85
     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: 0b82a6e20f5e8595f3ea0d28d819f65ac1f3be6ebacf63e6d905f3e3fbe76d41
+    manifestHash: a0c3a4d33a8d31ced5fd988832d46cffeab1868141e0ba39987eb4292a1f46d4
     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.26.3
+    version: v1.26.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.26.3
+        version: v1.26.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.26.3
+        image: registry.k8s.io/kops/dns-controller:1.26.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.26.3
+    version: v1.26.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.26.3
+        version: v1.26.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.26.3
+        image: registry.k8s.io/kops/kops-controller:1.26.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.26.3
+    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.26.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.26.3
+    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.26.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: 3355d4a94aeff3f98805729e732b799ee42ddf0e69b3d80e466e9d625d7f6219
+    manifestHash: b971c4256218398d555315c11588a7947d09172485a375bc52b70f4f34c69483
     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: 0b82a6e20f5e8595f3ea0d28d819f65ac1f3be6ebacf63e6d905f3e3fbe76d41
+    manifestHash: a0c3a4d33a8d31ced5fd988832d46cffeab1868141e0ba39987eb4292a1f46d4
     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.26.3
+    version: v1.26.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.26.3
+        version: v1.26.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.26.3
+        image: registry.k8s.io/kops/dns-controller:1.26.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.26.3
+    version: v1.26.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.26.3
+        version: v1.26.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.26.3
+        image: registry.k8s.io/kops/kops-controller:1.26.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.26.3
+    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.26.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: dffa8df67c179f2d588f60dd2ec22c3e739d9bd6ed0e8f0c66e233455825a08d
+    manifestHash: c4462497821d946ecf9b306986b63db769be701462f9fc6d8778bad6958a3e7b
     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: 8cb40d6176cc5ee2dab8eda130d32210c4ad06946aeeac56ebcec9e8a9948d04
+    manifestHash: c19d7d2dd82e8bc90e16bbdec8580af62e777a5cf9a294e50afb97909fdfd8da
     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.26.3
+    version: v1.26.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.26.3
+        version: v1.26.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.26.3
+        image: registry.k8s.io/kops/dns-controller:1.26.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.26.3
+    version: v1.26.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.26.3
+        version: v1.26.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.26.3
+        image: registry.k8s.io/kops/kops-controller:1.26.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: 0fda46ebdd2aa7d60f01f44b9b6f85c71f60dd3d8bf44a484503da447927d115
+    manifestHash: 61711d34b3048f8e7cf2a5829521ca8a58e82bdb3d972fb565efcc1d6cb12d5d
     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: 0b82a6e20f5e8595f3ea0d28d819f65ac1f3be6ebacf63e6d905f3e3fbe76d41
+    manifestHash: a0c3a4d33a8d31ced5fd988832d46cffeab1868141e0ba39987eb4292a1f46d4
     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.26.3
+    version: v1.26.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.26.3
+        version: v1.26.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.26.3
+        image: registry.k8s.io/kops/dns-controller:1.26.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.26.3
+    version: v1.26.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.26.3
+        version: v1.26.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.26.3
+        image: registry.k8s.io/kops/kops-controller:1.26.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.26.3
+    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.26.4
     livenessProbe:
       httpGet:
         host: 127.0.0.1

diff --git a/...stom/data/aws_s3_object_cas-priority-expander-custom.example.com-addons-bootstrap_content b/...stom/data/aws_s3_object_cas-priority-expander-custom.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: 9ce40782d388a4a5a18e077ddb3712eab38b10df3d513e2d0e2b361062dcd5be
+    manifestHash: f768ebc72a9b39649bfbdbcdc65a11de28c341afb69e16ef23d83a60506c9dd6
     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: 0b82a6e20f5e8595f3ea0d28d819f65ac1f3be6ebacf63e6d905f3e3fbe76d41
+    manifestHash: a0c3a4d33a8d31ced5fd988832d46cffeab1868141e0ba39987eb4292a1f46d4
     name: dns-controller.addons.k8s.io
     selector:
       k8s-addon: dns-controller.addons.k8s.io