Release 1.28.0-beta.2

johngmyers · Sep 8, 2023 · cefbd5e · cefbd5e
1 parent 71bdada
commit cefbd5e
Show file tree

Hide file tree

Showing 519 changed files with 1,311 additions and 1,311 deletions.
diff --git a/Makefile b/Makefile
@@ -66,16 +66,16 @@ GITSHA := $(shell cd ${KOPS_ROOT}; git describe --always)
 # We lock the versions of our controllers also
 # We need to keep in sync with:
 #   pkg/model/components/etcdmanager/model.go
-KOPS_UTILS_CP_TAG=1.28.0-beta.1
+KOPS_UTILS_CP_TAG=1.28.0-beta.2
 KOPS_UTILS_CP_PUSH_TAG=$(shell tools/get_workspace_status.sh | grep STABLE_KOPS_UTILS_CP_TAG | awk '{print $$2}')
 #   upup/models/cloudup/resources/addons/dns-controller/
-DNS_CONTROLLER_TAG=1.28.0-beta.1
+DNS_CONTROLLER_TAG=1.28.0-beta.2
 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.28.0-beta.1
+KOPS_CONTROLLER_TAG=1.28.0-beta.2
 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.28.0-beta.1
+KUBE_APISERVER_HEALTHCHECK_TAG=1.28.0-beta.2
 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.28.0-beta.1"
-	KOPS_CI_VERSION      = "1.28.0-beta.2"
+	KOPS_RELEASE_VERSION = "1.28.0-beta.2"
+	KOPS_CI_VERSION      = "1.28.0-beta.3"
 )
 
 // GitVersion should be replaced by the makefile

diff --git a/pkg/model/components/etcdmanager/model.go b/pkg/model/components/etcdmanager/model.go
@@ -208,7 +208,7 @@ spec:
     emptyDir: {}
 `
 
-const kopsUtilsImage = "registry.k8s.io/kops/kops-utils-cp:1.28.0-beta.1"
+const kopsUtilsImage = "registry.k8s.io/kops/kops-utils-cp:1.28.0-beta.2"
 
 // buildPod creates the pod spec, based on the EtcdClusterSpec
 func (b *EtcdManagerBuilder) buildPod(etcdCluster kops.EtcdClusterSpec, instanceGroupName string) (*v1.Pod, error) {

diff --git a/pkg/model/components/etcdmanager/tests/interval/tasks.yaml b/pkg/model/components/etcdmanager/tests/interval/tasks.yaml
@@ -113,7 +113,7 @@ Contents: |
       - --src=/ko-app/kops-utils-cp
       command:
       - /ko-app/kops-utils-cp
-      image: registry.k8s.io/kops/kops-utils-cp:1.28.0-beta.1
+      image: registry.k8s.io/kops/kops-utils-cp:1.28.0-beta.2
       name: kops-utils-cp
       resources: {}
       volumeMounts:
@@ -150,7 +150,7 @@ Contents: |
       - --src=/opt/etcd-v3.4.13/etcdctl
       command:
       - /opt/kops-utils/kops-utils-cp
-      image: registry.k8s.io/kops/kops-utils-cp:1.28.0-beta.1
+      image: registry.k8s.io/kops/kops-utils-cp:1.28.0-beta.2
       name: init-etcd-symlinks-3-4-13
       resources: {}
       volumeMounts:
@@ -168,7 +168,7 @@ Contents: |
       - --src=/opt/etcd-v3.5.9/etcdctl
       command:
       - /opt/kops-utils/kops-utils-cp
-      image: registry.k8s.io/kops/kops-utils-cp:1.28.0-beta.1
+      image: registry.k8s.io/kops/kops-utils-cp:1.28.0-beta.2
       name: init-etcd-symlinks-3-5-9
       resources: {}
       volumeMounts:
@@ -253,7 +253,7 @@ Contents: |
       - --src=/ko-app/kops-utils-cp
       command:
       - /ko-app/kops-utils-cp
-      image: registry.k8s.io/kops/kops-utils-cp:1.28.0-beta.1
+      image: registry.k8s.io/kops/kops-utils-cp:1.28.0-beta.2
       name: kops-utils-cp
       resources: {}
       volumeMounts:
@@ -290,7 +290,7 @@ Contents: |
       - --src=/opt/etcd-v3.4.13/etcdctl
       command:
       - /opt/kops-utils/kops-utils-cp
-      image: registry.k8s.io/kops/kops-utils-cp:1.28.0-beta.1
+      image: registry.k8s.io/kops/kops-utils-cp:1.28.0-beta.2
       name: init-etcd-symlinks-3-4-13
       resources: {}
       volumeMounts:
@@ -308,7 +308,7 @@ Contents: |
       - --src=/opt/etcd-v3.5.9/etcdctl
       command:
       - /opt/kops-utils/kops-utils-cp
-      image: registry.k8s.io/kops/kops-utils-cp:1.28.0-beta.1
+      image: registry.k8s.io/kops/kops-utils-cp:1.28.0-beta.2
       name: init-etcd-symlinks-3-5-9
       resources: {}
       volumeMounts:

diff --git a/pkg/model/components/etcdmanager/tests/minimal/tasks.yaml b/pkg/model/components/etcdmanager/tests/minimal/tasks.yaml
@@ -112,7 +112,7 @@ Contents: |
       - --src=/ko-app/kops-utils-cp
       command:
       - /ko-app/kops-utils-cp
-      image: registry.k8s.io/kops/kops-utils-cp:1.28.0-beta.1
+      image: registry.k8s.io/kops/kops-utils-cp:1.28.0-beta.2
       name: kops-utils-cp
       resources: {}
       volumeMounts:
@@ -149,7 +149,7 @@ Contents: |
       - --src=/opt/etcd-v3.4.13/etcdctl
       command:
       - /opt/kops-utils/kops-utils-cp
-      image: registry.k8s.io/kops/kops-utils-cp:1.28.0-beta.1
+      image: registry.k8s.io/kops/kops-utils-cp:1.28.0-beta.2
       name: init-etcd-symlinks-3-4-13
       resources: {}
       volumeMounts:
@@ -167,7 +167,7 @@ Contents: |
       - --src=/opt/etcd-v3.5.9/etcdctl
       command:
       - /opt/kops-utils/kops-utils-cp
-      image: registry.k8s.io/kops/kops-utils-cp:1.28.0-beta.1
+      image: registry.k8s.io/kops/kops-utils-cp:1.28.0-beta.2
       name: init-etcd-symlinks-3-5-9
       resources: {}
       volumeMounts:
@@ -251,7 +251,7 @@ Contents: |
       - --src=/ko-app/kops-utils-cp
       command:
       - /ko-app/kops-utils-cp
-      image: registry.k8s.io/kops/kops-utils-cp:1.28.0-beta.1
+      image: registry.k8s.io/kops/kops-utils-cp:1.28.0-beta.2
       name: kops-utils-cp
       resources: {}
       volumeMounts:
@@ -288,7 +288,7 @@ Contents: |
       - --src=/opt/etcd-v3.4.13/etcdctl
       command:
       - /opt/kops-utils/kops-utils-cp
-      image: registry.k8s.io/kops/kops-utils-cp:1.28.0-beta.1
+      image: registry.k8s.io/kops/kops-utils-cp:1.28.0-beta.2
       name: init-etcd-symlinks-3-4-13
       resources: {}
       volumeMounts:
@@ -306,7 +306,7 @@ Contents: |
       - --src=/opt/etcd-v3.5.9/etcdctl
       command:
       - /opt/kops-utils/kops-utils-cp
-      image: registry.k8s.io/kops/kops-utils-cp:1.28.0-beta.1
+      image: registry.k8s.io/kops/kops-utils-cp:1.28.0-beta.2
       name: init-etcd-symlinks-3-5-9
       resources: {}
       volumeMounts:

diff --git a/pkg/model/components/etcdmanager/tests/overwrite_settings/tasks.yaml b/pkg/model/components/etcdmanager/tests/overwrite_settings/tasks.yaml
@@ -115,7 +115,7 @@ Contents: |
       - --src=/ko-app/kops-utils-cp
       command:
       - /ko-app/kops-utils-cp
-      image: registry.k8s.io/kops/kops-utils-cp:1.28.0-beta.1
+      image: registry.k8s.io/kops/kops-utils-cp:1.28.0-beta.2
       name: kops-utils-cp
       resources: {}
       volumeMounts:
@@ -152,7 +152,7 @@ Contents: |
       - --src=/opt/etcd-v3.4.13/etcdctl
       command:
       - /opt/kops-utils/kops-utils-cp
-      image: registry.k8s.io/kops/kops-utils-cp:1.28.0-beta.1
+      image: registry.k8s.io/kops/kops-utils-cp:1.28.0-beta.2
       name: init-etcd-symlinks-3-4-13
       resources: {}
       volumeMounts:
@@ -170,7 +170,7 @@ Contents: |
       - --src=/opt/etcd-v3.5.9/etcdctl
       command:
       - /opt/kops-utils/kops-utils-cp
-      image: registry.k8s.io/kops/kops-utils-cp:1.28.0-beta.1
+      image: registry.k8s.io/kops/kops-utils-cp:1.28.0-beta.2
       name: init-etcd-symlinks-3-5-9
       resources: {}
       volumeMounts:
@@ -257,7 +257,7 @@ Contents: |
       - --src=/ko-app/kops-utils-cp
       command:
       - /ko-app/kops-utils-cp
-      image: registry.k8s.io/kops/kops-utils-cp:1.28.0-beta.1
+      image: registry.k8s.io/kops/kops-utils-cp:1.28.0-beta.2
       name: kops-utils-cp
       resources: {}
       volumeMounts:
@@ -294,7 +294,7 @@ Contents: |
       - --src=/opt/etcd-v3.4.13/etcdctl
       command:
       - /opt/kops-utils/kops-utils-cp
-      image: registry.k8s.io/kops/kops-utils-cp:1.28.0-beta.1
+      image: registry.k8s.io/kops/kops-utils-cp:1.28.0-beta.2
       name: init-etcd-symlinks-3-4-13
       resources: {}
       volumeMounts:
@@ -312,7 +312,7 @@ Contents: |
       - --src=/opt/etcd-v3.5.9/etcdctl
       command:
       - /opt/kops-utils/kops-utils-cp
-      image: registry.k8s.io/kops/kops-utils-cp:1.28.0-beta.1
+      image: registry.k8s.io/kops/kops-utils-cp:1.28.0-beta.2
       name: init-etcd-symlinks-3-5-9
       resources: {}
       volumeMounts:

diff --git a/pkg/model/components/etcdmanager/tests/proxy/tasks.yaml b/pkg/model/components/etcdmanager/tests/proxy/tasks.yaml
@@ -121,7 +121,7 @@ Contents: |
       - --src=/ko-app/kops-utils-cp
       command:
       - /ko-app/kops-utils-cp
-      image: registry.k8s.io/kops/kops-utils-cp:1.28.0-beta.1
+      image: registry.k8s.io/kops/kops-utils-cp:1.28.0-beta.2
       name: kops-utils-cp
       resources: {}
       volumeMounts:
@@ -158,7 +158,7 @@ Contents: |
       - --src=/opt/etcd-v3.4.13/etcdctl
       command:
       - /opt/kops-utils/kops-utils-cp
-      image: registry.k8s.io/kops/kops-utils-cp:1.28.0-beta.1
+      image: registry.k8s.io/kops/kops-utils-cp:1.28.0-beta.2
       name: init-etcd-symlinks-3-4-13
       resources: {}
       volumeMounts:
@@ -176,7 +176,7 @@ Contents: |
       - --src=/opt/etcd-v3.5.9/etcdctl
       command:
       - /opt/kops-utils/kops-utils-cp
-      image: registry.k8s.io/kops/kops-utils-cp:1.28.0-beta.1
+      image: registry.k8s.io/kops/kops-utils-cp:1.28.0-beta.2
       name: init-etcd-symlinks-3-5-9
       resources: {}
       volumeMounts:
@@ -269,7 +269,7 @@ Contents: |
       - --src=/ko-app/kops-utils-cp
       command:
       - /ko-app/kops-utils-cp
-      image: registry.k8s.io/kops/kops-utils-cp:1.28.0-beta.1
+      image: registry.k8s.io/kops/kops-utils-cp:1.28.0-beta.2
       name: kops-utils-cp
       resources: {}
       volumeMounts:
@@ -306,7 +306,7 @@ Contents: |
       - --src=/opt/etcd-v3.4.13/etcdctl
       command:
       - /opt/kops-utils/kops-utils-cp
-      image: registry.k8s.io/kops/kops-utils-cp:1.28.0-beta.1
+      image: registry.k8s.io/kops/kops-utils-cp:1.28.0-beta.2
       name: init-etcd-symlinks-3-4-13
       resources: {}
       volumeMounts:
@@ -324,7 +324,7 @@ Contents: |
       - --src=/opt/etcd-v3.5.9/etcdctl
       command:
       - /opt/kops-utils/kops-utils-cp
-      image: registry.k8s.io/kops/kops-utils-cp:1.28.0-beta.1
+      image: registry.k8s.io/kops/kops-utils-cp:1.28.0-beta.2
       name: init-etcd-symlinks-3-5-9
       resources: {}
       volumeMounts:

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.28.0-beta.1
+    image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.28.0-beta.2
     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.28.0-beta.1
+      image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.28.0-beta.2
       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: 62098b67f26f65e4854878cf8a1240c65f27a6b0fec47e0fca7306c91bd444eb
+    manifestHash: 127c11bdc7b160274f1ceb554b187399dad9c9e9ada9d89ad4fc11c5d71483aa
     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: 6a53ff5981ed3e3f32dd2825f74368cc803f7dca498c1b7c5684ef4ada1c23d0
+    manifestHash: 9f1aaec31049e4a45eedf81c723ab718de749b0e75710fb0e01e8f988d59826d
     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.28.0-beta.1
+    version: v1.28.0-beta.2
   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.28.0-beta.1
+        version: v1.28.0-beta.2
     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.28.0-beta.1
+        image: registry.k8s.io/kops/dns-controller:1.28.0-beta.2
         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.28.0-beta.1
+    version: v1.28.0-beta.2
   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.28.0-beta.1
+        version: v1.28.0-beta.2
     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.28.0-beta.1
+        image: registry.k8s.io/kops/kops-controller:1.28.0-beta.2
         name: kops-controller
         resources:
           requests:

diff --git a/...ditionalobjects/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/...ditionalobjects/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
@@ -49,7 +49,7 @@ spec:
     - --src=/ko-app/kops-utils-cp
     command:
     - /ko-app/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-beta.2
     name: kops-utils-cp
     resources: {}
     volumeMounts:
@@ -86,7 +86,7 @@ spec:
     - --src=/opt/etcd-v3.4.13/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-beta.2
     name: init-etcd-symlinks-3-4-13
     resources: {}
     volumeMounts:
@@ -104,7 +104,7 @@ spec:
     - --src=/opt/etcd-v3.5.9/etcdctl
     command:
     - /opt/kops-utils/kops-utils-cp
-    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-beta.1
+    image: registry.k8s.io/kops/kops-utils-cp:1.28.0-beta.2
     name: init-etcd-symlinks-3-5-9
     resources: {}
     volumeMounts: