diff --git a/Makefile b/Makefile index c9df1609cff5f..e75b3e312f2c9 100644 --- a/Makefile +++ b/Makefile @@ -64,13 +64,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.22.0-beta.1 +DNS_CONTROLLER_TAG=1.22.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.22.0-beta.1 +KOPS_CONTROLLER_TAG=1.22.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.22.0-beta.1 +KUBE_APISERVER_HEALTHCHECK_TAG=1.22.0-beta.2 KUBE_APISERVER_HEALTHCHECK_PUSH_TAG=$(shell tools/get_workspace_status.sh | grep STABLE_KUBE_APISERVER_HEALTHCHECK_TAG | awk '{print $$2}') diff --git a/pkg/model/components/kubeapiserver/model.go b/pkg/model/components/kubeapiserver/model.go index 24dadbffdce52..49fb0feb0e897 100644 --- 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: k8s.gcr.io/kops/kube-apiserver-healthcheck:1.22.0-beta.1 + image: k8s.gcr.io/kops/kube-apiserver-healthcheck:1.22.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 index 8399fc6946916..dc44c370885ed 100644 --- a/pkg/model/components/kubeapiserver/tests/minimal/tasks.yaml +++ b/pkg/model/components/kubeapiserver/tests/minimal/tasks.yaml @@ -12,7 +12,7 @@ Contents: | - --client-key=/secrets/client.key command: - /kube-apiserver-healthcheck - image: k8s.gcr.io/kops/kube-apiserver-healthcheck:1.22.0-beta.1 + image: k8s.gcr.io/kops/kube-apiserver-healthcheck:1.22.0-beta.2 livenessProbe: httpGet: host: 127.0.0.1 diff --git a/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content b/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content index 4db818f31aaf6..c8ce8405ba0b6 100644 --- a/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content +++ b/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content @@ -10,7 +10,7 @@ spec: - --client-key=/secrets/client.key command: - /kube-apiserver-healthcheck - image: k8s.gcr.io/kops/kube-apiserver-healthcheck:1.22.0-beta.1 + image: k8s.gcr.io/kops/kube-apiserver-healthcheck:1.22.0-beta.2 livenessProbe: httpGet: host: 127.0.0.1 diff --git a/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_bucket_object_minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_bucket_object_minimal.example.com-addons-bootstrap_content index c79b61c2193aa..f10c9a3e807ad 100644 --- a/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_bucket_object_minimal.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_bucket_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: a42582d604eb0c80c96d6e52fb9c4dd9d5aa09a54437b017ff1c0d2fc41a1793 + manifestHash: dcf0336d3677bfaac81529e17263ff30dd37276592d8329027ef4815ac6973c8 name: kops-controller.addons.k8s.io needsRollingUpdate: control-plane selector: @@ -40,7 +40,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml - manifestHash: 6de1dca5e9fd89b3781f632bf74aee0a67d0416ca236ecc69811b39acb475271 + manifestHash: b4524ab5361fe3df3ff58ddd183178056077f16989efe551b1ddbeb7dd3ba9a0 name: dns-controller.addons.k8s.io selector: k8s-addon: dns-controller.addons.k8s.io diff --git a/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_bucket_object_minimal.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_bucket_object_minimal.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content index d78d808a72655..7ec7be1ce62af 100644 --- a/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_bucket_object_minimal.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content +++ b/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_bucket_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.22.0-beta.1 + version: v1.22.0-beta.2 name: dns-controller namespace: kube-system spec: @@ -24,7 +24,7 @@ spec: labels: k8s-addon: dns-controller.addons.k8s.io k8s-app: dns-controller - version: v1.22.0-beta.1 + version: v1.22.0-beta.2 spec: containers: - command: @@ -41,7 +41,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: k8s.gcr.io/kops/dns-controller:1.22.0-beta.1 + image: k8s.gcr.io/kops/dns-controller:1.22.0-beta.2 name: dns-controller resources: requests: diff --git a/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_bucket_object_minimal.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content b/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_bucket_object_minimal.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content index b01e7a070b03d..f9e213909c931 100644 --- a/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_bucket_object_minimal.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content +++ b/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_bucket_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.22.0-beta.1 + version: v1.22.0-beta.2 name: kops-controller namespace: kube-system spec: @@ -37,7 +37,7 @@ spec: labels: k8s-addon: kops-controller.addons.k8s.io k8s-app: kops-controller - version: v1.22.0-beta.1 + version: v1.22.0-beta.2 spec: containers: - command: @@ -47,7 +47,7 @@ spec: env: - name: KUBERNETES_SERVICE_HOST value: 127.0.0.1 - image: k8s.gcr.io/kops/kops-controller:1.22.0-beta.1 + image: k8s.gcr.io/kops/kops-controller:1.22.0-beta.2 name: kops-controller resources: requests: diff --git a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_bucket_object_bastionuserdata.example.com-addons-bootstrap_content b/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_bucket_object_bastionuserdata.example.com-addons-bootstrap_content index 39101aaddaa18..7df0d65018228 100644 --- a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_bucket_object_bastionuserdata.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_bucket_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: f2c9b0504bb2f4d41b2f4c9b2e724ce29796e1b471a1c8b735792081e8542d45 + manifestHash: 94bed75e9c3349e4b530e86f291a61a25ac7f16934970dca38120ca5c7e2a153 name: kops-controller.addons.k8s.io needsRollingUpdate: control-plane selector: @@ -40,7 +40,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml - manifestHash: 7934f73e3a3e56972beeb971f6cb30c5479cb97a6917a1d5c1628b06642ebc2a + manifestHash: b1403524d1d9689e27a40cd661cb856a273684f8a1e8bed3cfb71eb80945b4e8 name: dns-controller.addons.k8s.io selector: k8s-addon: dns-controller.addons.k8s.io diff --git a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_bucket_object_bastionuserdata.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_bucket_object_bastionuserdata.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content index f510c6b61f416..33dbb652090bd 100644 --- a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_bucket_object_bastionuserdata.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content +++ b/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_bucket_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.22.0-beta.1 + version: v1.22.0-beta.2 name: dns-controller namespace: kube-system spec: @@ -24,7 +24,7 @@ spec: labels: k8s-addon: dns-controller.addons.k8s.io k8s-app: dns-controller - version: v1.22.0-beta.1 + version: v1.22.0-beta.2 spec: containers: - command: @@ -37,7 +37,7 @@ spec: env: - name: KUBERNETES_SERVICE_HOST value: 127.0.0.1 - image: k8s.gcr.io/kops/dns-controller:1.22.0-beta.1 + image: k8s.gcr.io/kops/dns-controller:1.22.0-beta.2 name: dns-controller resources: requests: diff --git a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_bucket_object_bastionuserdata.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content b/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_bucket_object_bastionuserdata.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content index f2ecaad62917f..1e5b2a0b8a0ba 100644 --- a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_bucket_object_bastionuserdata.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content +++ b/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_bucket_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.22.0-beta.1 + version: v1.22.0-beta.2 name: kops-controller namespace: kube-system spec: @@ -37,7 +37,7 @@ spec: labels: k8s-addon: kops-controller.addons.k8s.io k8s-app: kops-controller - version: v1.22.0-beta.1 + version: v1.22.0-beta.2 spec: containers: - command: @@ -47,7 +47,7 @@ spec: env: - name: KUBERNETES_SERVICE_HOST value: 127.0.0.1 - image: k8s.gcr.io/kops/kops-controller:1.22.0-beta.1 + image: k8s.gcr.io/kops/kops-controller:1.22.0-beta.2 name: kops-controller resources: requests: diff --git a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content b/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content index 4db818f31aaf6..c8ce8405ba0b6 100644 --- a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content +++ b/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content @@ -10,7 +10,7 @@ spec: - --client-key=/secrets/client.key command: - /kube-apiserver-healthcheck - image: k8s.gcr.io/kops/kube-apiserver-healthcheck:1.22.0-beta.1 + image: k8s.gcr.io/kops/kube-apiserver-healthcheck:1.22.0-beta.2 livenessProbe: httpGet: host: 127.0.0.1 diff --git a/tests/integration/update_cluster/complex/data/aws_s3_bucket_object_complex.example.com-addons-bootstrap_content b/tests/integration/update_cluster/complex/data/aws_s3_bucket_object_complex.example.com-addons-bootstrap_content index 25b76bb14f2cc..a58d240556709 100644 --- a/tests/integration/update_cluster/complex/data/aws_s3_bucket_object_complex.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/complex/data/aws_s3_bucket_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: 7c16913e664b7d72e87d3a306bb3ed4be1cbd5d7018fcfeb3b382cc85be20572 + manifestHash: 8a244779bf382c65e026f663b4c166b0f7d4bdbfd8ecf06d8248690a1a2af189 name: kops-controller.addons.k8s.io needsRollingUpdate: control-plane selector: @@ -40,7 +40,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml - manifestHash: 7934f73e3a3e56972beeb971f6cb30c5479cb97a6917a1d5c1628b06642ebc2a + manifestHash: b1403524d1d9689e27a40cd661cb856a273684f8a1e8bed3cfb71eb80945b4e8 name: dns-controller.addons.k8s.io selector: k8s-addon: dns-controller.addons.k8s.io diff --git a/tests/integration/update_cluster/complex/data/aws_s3_bucket_object_complex.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/complex/data/aws_s3_bucket_object_complex.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content index f510c6b61f416..33dbb652090bd 100644 --- a/tests/integration/update_cluster/complex/data/aws_s3_bucket_object_complex.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content +++ b/tests/integration/update_cluster/complex/data/aws_s3_bucket_object_complex.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.22.0-beta.1 + version: v1.22.0-beta.2 name: dns-controller namespace: kube-system spec: @@ -24,7 +24,7 @@ spec: labels: k8s-addon: dns-controller.addons.k8s.io k8s-app: dns-controller - version: v1.22.0-beta.1 + version: v1.22.0-beta.2 spec: containers: - command: @@ -37,7 +37,7 @@ spec: env: - name: KUBERNETES_SERVICE_HOST value: 127.0.0.1 - image: k8s.gcr.io/kops/dns-controller:1.22.0-beta.1 + image: k8s.gcr.io/kops/dns-controller:1.22.0-beta.2 name: dns-controller resources: requests: diff --git a/tests/integration/update_cluster/complex/data/aws_s3_bucket_object_complex.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content b/tests/integration/update_cluster/complex/data/aws_s3_bucket_object_complex.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content index f5d67d0268181..93dab2dcaaa50 100644 --- a/tests/integration/update_cluster/complex/data/aws_s3_bucket_object_complex.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content +++ b/tests/integration/update_cluster/complex/data/aws_s3_bucket_object_complex.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.22.0-beta.1 + version: v1.22.0-beta.2 name: kops-controller namespace: kube-system spec: @@ -37,7 +37,7 @@ spec: labels: k8s-addon: kops-controller.addons.k8s.io k8s-app: kops-controller - version: v1.22.0-beta.1 + version: v1.22.0-beta.2 spec: containers: - command: @@ -47,7 +47,7 @@ spec: env: - name: KUBERNETES_SERVICE_HOST value: 127.0.0.1 - image: k8s.gcr.io/kops/kops-controller:1.22.0-beta.1 + image: k8s.gcr.io/kops/kops-controller:1.22.0-beta.2 name: kops-controller resources: requests: diff --git a/tests/integration/update_cluster/complex/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content b/tests/integration/update_cluster/complex/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content index 4db818f31aaf6..c8ce8405ba0b6 100644 --- a/tests/integration/update_cluster/complex/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content +++ b/tests/integration/update_cluster/complex/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content @@ -10,7 +10,7 @@ spec: - --client-key=/secrets/client.key command: - /kube-apiserver-healthcheck - image: k8s.gcr.io/kops/kube-apiserver-healthcheck:1.22.0-beta.1 + image: k8s.gcr.io/kops/kube-apiserver-healthcheck:1.22.0-beta.2 livenessProbe: httpGet: host: 127.0.0.1 diff --git a/tests/integration/update_cluster/compress/data/aws_s3_bucket_object_compress.example.com-addons-bootstrap_content b/tests/integration/update_cluster/compress/data/aws_s3_bucket_object_compress.example.com-addons-bootstrap_content index 4ebe3fb2d9b9b..26c3c7f9b0e01 100644 --- a/tests/integration/update_cluster/compress/data/aws_s3_bucket_object_compress.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/compress/data/aws_s3_bucket_object_compress.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: 72c5e40d4a3d0fba1f89372594b3d58a422af0b2767e58e3d92013e06a03fbce + manifestHash: fc60bdf20bdd5a427b00050f2b19a086f1f8dce8669f1d9b81e37754b71b320c name: kops-controller.addons.k8s.io needsRollingUpdate: control-plane selector: @@ -40,7 +40,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml - manifestHash: 7934f73e3a3e56972beeb971f6cb30c5479cb97a6917a1d5c1628b06642ebc2a + manifestHash: b1403524d1d9689e27a40cd661cb856a273684f8a1e8bed3cfb71eb80945b4e8 name: dns-controller.addons.k8s.io selector: k8s-addon: dns-controller.addons.k8s.io diff --git a/tests/integration/update_cluster/compress/data/aws_s3_bucket_object_compress.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/compress/data/aws_s3_bucket_object_compress.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content index f510c6b61f416..33dbb652090bd 100644 --- a/tests/integration/update_cluster/compress/data/aws_s3_bucket_object_compress.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content +++ b/tests/integration/update_cluster/compress/data/aws_s3_bucket_object_compress.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.22.0-beta.1 + version: v1.22.0-beta.2 name: dns-controller namespace: kube-system spec: @@ -24,7 +24,7 @@ spec: labels: k8s-addon: dns-controller.addons.k8s.io k8s-app: dns-controller - version: v1.22.0-beta.1 + version: v1.22.0-beta.2 spec: containers: - command: @@ -37,7 +37,7 @@ spec: env: - name: KUBERNETES_SERVICE_HOST value: 127.0.0.1 - image: k8s.gcr.io/kops/dns-controller:1.22.0-beta.1 + image: k8s.gcr.io/kops/dns-controller:1.22.0-beta.2 name: dns-controller resources: requests: diff --git a/tests/integration/update_cluster/compress/data/aws_s3_bucket_object_compress.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content b/tests/integration/update_cluster/compress/data/aws_s3_bucket_object_compress.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content index 184f8a8e2c2b0..2c290e507ec46 100644 --- a/tests/integration/update_cluster/compress/data/aws_s3_bucket_object_compress.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content +++ b/tests/integration/update_cluster/compress/data/aws_s3_bucket_object_compress.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.22.0-beta.1 + version: v1.22.0-beta.2 name: kops-controller namespace: kube-system spec: @@ -37,7 +37,7 @@ spec: labels: k8s-addon: kops-controller.addons.k8s.io k8s-app: kops-controller - version: v1.22.0-beta.1 + version: v1.22.0-beta.2 spec: containers: - command: @@ -47,7 +47,7 @@ spec: env: - name: KUBERNETES_SERVICE_HOST value: 127.0.0.1 - image: k8s.gcr.io/kops/kops-controller:1.22.0-beta.1 + image: k8s.gcr.io/kops/kops-controller:1.22.0-beta.2 name: kops-controller resources: requests: diff --git a/tests/integration/update_cluster/compress/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content b/tests/integration/update_cluster/compress/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content index 4db818f31aaf6..c8ce8405ba0b6 100644 --- a/tests/integration/update_cluster/compress/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content +++ b/tests/integration/update_cluster/compress/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content @@ -10,7 +10,7 @@ spec: - --client-key=/secrets/client.key command: - /kube-apiserver-healthcheck - image: k8s.gcr.io/kops/kube-apiserver-healthcheck:1.22.0-beta.1 + image: k8s.gcr.io/kops/kube-apiserver-healthcheck:1.22.0-beta.2 livenessProbe: httpGet: host: 127.0.0.1 diff --git a/tests/integration/update_cluster/digit/data/aws_s3_bucket_object_123.example.com-addons-bootstrap_content b/tests/integration/update_cluster/digit/data/aws_s3_bucket_object_123.example.com-addons-bootstrap_content index 785dfee0755bb..b214577789e28 100644 --- a/tests/integration/update_cluster/digit/data/aws_s3_bucket_object_123.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/digit/data/aws_s3_bucket_object_123.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: 66dd7a9201516a116851ebe8b1933502971eb583d1650ae916574b673ec55d4e + manifestHash: 620f80356912074640ea2e43ada1cdf61aa1e1969b9c32f5a4c94c6d8e808acd name: kops-controller.addons.k8s.io needsRollingUpdate: control-plane selector: @@ -40,7 +40,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml - manifestHash: 7934f73e3a3e56972beeb971f6cb30c5479cb97a6917a1d5c1628b06642ebc2a + manifestHash: b1403524d1d9689e27a40cd661cb856a273684f8a1e8bed3cfb71eb80945b4e8 name: dns-controller.addons.k8s.io selector: k8s-addon: dns-controller.addons.k8s.io diff --git a/tests/integration/update_cluster/digit/data/aws_s3_bucket_object_123.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/digit/data/aws_s3_bucket_object_123.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content index f510c6b61f416..33dbb652090bd 100644 --- a/tests/integration/update_cluster/digit/data/aws_s3_bucket_object_123.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content +++ b/tests/integration/update_cluster/digit/data/aws_s3_bucket_object_123.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.22.0-beta.1 + version: v1.22.0-beta.2 name: dns-controller namespace: kube-system spec: @@ -24,7 +24,7 @@ spec: labels: k8s-addon: dns-controller.addons.k8s.io k8s-app: dns-controller - version: v1.22.0-beta.1 + version: v1.22.0-beta.2 spec: containers: - command: @@ -37,7 +37,7 @@ spec: env: - name: KUBERNETES_SERVICE_HOST value: 127.0.0.1 - image: k8s.gcr.io/kops/dns-controller:1.22.0-beta.1 + image: k8s.gcr.io/kops/dns-controller:1.22.0-beta.2 name: dns-controller resources: requests: diff --git a/tests/integration/update_cluster/digit/data/aws_s3_bucket_object_123.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content b/tests/integration/update_cluster/digit/data/aws_s3_bucket_object_123.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content index 5252ee439e8e5..5120e950d6bf5 100644 --- a/tests/integration/update_cluster/digit/data/aws_s3_bucket_object_123.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content +++ b/tests/integration/update_cluster/digit/data/aws_s3_bucket_object_123.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.22.0-beta.1 + version: v1.22.0-beta.2 name: kops-controller namespace: kube-system spec: @@ -37,7 +37,7 @@ spec: labels: k8s-addon: kops-controller.addons.k8s.io k8s-app: kops-controller - version: v1.22.0-beta.1 + version: v1.22.0-beta.2 spec: containers: - command: @@ -47,7 +47,7 @@ spec: env: - name: KUBERNETES_SERVICE_HOST value: 127.0.0.1 - image: k8s.gcr.io/kops/kops-controller:1.22.0-beta.1 + image: k8s.gcr.io/kops/kops-controller:1.22.0-beta.2 name: kops-controller resources: requests: diff --git a/tests/integration/update_cluster/digit/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content b/tests/integration/update_cluster/digit/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content index 4db818f31aaf6..c8ce8405ba0b6 100644 --- a/tests/integration/update_cluster/digit/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content +++ b/tests/integration/update_cluster/digit/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content @@ -10,7 +10,7 @@ spec: - --client-key=/secrets/client.key command: - /kube-apiserver-healthcheck - image: k8s.gcr.io/kops/kube-apiserver-healthcheck:1.22.0-beta.1 + image: k8s.gcr.io/kops/kube-apiserver-healthcheck:1.22.0-beta.2 livenessProbe: httpGet: host: 127.0.0.1 diff --git a/tests/integration/update_cluster/existing_iam/data/aws_s3_bucket_object_existing-iam.example.com-addons-bootstrap_content b/tests/integration/update_cluster/existing_iam/data/aws_s3_bucket_object_existing-iam.example.com-addons-bootstrap_content index da3515d562f9f..ce499f66c009b 100644 --- a/tests/integration/update_cluster/existing_iam/data/aws_s3_bucket_object_existing-iam.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/existing_iam/data/aws_s3_bucket_object_existing-iam.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: e5682f16e0e31899a53291d9d9fe2f1ed0d4103597173ba0796338abd39e5e15 + manifestHash: ab470d468aa73e5628b21bd47afbd3eed6799d3a64686fb4c982979f432e6376 name: kops-controller.addons.k8s.io needsRollingUpdate: control-plane selector: @@ -40,7 +40,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml - manifestHash: 7934f73e3a3e56972beeb971f6cb30c5479cb97a6917a1d5c1628b06642ebc2a + manifestHash: b1403524d1d9689e27a40cd661cb856a273684f8a1e8bed3cfb71eb80945b4e8 name: dns-controller.addons.k8s.io selector: k8s-addon: dns-controller.addons.k8s.io diff --git a/tests/integration/update_cluster/existing_iam/data/aws_s3_bucket_object_existing-iam.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/existing_iam/data/aws_s3_bucket_object_existing-iam.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content index f510c6b61f416..33dbb652090bd 100644 --- a/tests/integration/update_cluster/existing_iam/data/aws_s3_bucket_object_existing-iam.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content +++ b/tests/integration/update_cluster/existing_iam/data/aws_s3_bucket_object_existing-iam.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.22.0-beta.1 + version: v1.22.0-beta.2 name: dns-controller namespace: kube-system spec: @@ -24,7 +24,7 @@ spec: labels: k8s-addon: dns-controller.addons.k8s.io k8s-app: dns-controller - version: v1.22.0-beta.1 + version: v1.22.0-beta.2 spec: containers: - command: @@ -37,7 +37,7 @@ spec: env: - name: KUBERNETES_SERVICE_HOST value: 127.0.0.1 - image: k8s.gcr.io/kops/dns-controller:1.22.0-beta.1 + image: k8s.gcr.io/kops/dns-controller:1.22.0-beta.2 name: dns-controller resources: requests: diff --git a/tests/integration/update_cluster/existing_iam/data/aws_s3_bucket_object_existing-iam.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content b/tests/integration/update_cluster/existing_iam/data/aws_s3_bucket_object_existing-iam.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content index 0b72322990a31..e60c7e7f5157e 100644 --- a/tests/integration/update_cluster/existing_iam/data/aws_s3_bucket_object_existing-iam.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content +++ b/tests/integration/update_cluster/existing_iam/data/aws_s3_bucket_object_existing-iam.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.22.0-beta.1 + version: v1.22.0-beta.2 name: kops-controller namespace: kube-system spec: @@ -37,7 +37,7 @@ spec: labels: k8s-addon: kops-controller.addons.k8s.io k8s-app: kops-controller - version: v1.22.0-beta.1 + version: v1.22.0-beta.2 spec: containers: - command: @@ -47,7 +47,7 @@ spec: env: - name: KUBERNETES_SERVICE_HOST value: 127.0.0.1 - image: k8s.gcr.io/kops/kops-controller:1.22.0-beta.1 + image: k8s.gcr.io/kops/kops-controller:1.22.0-beta.2 name: kops-controller resources: requests: diff --git a/tests/integration/update_cluster/existing_iam/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content b/tests/integration/update_cluster/existing_iam/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content index 4db818f31aaf6..c8ce8405ba0b6 100644 --- a/tests/integration/update_cluster/existing_iam/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content +++ b/tests/integration/update_cluster/existing_iam/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content @@ -10,7 +10,7 @@ spec: - --client-key=/secrets/client.key command: - /kube-apiserver-healthcheck - image: k8s.gcr.io/kops/kube-apiserver-healthcheck:1.22.0-beta.1 + image: k8s.gcr.io/kops/kube-apiserver-healthcheck:1.22.0-beta.2 livenessProbe: httpGet: host: 127.0.0.1 diff --git a/tests/integration/update_cluster/existing_sg/data/aws_s3_bucket_object_existingsg.example.com-addons-bootstrap_content b/tests/integration/update_cluster/existing_sg/data/aws_s3_bucket_object_existingsg.example.com-addons-bootstrap_content index 6bb58556c5678..ab0ba428ef2ed 100644 --- a/tests/integration/update_cluster/existing_sg/data/aws_s3_bucket_object_existingsg.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/existing_sg/data/aws_s3_bucket_object_existingsg.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: a95cd647bf96fb4fe6e72f04a37830e89b1a8e6000c0c188a6654d0a86cba522 + manifestHash: 1c68943b8a793a6e6e75999fc6910a09217c0db390be10c45f4fdee711f59ea4 name: kops-controller.addons.k8s.io needsRollingUpdate: control-plane selector: @@ -40,7 +40,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml - manifestHash: 7934f73e3a3e56972beeb971f6cb30c5479cb97a6917a1d5c1628b06642ebc2a + manifestHash: b1403524d1d9689e27a40cd661cb856a273684f8a1e8bed3cfb71eb80945b4e8 name: dns-controller.addons.k8s.io selector: k8s-addon: dns-controller.addons.k8s.io diff --git a/tests/integration/update_cluster/existing_sg/data/aws_s3_bucket_object_existingsg.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/existing_sg/data/aws_s3_bucket_object_existingsg.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content index f510c6b61f416..33dbb652090bd 100644 --- a/tests/integration/update_cluster/existing_sg/data/aws_s3_bucket_object_existingsg.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content +++ b/tests/integration/update_cluster/existing_sg/data/aws_s3_bucket_object_existingsg.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.22.0-beta.1 + version: v1.22.0-beta.2 name: dns-controller namespace: kube-system spec: @@ -24,7 +24,7 @@ spec: labels: k8s-addon: dns-controller.addons.k8s.io k8s-app: dns-controller - version: v1.22.0-beta.1 + version: v1.22.0-beta.2 spec: containers: - command: @@ -37,7 +37,7 @@ spec: env: - name: KUBERNETES_SERVICE_HOST value: 127.0.0.1 - image: k8s.gcr.io/kops/dns-controller:1.22.0-beta.1 + image: k8s.gcr.io/kops/dns-controller:1.22.0-beta.2 name: dns-controller resources: requests: diff --git a/tests/integration/update_cluster/existing_sg/data/aws_s3_bucket_object_existingsg.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content b/tests/integration/update_cluster/existing_sg/data/aws_s3_bucket_object_existingsg.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content index ce46d190ca6e9..e74243a47ce5a 100644 --- a/tests/integration/update_cluster/existing_sg/data/aws_s3_bucket_object_existingsg.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content +++ b/tests/integration/update_cluster/existing_sg/data/aws_s3_bucket_object_existingsg.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.22.0-beta.1 + version: v1.22.0-beta.2 name: kops-controller namespace: kube-system spec: @@ -37,7 +37,7 @@ spec: labels: k8s-addon: kops-controller.addons.k8s.io k8s-app: kops-controller - version: v1.22.0-beta.1 + version: v1.22.0-beta.2 spec: containers: - command: @@ -47,7 +47,7 @@ spec: env: - name: KUBERNETES_SERVICE_HOST value: 127.0.0.1 - image: k8s.gcr.io/kops/kops-controller:1.22.0-beta.1 + image: k8s.gcr.io/kops/kops-controller:1.22.0-beta.2 name: kops-controller resources: requests: diff --git a/tests/integration/update_cluster/existing_sg/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content b/tests/integration/update_cluster/existing_sg/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content index 4db818f31aaf6..c8ce8405ba0b6 100644 --- a/tests/integration/update_cluster/existing_sg/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content +++ b/tests/integration/update_cluster/existing_sg/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content @@ -10,7 +10,7 @@ spec: - --client-key=/secrets/client.key command: - /kube-apiserver-healthcheck - image: k8s.gcr.io/kops/kube-apiserver-healthcheck:1.22.0-beta.1 + image: k8s.gcr.io/kops/kube-apiserver-healthcheck:1.22.0-beta.2 livenessProbe: httpGet: host: 127.0.0.1 diff --git a/tests/integration/update_cluster/external_dns/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content b/tests/integration/update_cluster/external_dns/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content index 4db818f31aaf6..c8ce8405ba0b6 100644 --- a/tests/integration/update_cluster/external_dns/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content +++ b/tests/integration/update_cluster/external_dns/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content @@ -10,7 +10,7 @@ spec: - --client-key=/secrets/client.key command: - /kube-apiserver-healthcheck - image: k8s.gcr.io/kops/kube-apiserver-healthcheck:1.22.0-beta.1 + image: k8s.gcr.io/kops/kube-apiserver-healthcheck:1.22.0-beta.2 livenessProbe: httpGet: host: 127.0.0.1 diff --git a/tests/integration/update_cluster/external_dns/data/aws_s3_bucket_object_minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/external_dns/data/aws_s3_bucket_object_minimal.example.com-addons-bootstrap_content index 9b6f2f3e01812..bf33dac035d38 100644 --- a/tests/integration/update_cluster/external_dns/data/aws_s3_bucket_object_minimal.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/external_dns/data/aws_s3_bucket_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: a42582d604eb0c80c96d6e52fb9c4dd9d5aa09a54437b017ff1c0d2fc41a1793 + manifestHash: dcf0336d3677bfaac81529e17263ff30dd37276592d8329027ef4815ac6973c8 name: kops-controller.addons.k8s.io needsRollingUpdate: control-plane selector: diff --git a/tests/integration/update_cluster/external_dns/data/aws_s3_bucket_object_minimal.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/external_dns/data/aws_s3_bucket_object_minimal.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content index 197552d398b8a..0ba425407b959 100644 --- a/tests/integration/update_cluster/external_dns/data/aws_s3_bucket_object_minimal.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content +++ b/tests/integration/update_cluster/external_dns/data/aws_s3_bucket_object_minimal.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content @@ -37,7 +37,7 @@ spec: env: - name: KUBERNETES_SERVICE_HOST value: 127.0.0.1 - image: k8s.gcr.io/kops/dns-controller:1.22.0-beta.1 + image: k8s.gcr.io/kops/dns-controller:1.22.0-beta.2 name: dns-controller resources: requests: diff --git a/tests/integration/update_cluster/external_dns/data/aws_s3_bucket_object_minimal.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content b/tests/integration/update_cluster/external_dns/data/aws_s3_bucket_object_minimal.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content index b01e7a070b03d..f9e213909c931 100644 --- a/tests/integration/update_cluster/external_dns/data/aws_s3_bucket_object_minimal.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content +++ b/tests/integration/update_cluster/external_dns/data/aws_s3_bucket_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.22.0-beta.1 + version: v1.22.0-beta.2 name: kops-controller namespace: kube-system spec: @@ -37,7 +37,7 @@ spec: labels: k8s-addon: kops-controller.addons.k8s.io k8s-app: kops-controller - version: v1.22.0-beta.1 + version: v1.22.0-beta.2 spec: containers: - command: @@ -47,7 +47,7 @@ spec: env: - name: KUBERNETES_SERVICE_HOST value: 127.0.0.1 - image: k8s.gcr.io/kops/kops-controller:1.22.0-beta.1 + image: k8s.gcr.io/kops/kops-controller:1.22.0-beta.2 name: kops-controller resources: requests: diff --git a/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content b/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content index 4db818f31aaf6..c8ce8405ba0b6 100644 --- a/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content +++ b/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content @@ -10,7 +10,7 @@ spec: - --client-key=/secrets/client.key command: - /kube-apiserver-healthcheck - image: k8s.gcr.io/kops/kube-apiserver-healthcheck:1.22.0-beta.1 + image: k8s.gcr.io/kops/kube-apiserver-healthcheck:1.22.0-beta.2 livenessProbe: httpGet: host: 127.0.0.1 diff --git a/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_bucket_object_minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_bucket_object_minimal.example.com-addons-bootstrap_content index 9b6f2f3e01812..bf33dac035d38 100644 --- a/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_bucket_object_minimal.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_bucket_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: a42582d604eb0c80c96d6e52fb9c4dd9d5aa09a54437b017ff1c0d2fc41a1793 + manifestHash: dcf0336d3677bfaac81529e17263ff30dd37276592d8329027ef4815ac6973c8 name: kops-controller.addons.k8s.io needsRollingUpdate: control-plane selector: diff --git a/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_bucket_object_minimal.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_bucket_object_minimal.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content index 28668af89b88f..8789f215414bd 100644 --- a/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_bucket_object_minimal.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content +++ b/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_bucket_object_minimal.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content @@ -37,7 +37,7 @@ spec: env: - name: KUBERNETES_SERVICE_HOST value: 127.0.0.1 - image: k8s.gcr.io/kops/dns-controller:1.22.0-beta.1 + image: k8s.gcr.io/kops/dns-controller:1.22.0-beta.2 name: dns-controller resources: requests: diff --git a/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_bucket_object_minimal.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content b/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_bucket_object_minimal.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content index b01e7a070b03d..f9e213909c931 100644 --- a/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_bucket_object_minimal.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content +++ b/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_bucket_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.22.0-beta.1 + version: v1.22.0-beta.2 name: kops-controller namespace: kube-system spec: @@ -37,7 +37,7 @@ spec: labels: k8s-addon: kops-controller.addons.k8s.io k8s-app: kops-controller - version: v1.22.0-beta.1 + version: v1.22.0-beta.2 spec: containers: - command: @@ -47,7 +47,7 @@ spec: env: - name: KUBERNETES_SERVICE_HOST value: 127.0.0.1 - image: k8s.gcr.io/kops/kops-controller:1.22.0-beta.1 + image: k8s.gcr.io/kops/kops-controller:1.22.0-beta.2 name: kops-controller resources: requests: diff --git a/tests/integration/update_cluster/externallb/data/aws_s3_bucket_object_externallb.example.com-addons-bootstrap_content b/tests/integration/update_cluster/externallb/data/aws_s3_bucket_object_externallb.example.com-addons-bootstrap_content index 33f326005e432..64310e72d589b 100644 --- a/tests/integration/update_cluster/externallb/data/aws_s3_bucket_object_externallb.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/externallb/data/aws_s3_bucket_object_externallb.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: 1ed79d474937d84429a23f8ce1881ee388c00b5deb794defb43f6439d4e7576b + manifestHash: c324e416914142fd168d8bd6e19983ce39896169658e6f24fe8bd9edf02008e9 name: kops-controller.addons.k8s.io needsRollingUpdate: control-plane selector: @@ -40,7 +40,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml - manifestHash: 7934f73e3a3e56972beeb971f6cb30c5479cb97a6917a1d5c1628b06642ebc2a + manifestHash: b1403524d1d9689e27a40cd661cb856a273684f8a1e8bed3cfb71eb80945b4e8 name: dns-controller.addons.k8s.io selector: k8s-addon: dns-controller.addons.k8s.io diff --git a/tests/integration/update_cluster/externallb/data/aws_s3_bucket_object_externallb.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/externallb/data/aws_s3_bucket_object_externallb.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content index f510c6b61f416..33dbb652090bd 100644 --- a/tests/integration/update_cluster/externallb/data/aws_s3_bucket_object_externallb.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content +++ b/tests/integration/update_cluster/externallb/data/aws_s3_bucket_object_externallb.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.22.0-beta.1 + version: v1.22.0-beta.2 name: dns-controller namespace: kube-system spec: @@ -24,7 +24,7 @@ spec: labels: k8s-addon: dns-controller.addons.k8s.io k8s-app: dns-controller - version: v1.22.0-beta.1 + version: v1.22.0-beta.2 spec: containers: - command: @@ -37,7 +37,7 @@ spec: env: - name: KUBERNETES_SERVICE_HOST value: 127.0.0.1 - image: k8s.gcr.io/kops/dns-controller:1.22.0-beta.1 + image: k8s.gcr.io/kops/dns-controller:1.22.0-beta.2 name: dns-controller resources: requests: diff --git a/tests/integration/update_cluster/externallb/data/aws_s3_bucket_object_externallb.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content b/tests/integration/update_cluster/externallb/data/aws_s3_bucket_object_externallb.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content index 13f49271153ab..83fe566bf7741 100644 --- a/tests/integration/update_cluster/externallb/data/aws_s3_bucket_object_externallb.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content +++ b/tests/integration/update_cluster/externallb/data/aws_s3_bucket_object_externallb.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.22.0-beta.1 + version: v1.22.0-beta.2 name: kops-controller namespace: kube-system spec: @@ -37,7 +37,7 @@ spec: labels: k8s-addon: kops-controller.addons.k8s.io k8s-app: kops-controller - version: v1.22.0-beta.1 + version: v1.22.0-beta.2 spec: containers: - command: @@ -47,7 +47,7 @@ spec: env: - name: KUBERNETES_SERVICE_HOST value: 127.0.0.1 - image: k8s.gcr.io/kops/kops-controller:1.22.0-beta.1 + image: k8s.gcr.io/kops/kops-controller:1.22.0-beta.2 name: kops-controller resources: requests: diff --git a/tests/integration/update_cluster/externallb/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content b/tests/integration/update_cluster/externallb/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content index 4db818f31aaf6..c8ce8405ba0b6 100644 --- a/tests/integration/update_cluster/externallb/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content +++ b/tests/integration/update_cluster/externallb/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content @@ -10,7 +10,7 @@ spec: - --client-key=/secrets/client.key command: - /kube-apiserver-healthcheck - image: k8s.gcr.io/kops/kube-apiserver-healthcheck:1.22.0-beta.1 + image: k8s.gcr.io/kops/kube-apiserver-healthcheck:1.22.0-beta.2 livenessProbe: httpGet: host: 127.0.0.1 diff --git a/tests/integration/update_cluster/externalpolicies/data/aws_s3_bucket_object_externalpolicies.example.com-addons-bootstrap_content b/tests/integration/update_cluster/externalpolicies/data/aws_s3_bucket_object_externalpolicies.example.com-addons-bootstrap_content index f6d81cd65ca22..8c713ae01fd8f 100644 --- a/tests/integration/update_cluster/externalpolicies/data/aws_s3_bucket_object_externalpolicies.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/externalpolicies/data/aws_s3_bucket_object_externalpolicies.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: a9c7fb8da3557d1b5132b9f1d5169e661fa83db1214d8dc05cef7652f5f62109 + manifestHash: 05dd877b6523fe6a4eeeb40bf359c727108cb3284e3262a6f9439d803f58fe9c name: kops-controller.addons.k8s.io needsRollingUpdate: control-plane selector: @@ -40,7 +40,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml - manifestHash: 7934f73e3a3e56972beeb971f6cb30c5479cb97a6917a1d5c1628b06642ebc2a + manifestHash: b1403524d1d9689e27a40cd661cb856a273684f8a1e8bed3cfb71eb80945b4e8 name: dns-controller.addons.k8s.io selector: k8s-addon: dns-controller.addons.k8s.io diff --git a/tests/integration/update_cluster/externalpolicies/data/aws_s3_bucket_object_externalpolicies.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/externalpolicies/data/aws_s3_bucket_object_externalpolicies.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content index f510c6b61f416..33dbb652090bd 100644 --- a/tests/integration/update_cluster/externalpolicies/data/aws_s3_bucket_object_externalpolicies.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content +++ b/tests/integration/update_cluster/externalpolicies/data/aws_s3_bucket_object_externalpolicies.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.22.0-beta.1 + version: v1.22.0-beta.2 name: dns-controller namespace: kube-system spec: @@ -24,7 +24,7 @@ spec: labels: k8s-addon: dns-controller.addons.k8s.io k8s-app: dns-controller - version: v1.22.0-beta.1 + version: v1.22.0-beta.2 spec: containers: - command: @@ -37,7 +37,7 @@ spec: env: - name: KUBERNETES_SERVICE_HOST value: 127.0.0.1 - image: k8s.gcr.io/kops/dns-controller:1.22.0-beta.1 + image: k8s.gcr.io/kops/dns-controller:1.22.0-beta.2 name: dns-controller resources: requests: diff --git a/tests/integration/update_cluster/externalpolicies/data/aws_s3_bucket_object_externalpolicies.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content b/tests/integration/update_cluster/externalpolicies/data/aws_s3_bucket_object_externalpolicies.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content index 0471f26b8d635..4e5f7e7b92f13 100644 --- a/tests/integration/update_cluster/externalpolicies/data/aws_s3_bucket_object_externalpolicies.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content +++ b/tests/integration/update_cluster/externalpolicies/data/aws_s3_bucket_object_externalpolicies.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.22.0-beta.1 + version: v1.22.0-beta.2 name: kops-controller namespace: kube-system spec: @@ -37,7 +37,7 @@ spec: labels: k8s-addon: kops-controller.addons.k8s.io k8s-app: kops-controller - version: v1.22.0-beta.1 + version: v1.22.0-beta.2 spec: containers: - command: @@ -47,7 +47,7 @@ spec: env: - name: KUBERNETES_SERVICE_HOST value: 127.0.0.1 - image: k8s.gcr.io/kops/kops-controller:1.22.0-beta.1 + image: k8s.gcr.io/kops/kops-controller:1.22.0-beta.2 name: kops-controller resources: requests: diff --git a/tests/integration/update_cluster/externalpolicies/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content b/tests/integration/update_cluster/externalpolicies/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content index 4db818f31aaf6..c8ce8405ba0b6 100644 --- a/tests/integration/update_cluster/externalpolicies/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content +++ b/tests/integration/update_cluster/externalpolicies/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content @@ -10,7 +10,7 @@ spec: - --client-key=/secrets/client.key command: - /kube-apiserver-healthcheck - image: k8s.gcr.io/kops/kube-apiserver-healthcheck:1.22.0-beta.1 + image: k8s.gcr.io/kops/kube-apiserver-healthcheck:1.22.0-beta.2 livenessProbe: httpGet: host: 127.0.0.1 diff --git a/tests/integration/update_cluster/ha/data/aws_s3_bucket_object_ha.example.com-addons-bootstrap_content b/tests/integration/update_cluster/ha/data/aws_s3_bucket_object_ha.example.com-addons-bootstrap_content index 712a53f578252..89cc4ac5cb556 100644 --- a/tests/integration/update_cluster/ha/data/aws_s3_bucket_object_ha.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/ha/data/aws_s3_bucket_object_ha.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: f7ef8df43f06be5d6f8179393eff2026241429dbb4abaa8daa453490752dac04 + manifestHash: 0b643bfb34695749c57f64867aefc8aded97065e57fc59717b4df2a538eae4c3 name: kops-controller.addons.k8s.io needsRollingUpdate: control-plane selector: @@ -40,7 +40,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml - manifestHash: 7934f73e3a3e56972beeb971f6cb30c5479cb97a6917a1d5c1628b06642ebc2a + manifestHash: b1403524d1d9689e27a40cd661cb856a273684f8a1e8bed3cfb71eb80945b4e8 name: dns-controller.addons.k8s.io selector: k8s-addon: dns-controller.addons.k8s.io diff --git a/tests/integration/update_cluster/ha/data/aws_s3_bucket_object_ha.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/ha/data/aws_s3_bucket_object_ha.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content index f510c6b61f416..33dbb652090bd 100644 --- a/tests/integration/update_cluster/ha/data/aws_s3_bucket_object_ha.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content +++ b/tests/integration/update_cluster/ha/data/aws_s3_bucket_object_ha.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.22.0-beta.1 + version: v1.22.0-beta.2 name: dns-controller namespace: kube-system spec: @@ -24,7 +24,7 @@ spec: labels: k8s-addon: dns-controller.addons.k8s.io k8s-app: dns-controller - version: v1.22.0-beta.1 + version: v1.22.0-beta.2 spec: containers: - command: @@ -37,7 +37,7 @@ spec: env: - name: KUBERNETES_SERVICE_HOST value: 127.0.0.1 - image: k8s.gcr.io/kops/dns-controller:1.22.0-beta.1 + image: k8s.gcr.io/kops/dns-controller:1.22.0-beta.2 name: dns-controller resources: requests: diff --git a/tests/integration/update_cluster/ha/data/aws_s3_bucket_object_ha.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content b/tests/integration/update_cluster/ha/data/aws_s3_bucket_object_ha.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content index f7198cf1b0443..fdbd9bb9d77e0 100644 --- a/tests/integration/update_cluster/ha/data/aws_s3_bucket_object_ha.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content +++ b/tests/integration/update_cluster/ha/data/aws_s3_bucket_object_ha.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.22.0-beta.1 + version: v1.22.0-beta.2 name: kops-controller namespace: kube-system spec: @@ -37,7 +37,7 @@ spec: labels: k8s-addon: kops-controller.addons.k8s.io k8s-app: kops-controller - version: v1.22.0-beta.1 + version: v1.22.0-beta.2 spec: containers: - command: @@ -47,7 +47,7 @@ spec: env: - name: KUBERNETES_SERVICE_HOST value: 127.0.0.1 - image: k8s.gcr.io/kops/kops-controller:1.22.0-beta.1 + image: k8s.gcr.io/kops/kops-controller:1.22.0-beta.2 name: kops-controller resources: requests: diff --git a/tests/integration/update_cluster/ha/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content b/tests/integration/update_cluster/ha/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content index 4db818f31aaf6..c8ce8405ba0b6 100644 --- a/tests/integration/update_cluster/ha/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content +++ b/tests/integration/update_cluster/ha/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content @@ -10,7 +10,7 @@ spec: - --client-key=/secrets/client.key command: - /kube-apiserver-healthcheck - image: k8s.gcr.io/kops/kube-apiserver-healthcheck:1.22.0-beta.1 + image: k8s.gcr.io/kops/kube-apiserver-healthcheck:1.22.0-beta.2 livenessProbe: httpGet: host: 127.0.0.1 diff --git a/tests/integration/update_cluster/ha_gce/data/aws_s3_bucket_object_ha-gce.example.com-addons-bootstrap_content b/tests/integration/update_cluster/ha_gce/data/aws_s3_bucket_object_ha-gce.example.com-addons-bootstrap_content index 10ca206b18b07..c418ede68ad23 100644 --- a/tests/integration/update_cluster/ha_gce/data/aws_s3_bucket_object_ha-gce.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/ha_gce/data/aws_s3_bucket_object_ha-gce.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: 5ed9f3bc066d3bc763f42d03279819dbd4c9afe50d9101f2706718bf9b0b82fd + manifestHash: 03a639b5115fe54f533ac8952fdebdcccbf45de119875d08357a8f95f10b6e5d name: kops-controller.addons.k8s.io needsRollingUpdate: control-plane selector: @@ -47,7 +47,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml - manifestHash: 326a5316d78145e6bf7cec833d1be9df56e12877bca6bb8b9b883f353a2b27a6 + manifestHash: 65d8e7398cc391c6250c399c12f0d1f036a897e0b1a9bc3c78242b7c99ae1e68 name: dns-controller.addons.k8s.io selector: k8s-addon: dns-controller.addons.k8s.io diff --git a/tests/integration/update_cluster/ha_gce/data/aws_s3_bucket_object_ha-gce.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/ha_gce/data/aws_s3_bucket_object_ha-gce.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content index 55471af6d8f69..9826b70bd228e 100644 --- a/tests/integration/update_cluster/ha_gce/data/aws_s3_bucket_object_ha-gce.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content +++ b/tests/integration/update_cluster/ha_gce/data/aws_s3_bucket_object_ha-gce.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.22.0-beta.1 + version: v1.22.0-beta.2 name: dns-controller namespace: kube-system spec: @@ -24,7 +24,7 @@ spec: labels: k8s-addon: dns-controller.addons.k8s.io k8s-app: dns-controller - version: v1.22.0-beta.1 + version: v1.22.0-beta.2 spec: containers: - command: @@ -37,7 +37,7 @@ spec: env: - name: KUBERNETES_SERVICE_HOST value: 127.0.0.1 - image: k8s.gcr.io/kops/dns-controller:1.22.0-beta.1 + image: k8s.gcr.io/kops/dns-controller:1.22.0-beta.2 name: dns-controller resources: requests: diff --git a/tests/integration/update_cluster/ha_gce/data/aws_s3_bucket_object_ha-gce.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content b/tests/integration/update_cluster/ha_gce/data/aws_s3_bucket_object_ha-gce.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content index e469abf340123..2c6658abd6b86 100644 --- a/tests/integration/update_cluster/ha_gce/data/aws_s3_bucket_object_ha-gce.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content +++ b/tests/integration/update_cluster/ha_gce/data/aws_s3_bucket_object_ha-gce.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.22.0-beta.1 + version: v1.22.0-beta.2 name: kops-controller namespace: kube-system spec: @@ -35,7 +35,7 @@ spec: labels: k8s-addon: kops-controller.addons.k8s.io k8s-app: kops-controller - version: v1.22.0-beta.1 + version: v1.22.0-beta.2 spec: containers: - command: @@ -45,7 +45,7 @@ spec: env: - name: KUBERNETES_SERVICE_HOST value: 127.0.0.1 - image: k8s.gcr.io/kops/kops-controller:1.22.0-beta.1 + image: k8s.gcr.io/kops/kops-controller:1.22.0-beta.2 name: kops-controller resources: requests: diff --git a/tests/integration/update_cluster/ha_gce/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content b/tests/integration/update_cluster/ha_gce/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content index 4db818f31aaf6..c8ce8405ba0b6 100644 --- a/tests/integration/update_cluster/ha_gce/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content +++ b/tests/integration/update_cluster/ha_gce/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content @@ -10,7 +10,7 @@ spec: - --client-key=/secrets/client.key command: - /kube-apiserver-healthcheck - image: k8s.gcr.io/kops/kube-apiserver-healthcheck:1.22.0-beta.1 + image: k8s.gcr.io/kops/kube-apiserver-healthcheck:1.22.0-beta.2 livenessProbe: httpGet: host: 127.0.0.1 diff --git a/tests/integration/update_cluster/irsa/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content b/tests/integration/update_cluster/irsa/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content index 4db818f31aaf6..c8ce8405ba0b6 100644 --- a/tests/integration/update_cluster/irsa/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content +++ b/tests/integration/update_cluster/irsa/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content @@ -10,7 +10,7 @@ spec: - --client-key=/secrets/client.key command: - /kube-apiserver-healthcheck - image: k8s.gcr.io/kops/kube-apiserver-healthcheck:1.22.0-beta.1 + image: k8s.gcr.io/kops/kube-apiserver-healthcheck:1.22.0-beta.2 livenessProbe: httpGet: host: 127.0.0.1 diff --git a/tests/integration/update_cluster/irsa/data/aws_s3_bucket_object_minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/irsa/data/aws_s3_bucket_object_minimal.example.com-addons-bootstrap_content index 4f7c9e45c154b..c89646eb792a5 100644 --- a/tests/integration/update_cluster/irsa/data/aws_s3_bucket_object_minimal.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/irsa/data/aws_s3_bucket_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: a42582d604eb0c80c96d6e52fb9c4dd9d5aa09a54437b017ff1c0d2fc41a1793 + manifestHash: dcf0336d3677bfaac81529e17263ff30dd37276592d8329027ef4815ac6973c8 name: kops-controller.addons.k8s.io needsRollingUpdate: control-plane selector: @@ -40,7 +40,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml - manifestHash: 7934f73e3a3e56972beeb971f6cb30c5479cb97a6917a1d5c1628b06642ebc2a + manifestHash: b1403524d1d9689e27a40cd661cb856a273684f8a1e8bed3cfb71eb80945b4e8 name: dns-controller.addons.k8s.io selector: k8s-addon: dns-controller.addons.k8s.io diff --git a/tests/integration/update_cluster/irsa/data/aws_s3_bucket_object_minimal.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/irsa/data/aws_s3_bucket_object_minimal.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content index f510c6b61f416..33dbb652090bd 100644 --- a/tests/integration/update_cluster/irsa/data/aws_s3_bucket_object_minimal.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content +++ b/tests/integration/update_cluster/irsa/data/aws_s3_bucket_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.22.0-beta.1 + version: v1.22.0-beta.2 name: dns-controller namespace: kube-system spec: @@ -24,7 +24,7 @@ spec: labels: k8s-addon: dns-controller.addons.k8s.io k8s-app: dns-controller - version: v1.22.0-beta.1 + version: v1.22.0-beta.2 spec: containers: - command: @@ -37,7 +37,7 @@ spec: env: - name: KUBERNETES_SERVICE_HOST value: 127.0.0.1 - image: k8s.gcr.io/kops/dns-controller:1.22.0-beta.1 + image: k8s.gcr.io/kops/dns-controller:1.22.0-beta.2 name: dns-controller resources: requests: diff --git a/tests/integration/update_cluster/irsa/data/aws_s3_bucket_object_minimal.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content b/tests/integration/update_cluster/irsa/data/aws_s3_bucket_object_minimal.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content index b01e7a070b03d..f9e213909c931 100644 --- a/tests/integration/update_cluster/irsa/data/aws_s3_bucket_object_minimal.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content +++ b/tests/integration/update_cluster/irsa/data/aws_s3_bucket_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.22.0-beta.1 + version: v1.22.0-beta.2 name: kops-controller namespace: kube-system spec: @@ -37,7 +37,7 @@ spec: labels: k8s-addon: kops-controller.addons.k8s.io k8s-app: kops-controller - version: v1.22.0-beta.1 + version: v1.22.0-beta.2 spec: containers: - command: @@ -47,7 +47,7 @@ spec: env: - name: KUBERNETES_SERVICE_HOST value: 127.0.0.1 - image: k8s.gcr.io/kops/kops-controller:1.22.0-beta.1 + image: k8s.gcr.io/kops/kops-controller:1.22.0-beta.2 name: kops-controller resources: requests: diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content index 4db818f31aaf6..c8ce8405ba0b6 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content @@ -10,7 +10,7 @@ spec: - --client-key=/secrets/client.key command: - /kube-apiserver-healthcheck - image: k8s.gcr.io/kops/kube-apiserver-healthcheck:1.22.0-beta.1 + image: k8s.gcr.io/kops/kube-apiserver-healthcheck:1.22.0-beta.2 livenessProbe: httpGet: host: 127.0.0.1 diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_bucket_object_minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_bucket_object_minimal.example.com-addons-bootstrap_content index b7af394086d2f..8f7c9522ea8ea 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_bucket_object_minimal.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_bucket_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: a42582d604eb0c80c96d6e52fb9c4dd9d5aa09a54437b017ff1c0d2fc41a1793 + manifestHash: dcf0336d3677bfaac81529e17263ff30dd37276592d8329027ef4815ac6973c8 name: kops-controller.addons.k8s.io needsRollingUpdate: control-plane selector: @@ -40,7 +40,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml - manifestHash: 6de1dca5e9fd89b3781f632bf74aee0a67d0416ca236ecc69811b39acb475271 + manifestHash: b4524ab5361fe3df3ff58ddd183178056077f16989efe551b1ddbeb7dd3ba9a0 name: dns-controller.addons.k8s.io selector: k8s-addon: dns-controller.addons.k8s.io diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_bucket_object_minimal.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_bucket_object_minimal.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content index d78d808a72655..7ec7be1ce62af 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_bucket_object_minimal.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_bucket_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.22.0-beta.1 + version: v1.22.0-beta.2 name: dns-controller namespace: kube-system spec: @@ -24,7 +24,7 @@ spec: labels: k8s-addon: dns-controller.addons.k8s.io k8s-app: dns-controller - version: v1.22.0-beta.1 + version: v1.22.0-beta.2 spec: containers: - command: @@ -41,7 +41,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: k8s.gcr.io/kops/dns-controller:1.22.0-beta.1 + image: k8s.gcr.io/kops/dns-controller:1.22.0-beta.2 name: dns-controller resources: requests: diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_bucket_object_minimal.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_bucket_object_minimal.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content index b01e7a070b03d..f9e213909c931 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_bucket_object_minimal.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_bucket_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.22.0-beta.1 + version: v1.22.0-beta.2 name: kops-controller namespace: kube-system spec: @@ -37,7 +37,7 @@ spec: labels: k8s-addon: kops-controller.addons.k8s.io k8s-app: kops-controller - version: v1.22.0-beta.1 + version: v1.22.0-beta.2 spec: containers: - command: @@ -47,7 +47,7 @@ spec: env: - name: KUBERNETES_SERVICE_HOST value: 127.0.0.1 - image: k8s.gcr.io/kops/kops-controller:1.22.0-beta.1 + image: k8s.gcr.io/kops/kops-controller:1.22.0-beta.2 name: kops-controller resources: requests: diff --git a/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content b/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content index 4db818f31aaf6..c8ce8405ba0b6 100644 --- a/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content +++ b/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content @@ -10,7 +10,7 @@ spec: - --client-key=/secrets/client.key command: - /kube-apiserver-healthcheck - image: k8s.gcr.io/kops/kube-apiserver-healthcheck:1.22.0-beta.1 + image: k8s.gcr.io/kops/kube-apiserver-healthcheck:1.22.0-beta.2 livenessProbe: httpGet: host: 127.0.0.1 diff --git a/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_bucket_object_minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_bucket_object_minimal.example.com-addons-bootstrap_content index e4b3d83409620..ce60abb7999ef 100644 --- a/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_bucket_object_minimal.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_bucket_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: a42582d604eb0c80c96d6e52fb9c4dd9d5aa09a54437b017ff1c0d2fc41a1793 + manifestHash: dcf0336d3677bfaac81529e17263ff30dd37276592d8329027ef4815ac6973c8 name: kops-controller.addons.k8s.io needsRollingUpdate: control-plane selector: @@ -40,7 +40,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml - manifestHash: 7934f73e3a3e56972beeb971f6cb30c5479cb97a6917a1d5c1628b06642ebc2a + manifestHash: b1403524d1d9689e27a40cd661cb856a273684f8a1e8bed3cfb71eb80945b4e8 name: dns-controller.addons.k8s.io selector: k8s-addon: dns-controller.addons.k8s.io diff --git a/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_bucket_object_minimal.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_bucket_object_minimal.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content index f510c6b61f416..33dbb652090bd 100644 --- a/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_bucket_object_minimal.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content +++ b/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_bucket_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.22.0-beta.1 + version: v1.22.0-beta.2 name: dns-controller namespace: kube-system spec: @@ -24,7 +24,7 @@ spec: labels: k8s-addon: dns-controller.addons.k8s.io k8s-app: dns-controller - version: v1.22.0-beta.1 + version: v1.22.0-beta.2 spec: containers: - command: @@ -37,7 +37,7 @@ spec: env: - name: KUBERNETES_SERVICE_HOST value: 127.0.0.1 - image: k8s.gcr.io/kops/dns-controller:1.22.0-beta.1 + image: k8s.gcr.io/kops/dns-controller:1.22.0-beta.2 name: dns-controller resources: requests: diff --git a/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_bucket_object_minimal.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content b/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_bucket_object_minimal.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content index b01e7a070b03d..f9e213909c931 100644 --- a/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_bucket_object_minimal.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content +++ b/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_bucket_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.22.0-beta.1 + version: v1.22.0-beta.2 name: kops-controller namespace: kube-system spec: @@ -37,7 +37,7 @@ spec: labels: k8s-addon: kops-controller.addons.k8s.io k8s-app: kops-controller - version: v1.22.0-beta.1 + version: v1.22.0-beta.2 spec: containers: - command: @@ -47,7 +47,7 @@ spec: env: - name: KUBERNETES_SERVICE_HOST value: 127.0.0.1 - image: k8s.gcr.io/kops/kops-controller:1.22.0-beta.1 + image: k8s.gcr.io/kops/kops-controller:1.22.0-beta.2 name: kops-controller resources: requests: diff --git a/tests/integration/update_cluster/many-addons/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content b/tests/integration/update_cluster/many-addons/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content index 4db818f31aaf6..c8ce8405ba0b6 100644 --- a/tests/integration/update_cluster/many-addons/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content +++ b/tests/integration/update_cluster/many-addons/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content @@ -10,7 +10,7 @@ spec: - --client-key=/secrets/client.key command: - /kube-apiserver-healthcheck - image: k8s.gcr.io/kops/kube-apiserver-healthcheck:1.22.0-beta.1 + image: k8s.gcr.io/kops/kube-apiserver-healthcheck:1.22.0-beta.2 livenessProbe: httpGet: host: 127.0.0.1 diff --git a/tests/integration/update_cluster/many-addons/data/aws_s3_bucket_object_minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/many-addons/data/aws_s3_bucket_object_minimal.example.com-addons-bootstrap_content index fbb444b31dff2..0c6e11f30410b 100644 --- a/tests/integration/update_cluster/many-addons/data/aws_s3_bucket_object_minimal.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/many-addons/data/aws_s3_bucket_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: a42582d604eb0c80c96d6e52fb9c4dd9d5aa09a54437b017ff1c0d2fc41a1793 + manifestHash: dcf0336d3677bfaac81529e17263ff30dd37276592d8329027ef4815ac6973c8 name: kops-controller.addons.k8s.io needsRollingUpdate: control-plane selector: @@ -40,7 +40,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml - manifestHash: 7934f73e3a3e56972beeb971f6cb30c5479cb97a6917a1d5c1628b06642ebc2a + manifestHash: b1403524d1d9689e27a40cd661cb856a273684f8a1e8bed3cfb71eb80945b4e8 name: dns-controller.addons.k8s.io selector: k8s-addon: dns-controller.addons.k8s.io diff --git a/tests/integration/update_cluster/many-addons/data/aws_s3_bucket_object_minimal.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/many-addons/data/aws_s3_bucket_object_minimal.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content index f510c6b61f416..33dbb652090bd 100644 --- a/tests/integration/update_cluster/many-addons/data/aws_s3_bucket_object_minimal.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content +++ b/tests/integration/update_cluster/many-addons/data/aws_s3_bucket_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.22.0-beta.1 + version: v1.22.0-beta.2 name: dns-controller namespace: kube-system spec: @@ -24,7 +24,7 @@ spec: labels: k8s-addon: dns-controller.addons.k8s.io k8s-app: dns-controller - version: v1.22.0-beta.1 + version: v1.22.0-beta.2 spec: containers: - command: @@ -37,7 +37,7 @@ spec: env: - name: KUBERNETES_SERVICE_HOST value: 127.0.0.1 - image: k8s.gcr.io/kops/dns-controller:1.22.0-beta.1 + image: k8s.gcr.io/kops/dns-controller:1.22.0-beta.2 name: dns-controller resources: requests: diff --git a/tests/integration/update_cluster/many-addons/data/aws_s3_bucket_object_minimal.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content b/tests/integration/update_cluster/many-addons/data/aws_s3_bucket_object_minimal.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content index b01e7a070b03d..f9e213909c931 100644 --- a/tests/integration/update_cluster/many-addons/data/aws_s3_bucket_object_minimal.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content +++ b/tests/integration/update_cluster/many-addons/data/aws_s3_bucket_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.22.0-beta.1 + version: v1.22.0-beta.2 name: kops-controller namespace: kube-system spec: @@ -37,7 +37,7 @@ spec: labels: k8s-addon: kops-controller.addons.k8s.io k8s-app: kops-controller - version: v1.22.0-beta.1 + version: v1.22.0-beta.2 spec: containers: - command: @@ -47,7 +47,7 @@ spec: env: - name: KUBERNETES_SERVICE_HOST value: 127.0.0.1 - image: k8s.gcr.io/kops/kops-controller:1.22.0-beta.1 + image: k8s.gcr.io/kops/kops-controller:1.22.0-beta.2 name: kops-controller resources: requests: diff --git a/tests/integration/update_cluster/minimal-gp3/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content b/tests/integration/update_cluster/minimal-gp3/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content index 4db818f31aaf6..c8ce8405ba0b6 100644 --- a/tests/integration/update_cluster/minimal-gp3/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content +++ b/tests/integration/update_cluster/minimal-gp3/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content @@ -10,7 +10,7 @@ spec: - --client-key=/secrets/client.key command: - /kube-apiserver-healthcheck - image: k8s.gcr.io/kops/kube-apiserver-healthcheck:1.22.0-beta.1 + image: k8s.gcr.io/kops/kube-apiserver-healthcheck:1.22.0-beta.2 livenessProbe: httpGet: host: 127.0.0.1 diff --git a/tests/integration/update_cluster/minimal-gp3/data/aws_s3_bucket_object_minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/minimal-gp3/data/aws_s3_bucket_object_minimal.example.com-addons-bootstrap_content index 4f7c9e45c154b..c89646eb792a5 100644 --- a/tests/integration/update_cluster/minimal-gp3/data/aws_s3_bucket_object_minimal.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/minimal-gp3/data/aws_s3_bucket_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: a42582d604eb0c80c96d6e52fb9c4dd9d5aa09a54437b017ff1c0d2fc41a1793 + manifestHash: dcf0336d3677bfaac81529e17263ff30dd37276592d8329027ef4815ac6973c8 name: kops-controller.addons.k8s.io needsRollingUpdate: control-plane selector: @@ -40,7 +40,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml - manifestHash: 7934f73e3a3e56972beeb971f6cb30c5479cb97a6917a1d5c1628b06642ebc2a + manifestHash: b1403524d1d9689e27a40cd661cb856a273684f8a1e8bed3cfb71eb80945b4e8 name: dns-controller.addons.k8s.io selector: k8s-addon: dns-controller.addons.k8s.io diff --git a/tests/integration/update_cluster/minimal-gp3/data/aws_s3_bucket_object_minimal.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/minimal-gp3/data/aws_s3_bucket_object_minimal.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content index f510c6b61f416..33dbb652090bd 100644 --- a/tests/integration/update_cluster/minimal-gp3/data/aws_s3_bucket_object_minimal.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content +++ b/tests/integration/update_cluster/minimal-gp3/data/aws_s3_bucket_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.22.0-beta.1 + version: v1.22.0-beta.2 name: dns-controller namespace: kube-system spec: @@ -24,7 +24,7 @@ spec: labels: k8s-addon: dns-controller.addons.k8s.io k8s-app: dns-controller - version: v1.22.0-beta.1 + version: v1.22.0-beta.2 spec: containers: - command: @@ -37,7 +37,7 @@ spec: env: - name: KUBERNETES_SERVICE_HOST value: 127.0.0.1 - image: k8s.gcr.io/kops/dns-controller:1.22.0-beta.1 + image: k8s.gcr.io/kops/dns-controller:1.22.0-beta.2 name: dns-controller resources: requests: diff --git a/tests/integration/update_cluster/minimal-gp3/data/aws_s3_bucket_object_minimal.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content b/tests/integration/update_cluster/minimal-gp3/data/aws_s3_bucket_object_minimal.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content index b01e7a070b03d..f9e213909c931 100644 --- a/tests/integration/update_cluster/minimal-gp3/data/aws_s3_bucket_object_minimal.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content +++ b/tests/integration/update_cluster/minimal-gp3/data/aws_s3_bucket_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.22.0-beta.1 + version: v1.22.0-beta.2 name: kops-controller namespace: kube-system spec: @@ -37,7 +37,7 @@ spec: labels: k8s-addon: kops-controller.addons.k8s.io k8s-app: kops-controller - version: v1.22.0-beta.1 + version: v1.22.0-beta.2 spec: containers: - command: @@ -47,7 +47,7 @@ spec: env: - name: KUBERNETES_SERVICE_HOST value: 127.0.0.1 - image: k8s.gcr.io/kops/kops-controller:1.22.0-beta.1 + image: k8s.gcr.io/kops/kops-controller:1.22.0-beta.2 name: kops-controller resources: requests: diff --git a/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content b/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content index 4db818f31aaf6..c8ce8405ba0b6 100644 --- a/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content +++ b/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content @@ -10,7 +10,7 @@ spec: - --client-key=/secrets/client.key command: - /kube-apiserver-healthcheck - image: k8s.gcr.io/kops/kube-apiserver-healthcheck:1.22.0-beta.1 + image: k8s.gcr.io/kops/kube-apiserver-healthcheck:1.22.0-beta.2 livenessProbe: httpGet: host: 127.0.0.1 diff --git a/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_bucket_object_minimal-ipv6.example.com-addons-bootstrap_content b/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_bucket_object_minimal-ipv6.example.com-addons-bootstrap_content index 571e04e71896b..385d2373d8fc8 100644 --- a/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_bucket_object_minimal-ipv6.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_bucket_object_minimal-ipv6.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: c32be9882256ec9500e49d336c21e0806c7fe4864520d8b8b1786ca7096f07f6 + manifestHash: 3cf1582047c2c30d845ef83713c6d6c1c1fe3ba2907b30b3432ceb7cc1720255 name: kops-controller.addons.k8s.io needsRollingUpdate: control-plane selector: @@ -40,7 +40,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml - manifestHash: 7934f73e3a3e56972beeb971f6cb30c5479cb97a6917a1d5c1628b06642ebc2a + manifestHash: b1403524d1d9689e27a40cd661cb856a273684f8a1e8bed3cfb71eb80945b4e8 name: dns-controller.addons.k8s.io selector: k8s-addon: dns-controller.addons.k8s.io diff --git a/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_bucket_object_minimal-ipv6.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_bucket_object_minimal-ipv6.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content index f510c6b61f416..33dbb652090bd 100644 --- a/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_bucket_object_minimal-ipv6.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content +++ b/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_bucket_object_minimal-ipv6.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.22.0-beta.1 + version: v1.22.0-beta.2 name: dns-controller namespace: kube-system spec: @@ -24,7 +24,7 @@ spec: labels: k8s-addon: dns-controller.addons.k8s.io k8s-app: dns-controller - version: v1.22.0-beta.1 + version: v1.22.0-beta.2 spec: containers: - command: @@ -37,7 +37,7 @@ spec: env: - name: KUBERNETES_SERVICE_HOST value: 127.0.0.1 - image: k8s.gcr.io/kops/dns-controller:1.22.0-beta.1 + image: k8s.gcr.io/kops/dns-controller:1.22.0-beta.2 name: dns-controller resources: requests: diff --git a/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_bucket_object_minimal-ipv6.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content b/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_bucket_object_minimal-ipv6.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content index 397c4a4e10aae..42df240e11aea 100644 --- a/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_bucket_object_minimal-ipv6.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content +++ b/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_bucket_object_minimal-ipv6.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.22.0-beta.1 + version: v1.22.0-beta.2 name: kops-controller namespace: kube-system spec: @@ -37,7 +37,7 @@ spec: labels: k8s-addon: kops-controller.addons.k8s.io k8s-app: kops-controller - version: v1.22.0-beta.1 + version: v1.22.0-beta.2 spec: containers: - command: @@ -47,7 +47,7 @@ spec: env: - name: KUBERNETES_SERVICE_HOST value: 127.0.0.1 - image: k8s.gcr.io/kops/kops-controller:1.22.0-beta.1 + image: k8s.gcr.io/kops/kops-controller:1.22.0-beta.2 name: kops-controller resources: requests: diff --git a/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content b/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content index 4db818f31aaf6..c8ce8405ba0b6 100644 --- a/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content +++ b/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content @@ -10,7 +10,7 @@ spec: - --client-key=/secrets/client.key command: - /kube-apiserver-healthcheck - image: k8s.gcr.io/kops/kube-apiserver-healthcheck:1.22.0-beta.1 + image: k8s.gcr.io/kops/kube-apiserver-healthcheck:1.22.0-beta.2 livenessProbe: httpGet: host: 127.0.0.1 diff --git a/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_bucket_object_minimal-warmpool.example.com-addons-bootstrap_content b/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_bucket_object_minimal-warmpool.example.com-addons-bootstrap_content index c37dfe6c43885..230a2e7277ae9 100644 --- a/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_bucket_object_minimal-warmpool.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_bucket_object_minimal-warmpool.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: 6cb69d411862a0fb9db69744bd4c19a8e45f0e5b2c12beb476037b0f0d609cab + manifestHash: 6e7feacb73d6730a2aae66927ba0c1de70bfbbb61f408df6a408db43ff418920 name: kops-controller.addons.k8s.io needsRollingUpdate: control-plane selector: @@ -40,7 +40,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml - manifestHash: 7934f73e3a3e56972beeb971f6cb30c5479cb97a6917a1d5c1628b06642ebc2a + manifestHash: b1403524d1d9689e27a40cd661cb856a273684f8a1e8bed3cfb71eb80945b4e8 name: dns-controller.addons.k8s.io selector: k8s-addon: dns-controller.addons.k8s.io diff --git a/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_bucket_object_minimal-warmpool.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_bucket_object_minimal-warmpool.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content index f510c6b61f416..33dbb652090bd 100644 --- a/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_bucket_object_minimal-warmpool.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content +++ b/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_bucket_object_minimal-warmpool.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.22.0-beta.1 + version: v1.22.0-beta.2 name: dns-controller namespace: kube-system spec: @@ -24,7 +24,7 @@ spec: labels: k8s-addon: dns-controller.addons.k8s.io k8s-app: dns-controller - version: v1.22.0-beta.1 + version: v1.22.0-beta.2 spec: containers: - command: @@ -37,7 +37,7 @@ spec: env: - name: KUBERNETES_SERVICE_HOST value: 127.0.0.1 - image: k8s.gcr.io/kops/dns-controller:1.22.0-beta.1 + image: k8s.gcr.io/kops/dns-controller:1.22.0-beta.2 name: dns-controller resources: requests: diff --git a/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_bucket_object_minimal-warmpool.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content b/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_bucket_object_minimal-warmpool.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content index c71e5e66a54a1..3c210c95947a0 100644 --- a/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_bucket_object_minimal-warmpool.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content +++ b/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_bucket_object_minimal-warmpool.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.22.0-beta.1 + version: v1.22.0-beta.2 name: kops-controller namespace: kube-system spec: @@ -37,7 +37,7 @@ spec: labels: k8s-addon: kops-controller.addons.k8s.io k8s-app: kops-controller - version: v1.22.0-beta.1 + version: v1.22.0-beta.2 spec: containers: - command: @@ -47,7 +47,7 @@ spec: env: - name: KUBERNETES_SERVICE_HOST value: 127.0.0.1 - image: k8s.gcr.io/kops/kops-controller:1.22.0-beta.1 + image: k8s.gcr.io/kops/kops-controller:1.22.0-beta.2 name: kops-controller resources: requests: diff --git a/tests/integration/update_cluster/minimal/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content b/tests/integration/update_cluster/minimal/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content index 4db818f31aaf6..c8ce8405ba0b6 100644 --- a/tests/integration/update_cluster/minimal/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content +++ b/tests/integration/update_cluster/minimal/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content @@ -10,7 +10,7 @@ spec: - --client-key=/secrets/client.key command: - /kube-apiserver-healthcheck - image: k8s.gcr.io/kops/kube-apiserver-healthcheck:1.22.0-beta.1 + image: k8s.gcr.io/kops/kube-apiserver-healthcheck:1.22.0-beta.2 livenessProbe: httpGet: host: 127.0.0.1 diff --git a/tests/integration/update_cluster/minimal/data/aws_s3_bucket_object_minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/minimal/data/aws_s3_bucket_object_minimal.example.com-addons-bootstrap_content index 4f7c9e45c154b..c89646eb792a5 100644 --- a/tests/integration/update_cluster/minimal/data/aws_s3_bucket_object_minimal.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/minimal/data/aws_s3_bucket_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: a42582d604eb0c80c96d6e52fb9c4dd9d5aa09a54437b017ff1c0d2fc41a1793 + manifestHash: dcf0336d3677bfaac81529e17263ff30dd37276592d8329027ef4815ac6973c8 name: kops-controller.addons.k8s.io needsRollingUpdate: control-plane selector: @@ -40,7 +40,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml - manifestHash: 7934f73e3a3e56972beeb971f6cb30c5479cb97a6917a1d5c1628b06642ebc2a + manifestHash: b1403524d1d9689e27a40cd661cb856a273684f8a1e8bed3cfb71eb80945b4e8 name: dns-controller.addons.k8s.io selector: k8s-addon: dns-controller.addons.k8s.io diff --git a/tests/integration/update_cluster/minimal/data/aws_s3_bucket_object_minimal.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/minimal/data/aws_s3_bucket_object_minimal.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content index f510c6b61f416..33dbb652090bd 100644 --- a/tests/integration/update_cluster/minimal/data/aws_s3_bucket_object_minimal.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content +++ b/tests/integration/update_cluster/minimal/data/aws_s3_bucket_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.22.0-beta.1 + version: v1.22.0-beta.2 name: dns-controller namespace: kube-system spec: @@ -24,7 +24,7 @@ spec: labels: k8s-addon: dns-controller.addons.k8s.io k8s-app: dns-controller - version: v1.22.0-beta.1 + version: v1.22.0-beta.2 spec: containers: - command: @@ -37,7 +37,7 @@ spec: env: - name: KUBERNETES_SERVICE_HOST value: 127.0.0.1 - image: k8s.gcr.io/kops/dns-controller:1.22.0-beta.1 + image: k8s.gcr.io/kops/dns-controller:1.22.0-beta.2 name: dns-controller resources: requests: diff --git a/tests/integration/update_cluster/minimal/data/aws_s3_bucket_object_minimal.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content b/tests/integration/update_cluster/minimal/data/aws_s3_bucket_object_minimal.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content index b01e7a070b03d..f9e213909c931 100644 --- a/tests/integration/update_cluster/minimal/data/aws_s3_bucket_object_minimal.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content +++ b/tests/integration/update_cluster/minimal/data/aws_s3_bucket_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.22.0-beta.1 + version: v1.22.0-beta.2 name: kops-controller namespace: kube-system spec: @@ -37,7 +37,7 @@ spec: labels: k8s-addon: kops-controller.addons.k8s.io k8s-app: kops-controller - version: v1.22.0-beta.1 + version: v1.22.0-beta.2 spec: containers: - command: @@ -47,7 +47,7 @@ spec: env: - name: KUBERNETES_SERVICE_HOST value: 127.0.0.1 - image: k8s.gcr.io/kops/kops-controller:1.22.0-beta.1 + image: k8s.gcr.io/kops/kops-controller:1.22.0-beta.2 name: kops-controller resources: requests: diff --git a/tests/integration/update_cluster/minimal_gce/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content b/tests/integration/update_cluster/minimal_gce/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content index 4db818f31aaf6..c8ce8405ba0b6 100644 --- a/tests/integration/update_cluster/minimal_gce/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content +++ b/tests/integration/update_cluster/minimal_gce/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content @@ -10,7 +10,7 @@ spec: - --client-key=/secrets/client.key command: - /kube-apiserver-healthcheck - image: k8s.gcr.io/kops/kube-apiserver-healthcheck:1.22.0-beta.1 + image: k8s.gcr.io/kops/kube-apiserver-healthcheck:1.22.0-beta.2 livenessProbe: httpGet: host: 127.0.0.1 diff --git a/tests/integration/update_cluster/minimal_gce/data/aws_s3_bucket_object_minimal-gce.example.com-addons-bootstrap_content b/tests/integration/update_cluster/minimal_gce/data/aws_s3_bucket_object_minimal-gce.example.com-addons-bootstrap_content index 544d9ced1b265..baa9bb075ec0c 100644 --- a/tests/integration/update_cluster/minimal_gce/data/aws_s3_bucket_object_minimal-gce.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/minimal_gce/data/aws_s3_bucket_object_minimal-gce.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: 85be2b3b73808b5610873b0470e9254b219ef2f4acf216bf165b9e417b2f5b55 + manifestHash: 6b424dbd994fc62070aa8e8e887b38aac3fa3b018f77249f0e6481f220addeb5 name: kops-controller.addons.k8s.io needsRollingUpdate: control-plane selector: @@ -47,7 +47,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml - manifestHash: 326a5316d78145e6bf7cec833d1be9df56e12877bca6bb8b9b883f353a2b27a6 + manifestHash: 65d8e7398cc391c6250c399c12f0d1f036a897e0b1a9bc3c78242b7c99ae1e68 name: dns-controller.addons.k8s.io selector: k8s-addon: dns-controller.addons.k8s.io diff --git a/tests/integration/update_cluster/minimal_gce/data/aws_s3_bucket_object_minimal-gce.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/minimal_gce/data/aws_s3_bucket_object_minimal-gce.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content index 55471af6d8f69..9826b70bd228e 100644 --- a/tests/integration/update_cluster/minimal_gce/data/aws_s3_bucket_object_minimal-gce.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content +++ b/tests/integration/update_cluster/minimal_gce/data/aws_s3_bucket_object_minimal-gce.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.22.0-beta.1 + version: v1.22.0-beta.2 name: dns-controller namespace: kube-system spec: @@ -24,7 +24,7 @@ spec: labels: k8s-addon: dns-controller.addons.k8s.io k8s-app: dns-controller - version: v1.22.0-beta.1 + version: v1.22.0-beta.2 spec: containers: - command: @@ -37,7 +37,7 @@ spec: env: - name: KUBERNETES_SERVICE_HOST value: 127.0.0.1 - image: k8s.gcr.io/kops/dns-controller:1.22.0-beta.1 + image: k8s.gcr.io/kops/dns-controller:1.22.0-beta.2 name: dns-controller resources: requests: diff --git a/tests/integration/update_cluster/minimal_gce/data/aws_s3_bucket_object_minimal-gce.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content b/tests/integration/update_cluster/minimal_gce/data/aws_s3_bucket_object_minimal-gce.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content index 0aa6bef562c5b..b13214026c5f3 100644 --- a/tests/integration/update_cluster/minimal_gce/data/aws_s3_bucket_object_minimal-gce.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content +++ b/tests/integration/update_cluster/minimal_gce/data/aws_s3_bucket_object_minimal-gce.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.22.0-beta.1 + version: v1.22.0-beta.2 name: kops-controller namespace: kube-system spec: @@ -35,7 +35,7 @@ spec: labels: k8s-addon: kops-controller.addons.k8s.io k8s-app: kops-controller - version: v1.22.0-beta.1 + version: v1.22.0-beta.2 spec: containers: - command: @@ -45,7 +45,7 @@ spec: env: - name: KUBERNETES_SERVICE_HOST value: 127.0.0.1 - image: k8s.gcr.io/kops/kops-controller:1.22.0-beta.1 + image: k8s.gcr.io/kops/kops-controller:1.22.0-beta.2 name: kops-controller resources: requests: diff --git a/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content b/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content index 4db818f31aaf6..c8ce8405ba0b6 100644 --- a/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content +++ b/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content @@ -10,7 +10,7 @@ spec: - --client-key=/secrets/client.key command: - /kube-apiserver-healthcheck - image: k8s.gcr.io/kops/kube-apiserver-healthcheck:1.22.0-beta.1 + image: k8s.gcr.io/kops/kube-apiserver-healthcheck:1.22.0-beta.2 livenessProbe: httpGet: host: 127.0.0.1 diff --git a/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_bucket_object_minimal-gce-private.example.com-addons-bootstrap_content b/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_bucket_object_minimal-gce-private.example.com-addons-bootstrap_content index 855fa43cead69..263966ec47440 100644 --- a/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_bucket_object_minimal-gce-private.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_bucket_object_minimal-gce-private.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: b118812beb085c00f9b6a5b5aee42330a46796c6061a267f94da5f878294aa6b + manifestHash: 96d64fcb7e21ed42583879f805423481fcb2f60e581cff40a4e4630445275ad2 name: kops-controller.addons.k8s.io needsRollingUpdate: control-plane selector: @@ -47,7 +47,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml - manifestHash: 326a5316d78145e6bf7cec833d1be9df56e12877bca6bb8b9b883f353a2b27a6 + manifestHash: 65d8e7398cc391c6250c399c12f0d1f036a897e0b1a9bc3c78242b7c99ae1e68 name: dns-controller.addons.k8s.io selector: k8s-addon: dns-controller.addons.k8s.io diff --git a/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_bucket_object_minimal-gce-private.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_bucket_object_minimal-gce-private.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content index 55471af6d8f69..9826b70bd228e 100644 --- a/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_bucket_object_minimal-gce-private.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content +++ b/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_bucket_object_minimal-gce-private.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.22.0-beta.1 + version: v1.22.0-beta.2 name: dns-controller namespace: kube-system spec: @@ -24,7 +24,7 @@ spec: labels: k8s-addon: dns-controller.addons.k8s.io k8s-app: dns-controller - version: v1.22.0-beta.1 + version: v1.22.0-beta.2 spec: containers: - command: @@ -37,7 +37,7 @@ spec: env: - name: KUBERNETES_SERVICE_HOST value: 127.0.0.1 - image: k8s.gcr.io/kops/dns-controller:1.22.0-beta.1 + image: k8s.gcr.io/kops/dns-controller:1.22.0-beta.2 name: dns-controller resources: requests: diff --git a/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_bucket_object_minimal-gce-private.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content b/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_bucket_object_minimal-gce-private.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content index 3d21faa197c2c..5651742ab62a8 100644 --- a/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_bucket_object_minimal-gce-private.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content +++ b/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_bucket_object_minimal-gce-private.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.22.0-beta.1 + version: v1.22.0-beta.2 name: kops-controller namespace: kube-system spec: @@ -35,7 +35,7 @@ spec: labels: k8s-addon: kops-controller.addons.k8s.io k8s-app: kops-controller - version: v1.22.0-beta.1 + version: v1.22.0-beta.2 spec: containers: - command: @@ -45,7 +45,7 @@ spec: env: - name: KUBERNETES_SERVICE_HOST value: 127.0.0.1 - image: k8s.gcr.io/kops/kops-controller:1.22.0-beta.1 + image: k8s.gcr.io/kops/kops-controller:1.22.0-beta.2 name: kops-controller resources: requests: diff --git a/tests/integration/update_cluster/minimal_gossip/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content b/tests/integration/update_cluster/minimal_gossip/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content index 4db818f31aaf6..c8ce8405ba0b6 100644 --- a/tests/integration/update_cluster/minimal_gossip/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content +++ b/tests/integration/update_cluster/minimal_gossip/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content @@ -10,7 +10,7 @@ spec: - --client-key=/secrets/client.key command: - /kube-apiserver-healthcheck - image: k8s.gcr.io/kops/kube-apiserver-healthcheck:1.22.0-beta.1 + image: k8s.gcr.io/kops/kube-apiserver-healthcheck:1.22.0-beta.2 livenessProbe: httpGet: host: 127.0.0.1 diff --git a/tests/integration/update_cluster/minimal_gossip/data/aws_s3_bucket_object_minimal.k8s.local-addons-bootstrap_content b/tests/integration/update_cluster/minimal_gossip/data/aws_s3_bucket_object_minimal.k8s.local-addons-bootstrap_content index 06f180994e9fd..03c1180f92215 100644 --- a/tests/integration/update_cluster/minimal_gossip/data/aws_s3_bucket_object_minimal.k8s.local-addons-bootstrap_content +++ b/tests/integration/update_cluster/minimal_gossip/data/aws_s3_bucket_object_minimal.k8s.local-addons-bootstrap_content @@ -6,7 +6,7 @@ spec: addons: - id: k8s-1.16 manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml - manifestHash: b5948b283fa94a70bbb3119cc62fe6d5c81ee836e8ef04b357f1efb98e288abc + manifestHash: 56494571e982b7e4b5cb67017c7543667bae181c1c0c13d01d26f5ae87b41348 name: kops-controller.addons.k8s.io needsRollingUpdate: control-plane selector: @@ -40,7 +40,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml - manifestHash: 56805eedcb057272fe388d9882390778e7b3c0c5653ce4f860a9d5272dc520c0 + manifestHash: 31f239e42865cd5d0fdac61e9710ba165b9a9ad271a80fcd9d53fcd2c55c6e78 name: dns-controller.addons.k8s.io selector: k8s-addon: dns-controller.addons.k8s.io diff --git a/tests/integration/update_cluster/minimal_gossip/data/aws_s3_bucket_object_minimal.k8s.local-addons-dns-controller.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/minimal_gossip/data/aws_s3_bucket_object_minimal.k8s.local-addons-dns-controller.addons.k8s.io-k8s-1.12_content index ac87424bc10b0..f3b1bfb0daff1 100644 --- a/tests/integration/update_cluster/minimal_gossip/data/aws_s3_bucket_object_minimal.k8s.local-addons-dns-controller.addons.k8s.io-k8s-1.12_content +++ b/tests/integration/update_cluster/minimal_gossip/data/aws_s3_bucket_object_minimal.k8s.local-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.22.0-beta.1 + version: v1.22.0-beta.2 name: dns-controller namespace: kube-system spec: @@ -24,7 +24,7 @@ spec: labels: k8s-addon: dns-controller.addons.k8s.io k8s-app: dns-controller - version: v1.22.0-beta.1 + version: v1.22.0-beta.2 spec: containers: - command: @@ -40,7 +40,7 @@ spec: env: - name: KUBERNETES_SERVICE_HOST value: 127.0.0.1 - image: k8s.gcr.io/kops/dns-controller:1.22.0-beta.1 + image: k8s.gcr.io/kops/dns-controller:1.22.0-beta.2 name: dns-controller resources: requests: diff --git a/tests/integration/update_cluster/minimal_gossip/data/aws_s3_bucket_object_minimal.k8s.local-addons-kops-controller.addons.k8s.io-k8s-1.16_content b/tests/integration/update_cluster/minimal_gossip/data/aws_s3_bucket_object_minimal.k8s.local-addons-kops-controller.addons.k8s.io-k8s-1.16_content index 97e4189406f56..2dc25d8fde345 100644 --- a/tests/integration/update_cluster/minimal_gossip/data/aws_s3_bucket_object_minimal.k8s.local-addons-kops-controller.addons.k8s.io-k8s-1.16_content +++ b/tests/integration/update_cluster/minimal_gossip/data/aws_s3_bucket_object_minimal.k8s.local-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.22.0-beta.1 + version: v1.22.0-beta.2 name: kops-controller namespace: kube-system spec: @@ -37,7 +37,7 @@ spec: labels: k8s-addon: kops-controller.addons.k8s.io k8s-app: kops-controller - version: v1.22.0-beta.1 + version: v1.22.0-beta.2 spec: containers: - command: @@ -47,7 +47,7 @@ spec: env: - name: KUBERNETES_SERVICE_HOST value: 127.0.0.1 - image: k8s.gcr.io/kops/kops-controller:1.22.0-beta.1 + image: k8s.gcr.io/kops/kops-controller:1.22.0-beta.2 name: kops-controller resources: requests: diff --git a/tests/integration/update_cluster/mixed_instances/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content b/tests/integration/update_cluster/mixed_instances/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content index 4db818f31aaf6..c8ce8405ba0b6 100644 --- a/tests/integration/update_cluster/mixed_instances/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content +++ b/tests/integration/update_cluster/mixed_instances/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content @@ -10,7 +10,7 @@ spec: - --client-key=/secrets/client.key command: - /kube-apiserver-healthcheck - image: k8s.gcr.io/kops/kube-apiserver-healthcheck:1.22.0-beta.1 + image: k8s.gcr.io/kops/kube-apiserver-healthcheck:1.22.0-beta.2 livenessProbe: httpGet: host: 127.0.0.1 diff --git a/tests/integration/update_cluster/mixed_instances/data/aws_s3_bucket_object_mixedinstances.example.com-addons-bootstrap_content b/tests/integration/update_cluster/mixed_instances/data/aws_s3_bucket_object_mixedinstances.example.com-addons-bootstrap_content index 64d4562c50ed6..d36b31db0165c 100644 --- a/tests/integration/update_cluster/mixed_instances/data/aws_s3_bucket_object_mixedinstances.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/mixed_instances/data/aws_s3_bucket_object_mixedinstances.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: 93a523c922621672ed9dc5858cd7b8d3213e118fbd1e137c98affc3f2d0b3a52 + manifestHash: 23ee5456b0536da775cf21e45fcdfbc52bd2c862234535dd859d4a6094ef5fe2 name: kops-controller.addons.k8s.io needsRollingUpdate: control-plane selector: @@ -40,7 +40,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml - manifestHash: 7934f73e3a3e56972beeb971f6cb30c5479cb97a6917a1d5c1628b06642ebc2a + manifestHash: b1403524d1d9689e27a40cd661cb856a273684f8a1e8bed3cfb71eb80945b4e8 name: dns-controller.addons.k8s.io selector: k8s-addon: dns-controller.addons.k8s.io diff --git a/tests/integration/update_cluster/mixed_instances/data/aws_s3_bucket_object_mixedinstances.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/mixed_instances/data/aws_s3_bucket_object_mixedinstances.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content index f510c6b61f416..33dbb652090bd 100644 --- a/tests/integration/update_cluster/mixed_instances/data/aws_s3_bucket_object_mixedinstances.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content +++ b/tests/integration/update_cluster/mixed_instances/data/aws_s3_bucket_object_mixedinstances.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.22.0-beta.1 + version: v1.22.0-beta.2 name: dns-controller namespace: kube-system spec: @@ -24,7 +24,7 @@ spec: labels: k8s-addon: dns-controller.addons.k8s.io k8s-app: dns-controller - version: v1.22.0-beta.1 + version: v1.22.0-beta.2 spec: containers: - command: @@ -37,7 +37,7 @@ spec: env: - name: KUBERNETES_SERVICE_HOST value: 127.0.0.1 - image: k8s.gcr.io/kops/dns-controller:1.22.0-beta.1 + image: k8s.gcr.io/kops/dns-controller:1.22.0-beta.2 name: dns-controller resources: requests: diff --git a/tests/integration/update_cluster/mixed_instances/data/aws_s3_bucket_object_mixedinstances.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content b/tests/integration/update_cluster/mixed_instances/data/aws_s3_bucket_object_mixedinstances.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content index 17e6fceefb2e9..a55042b48d14a 100644 --- a/tests/integration/update_cluster/mixed_instances/data/aws_s3_bucket_object_mixedinstances.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content +++ b/tests/integration/update_cluster/mixed_instances/data/aws_s3_bucket_object_mixedinstances.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.22.0-beta.1 + version: v1.22.0-beta.2 name: kops-controller namespace: kube-system spec: @@ -37,7 +37,7 @@ spec: labels: k8s-addon: kops-controller.addons.k8s.io k8s-app: kops-controller - version: v1.22.0-beta.1 + version: v1.22.0-beta.2 spec: containers: - command: @@ -47,7 +47,7 @@ spec: env: - name: KUBERNETES_SERVICE_HOST value: 127.0.0.1 - image: k8s.gcr.io/kops/kops-controller:1.22.0-beta.1 + image: k8s.gcr.io/kops/kops-controller:1.22.0-beta.2 name: kops-controller resources: requests: diff --git a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content index 4db818f31aaf6..c8ce8405ba0b6 100644 --- a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content +++ b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content @@ -10,7 +10,7 @@ spec: - --client-key=/secrets/client.key command: - /kube-apiserver-healthcheck - image: k8s.gcr.io/kops/kube-apiserver-healthcheck:1.22.0-beta.1 + image: k8s.gcr.io/kops/kube-apiserver-healthcheck:1.22.0-beta.2 livenessProbe: httpGet: host: 127.0.0.1 diff --git a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_bucket_object_mixedinstances.example.com-addons-bootstrap_content b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_bucket_object_mixedinstances.example.com-addons-bootstrap_content index 64d4562c50ed6..d36b31db0165c 100644 --- a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_bucket_object_mixedinstances.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_bucket_object_mixedinstances.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: 93a523c922621672ed9dc5858cd7b8d3213e118fbd1e137c98affc3f2d0b3a52 + manifestHash: 23ee5456b0536da775cf21e45fcdfbc52bd2c862234535dd859d4a6094ef5fe2 name: kops-controller.addons.k8s.io needsRollingUpdate: control-plane selector: @@ -40,7 +40,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml - manifestHash: 7934f73e3a3e56972beeb971f6cb30c5479cb97a6917a1d5c1628b06642ebc2a + manifestHash: b1403524d1d9689e27a40cd661cb856a273684f8a1e8bed3cfb71eb80945b4e8 name: dns-controller.addons.k8s.io selector: k8s-addon: dns-controller.addons.k8s.io diff --git a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_bucket_object_mixedinstances.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_bucket_object_mixedinstances.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content index f510c6b61f416..33dbb652090bd 100644 --- a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_bucket_object_mixedinstances.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content +++ b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_bucket_object_mixedinstances.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.22.0-beta.1 + version: v1.22.0-beta.2 name: dns-controller namespace: kube-system spec: @@ -24,7 +24,7 @@ spec: labels: k8s-addon: dns-controller.addons.k8s.io k8s-app: dns-controller - version: v1.22.0-beta.1 + version: v1.22.0-beta.2 spec: containers: - command: @@ -37,7 +37,7 @@ spec: env: - name: KUBERNETES_SERVICE_HOST value: 127.0.0.1 - image: k8s.gcr.io/kops/dns-controller:1.22.0-beta.1 + image: k8s.gcr.io/kops/dns-controller:1.22.0-beta.2 name: dns-controller resources: requests: diff --git a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_bucket_object_mixedinstances.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_bucket_object_mixedinstances.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content index 17e6fceefb2e9..a55042b48d14a 100644 --- a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_bucket_object_mixedinstances.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content +++ b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_bucket_object_mixedinstances.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.22.0-beta.1 + version: v1.22.0-beta.2 name: kops-controller namespace: kube-system spec: @@ -37,7 +37,7 @@ spec: labels: k8s-addon: kops-controller.addons.k8s.io k8s-app: kops-controller - version: v1.22.0-beta.1 + version: v1.22.0-beta.2 spec: containers: - command: @@ -47,7 +47,7 @@ spec: env: - name: KUBERNETES_SERVICE_HOST value: 127.0.0.1 - image: k8s.gcr.io/kops/kops-controller:1.22.0-beta.1 + image: k8s.gcr.io/kops/kops-controller:1.22.0-beta.2 name: kops-controller resources: requests: diff --git a/tests/integration/update_cluster/nth_sqs_resources/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content b/tests/integration/update_cluster/nth_sqs_resources/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content index 4db818f31aaf6..c8ce8405ba0b6 100644 --- a/tests/integration/update_cluster/nth_sqs_resources/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content +++ b/tests/integration/update_cluster/nth_sqs_resources/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content @@ -10,7 +10,7 @@ spec: - --client-key=/secrets/client.key command: - /kube-apiserver-healthcheck - image: k8s.gcr.io/kops/kube-apiserver-healthcheck:1.22.0-beta.1 + image: k8s.gcr.io/kops/kube-apiserver-healthcheck:1.22.0-beta.2 livenessProbe: httpGet: host: 127.0.0.1 diff --git a/tests/integration/update_cluster/nth_sqs_resources/data/aws_s3_bucket_object_nthsqsresources.longclustername.example.com-addons-bootstrap_content b/tests/integration/update_cluster/nth_sqs_resources/data/aws_s3_bucket_object_nthsqsresources.longclustername.example.com-addons-bootstrap_content index ee933b6e590a7..d3bf8839c1a9c 100644 --- a/tests/integration/update_cluster/nth_sqs_resources/data/aws_s3_bucket_object_nthsqsresources.longclustername.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/nth_sqs_resources/data/aws_s3_bucket_object_nthsqsresources.longclustername.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: c37e82ea928c1116899a0318b0fa7a8e68b2ec094aa5ac91b9e485b327da56a4 + manifestHash: 2a252fad5b1444076ba0dde676c93635200d174f566833bbdd499c7d01ec753f name: kops-controller.addons.k8s.io needsRollingUpdate: control-plane selector: @@ -40,7 +40,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml - manifestHash: 7934f73e3a3e56972beeb971f6cb30c5479cb97a6917a1d5c1628b06642ebc2a + manifestHash: b1403524d1d9689e27a40cd661cb856a273684f8a1e8bed3cfb71eb80945b4e8 name: dns-controller.addons.k8s.io selector: k8s-addon: dns-controller.addons.k8s.io diff --git a/tests/integration/update_cluster/nth_sqs_resources/data/aws_s3_bucket_object_nthsqsresources.longclustername.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/nth_sqs_resources/data/aws_s3_bucket_object_nthsqsresources.longclustername.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content index f510c6b61f416..33dbb652090bd 100644 --- a/tests/integration/update_cluster/nth_sqs_resources/data/aws_s3_bucket_object_nthsqsresources.longclustername.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content +++ b/tests/integration/update_cluster/nth_sqs_resources/data/aws_s3_bucket_object_nthsqsresources.longclustername.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.22.0-beta.1 + version: v1.22.0-beta.2 name: dns-controller namespace: kube-system spec: @@ -24,7 +24,7 @@ spec: labels: k8s-addon: dns-controller.addons.k8s.io k8s-app: dns-controller - version: v1.22.0-beta.1 + version: v1.22.0-beta.2 spec: containers: - command: @@ -37,7 +37,7 @@ spec: env: - name: KUBERNETES_SERVICE_HOST value: 127.0.0.1 - image: k8s.gcr.io/kops/dns-controller:1.22.0-beta.1 + image: k8s.gcr.io/kops/dns-controller:1.22.0-beta.2 name: dns-controller resources: requests: diff --git a/tests/integration/update_cluster/nth_sqs_resources/data/aws_s3_bucket_object_nthsqsresources.longclustername.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content b/tests/integration/update_cluster/nth_sqs_resources/data/aws_s3_bucket_object_nthsqsresources.longclustername.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content index 66ceffd3fbd11..e3e57c92c1123 100644 --- a/tests/integration/update_cluster/nth_sqs_resources/data/aws_s3_bucket_object_nthsqsresources.longclustername.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content +++ b/tests/integration/update_cluster/nth_sqs_resources/data/aws_s3_bucket_object_nthsqsresources.longclustername.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.22.0-beta.1 + version: v1.22.0-beta.2 name: kops-controller namespace: kube-system spec: @@ -37,7 +37,7 @@ spec: labels: k8s-addon: kops-controller.addons.k8s.io k8s-app: kops-controller - version: v1.22.0-beta.1 + version: v1.22.0-beta.2 spec: containers: - command: @@ -47,7 +47,7 @@ spec: env: - name: KUBERNETES_SERVICE_HOST value: 127.0.0.1 - image: k8s.gcr.io/kops/kops-controller:1.22.0-beta.1 + image: k8s.gcr.io/kops/kops-controller:1.22.0-beta.2 name: kops-controller resources: requests: diff --git a/tests/integration/update_cluster/nvidia/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content b/tests/integration/update_cluster/nvidia/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content index 4db818f31aaf6..c8ce8405ba0b6 100644 --- a/tests/integration/update_cluster/nvidia/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content +++ b/tests/integration/update_cluster/nvidia/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content @@ -10,7 +10,7 @@ spec: - --client-key=/secrets/client.key command: - /kube-apiserver-healthcheck - image: k8s.gcr.io/kops/kube-apiserver-healthcheck:1.22.0-beta.1 + image: k8s.gcr.io/kops/kube-apiserver-healthcheck:1.22.0-beta.2 livenessProbe: httpGet: host: 127.0.0.1 diff --git a/tests/integration/update_cluster/nvidia/data/aws_s3_bucket_object_minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/nvidia/data/aws_s3_bucket_object_minimal.example.com-addons-bootstrap_content index f2a7690524462..12b88899e34af 100644 --- a/tests/integration/update_cluster/nvidia/data/aws_s3_bucket_object_minimal.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/nvidia/data/aws_s3_bucket_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: a42582d604eb0c80c96d6e52fb9c4dd9d5aa09a54437b017ff1c0d2fc41a1793 + manifestHash: dcf0336d3677bfaac81529e17263ff30dd37276592d8329027ef4815ac6973c8 name: kops-controller.addons.k8s.io needsRollingUpdate: control-plane selector: @@ -40,7 +40,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml - manifestHash: 7934f73e3a3e56972beeb971f6cb30c5479cb97a6917a1d5c1628b06642ebc2a + manifestHash: b1403524d1d9689e27a40cd661cb856a273684f8a1e8bed3cfb71eb80945b4e8 name: dns-controller.addons.k8s.io selector: k8s-addon: dns-controller.addons.k8s.io diff --git a/tests/integration/update_cluster/nvidia/data/aws_s3_bucket_object_minimal.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/nvidia/data/aws_s3_bucket_object_minimal.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content index f510c6b61f416..33dbb652090bd 100644 --- a/tests/integration/update_cluster/nvidia/data/aws_s3_bucket_object_minimal.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content +++ b/tests/integration/update_cluster/nvidia/data/aws_s3_bucket_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.22.0-beta.1 + version: v1.22.0-beta.2 name: dns-controller namespace: kube-system spec: @@ -24,7 +24,7 @@ spec: labels: k8s-addon: dns-controller.addons.k8s.io k8s-app: dns-controller - version: v1.22.0-beta.1 + version: v1.22.0-beta.2 spec: containers: - command: @@ -37,7 +37,7 @@ spec: env: - name: KUBERNETES_SERVICE_HOST value: 127.0.0.1 - image: k8s.gcr.io/kops/dns-controller:1.22.0-beta.1 + image: k8s.gcr.io/kops/dns-controller:1.22.0-beta.2 name: dns-controller resources: requests: diff --git a/tests/integration/update_cluster/nvidia/data/aws_s3_bucket_object_minimal.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content b/tests/integration/update_cluster/nvidia/data/aws_s3_bucket_object_minimal.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content index b01e7a070b03d..f9e213909c931 100644 --- a/tests/integration/update_cluster/nvidia/data/aws_s3_bucket_object_minimal.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content +++ b/tests/integration/update_cluster/nvidia/data/aws_s3_bucket_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.22.0-beta.1 + version: v1.22.0-beta.2 name: kops-controller namespace: kube-system spec: @@ -37,7 +37,7 @@ spec: labels: k8s-addon: kops-controller.addons.k8s.io k8s-app: kops-controller - version: v1.22.0-beta.1 + version: v1.22.0-beta.2 spec: containers: - command: @@ -47,7 +47,7 @@ spec: env: - name: KUBERNETES_SERVICE_HOST value: 127.0.0.1 - image: k8s.gcr.io/kops/kops-controller:1.22.0-beta.1 + image: k8s.gcr.io/kops/kops-controller:1.22.0-beta.2 name: kops-controller resources: requests: diff --git a/tests/integration/update_cluster/private-shared-ip/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content b/tests/integration/update_cluster/private-shared-ip/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content index 4db818f31aaf6..c8ce8405ba0b6 100644 --- a/tests/integration/update_cluster/private-shared-ip/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content +++ b/tests/integration/update_cluster/private-shared-ip/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content @@ -10,7 +10,7 @@ spec: - --client-key=/secrets/client.key command: - /kube-apiserver-healthcheck - image: k8s.gcr.io/kops/kube-apiserver-healthcheck:1.22.0-beta.1 + image: k8s.gcr.io/kops/kube-apiserver-healthcheck:1.22.0-beta.2 livenessProbe: httpGet: host: 127.0.0.1 diff --git a/tests/integration/update_cluster/private-shared-ip/data/aws_s3_bucket_object_private-shared-ip.example.com-addons-bootstrap_content b/tests/integration/update_cluster/private-shared-ip/data/aws_s3_bucket_object_private-shared-ip.example.com-addons-bootstrap_content index cf569b01987d3..747ccee3c04b1 100644 --- a/tests/integration/update_cluster/private-shared-ip/data/aws_s3_bucket_object_private-shared-ip.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/private-shared-ip/data/aws_s3_bucket_object_private-shared-ip.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: a450ab925000fa81ea5b6d3da64269264b2c9e7047b4b6ec3f558dc1655c0541 + manifestHash: 2607334098e81d635019ef4c555a543617f478a01aa6175086541e9cd61df1e2 name: kops-controller.addons.k8s.io needsRollingUpdate: control-plane selector: @@ -40,7 +40,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml - manifestHash: 7934f73e3a3e56972beeb971f6cb30c5479cb97a6917a1d5c1628b06642ebc2a + manifestHash: b1403524d1d9689e27a40cd661cb856a273684f8a1e8bed3cfb71eb80945b4e8 name: dns-controller.addons.k8s.io selector: k8s-addon: dns-controller.addons.k8s.io diff --git a/tests/integration/update_cluster/private-shared-ip/data/aws_s3_bucket_object_private-shared-ip.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/private-shared-ip/data/aws_s3_bucket_object_private-shared-ip.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content index f510c6b61f416..33dbb652090bd 100644 --- a/tests/integration/update_cluster/private-shared-ip/data/aws_s3_bucket_object_private-shared-ip.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content +++ b/tests/integration/update_cluster/private-shared-ip/data/aws_s3_bucket_object_private-shared-ip.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.22.0-beta.1 + version: v1.22.0-beta.2 name: dns-controller namespace: kube-system spec: @@ -24,7 +24,7 @@ spec: labels: k8s-addon: dns-controller.addons.k8s.io k8s-app: dns-controller - version: v1.22.0-beta.1 + version: v1.22.0-beta.2 spec: containers: - command: @@ -37,7 +37,7 @@ spec: env: - name: KUBERNETES_SERVICE_HOST value: 127.0.0.1 - image: k8s.gcr.io/kops/dns-controller:1.22.0-beta.1 + image: k8s.gcr.io/kops/dns-controller:1.22.0-beta.2 name: dns-controller resources: requests: diff --git a/tests/integration/update_cluster/private-shared-ip/data/aws_s3_bucket_object_private-shared-ip.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content b/tests/integration/update_cluster/private-shared-ip/data/aws_s3_bucket_object_private-shared-ip.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content index 01ca585d1e77d..4452e8022e837 100644 --- a/tests/integration/update_cluster/private-shared-ip/data/aws_s3_bucket_object_private-shared-ip.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content +++ b/tests/integration/update_cluster/private-shared-ip/data/aws_s3_bucket_object_private-shared-ip.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.22.0-beta.1 + version: v1.22.0-beta.2 name: kops-controller namespace: kube-system spec: @@ -37,7 +37,7 @@ spec: labels: k8s-addon: kops-controller.addons.k8s.io k8s-app: kops-controller - version: v1.22.0-beta.1 + version: v1.22.0-beta.2 spec: containers: - command: @@ -47,7 +47,7 @@ spec: env: - name: KUBERNETES_SERVICE_HOST value: 127.0.0.1 - image: k8s.gcr.io/kops/kops-controller:1.22.0-beta.1 + image: k8s.gcr.io/kops/kops-controller:1.22.0-beta.2 name: kops-controller resources: requests: diff --git a/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content b/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content index 4db818f31aaf6..c8ce8405ba0b6 100644 --- a/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content +++ b/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content @@ -10,7 +10,7 @@ spec: - --client-key=/secrets/client.key command: - /kube-apiserver-healthcheck - image: k8s.gcr.io/kops/kube-apiserver-healthcheck:1.22.0-beta.1 + image: k8s.gcr.io/kops/kube-apiserver-healthcheck:1.22.0-beta.2 livenessProbe: httpGet: host: 127.0.0.1 diff --git a/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_bucket_object_private-shared-subnet.example.com-addons-bootstrap_content b/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_bucket_object_private-shared-subnet.example.com-addons-bootstrap_content index 8d85b6fde0800..fd6c6c8f2c749 100644 --- a/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_bucket_object_private-shared-subnet.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_bucket_object_private-shared-subnet.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: d2b17d12da1001086d6c39ebde7ce3c93d457a3e9a76725868225473fb161ee8 + manifestHash: b0c9855ba8670c132ca35cab1e674ed7d4906a5f684bf4a885ec3c178d641a01 name: kops-controller.addons.k8s.io needsRollingUpdate: control-plane selector: @@ -40,7 +40,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml - manifestHash: 7934f73e3a3e56972beeb971f6cb30c5479cb97a6917a1d5c1628b06642ebc2a + manifestHash: b1403524d1d9689e27a40cd661cb856a273684f8a1e8bed3cfb71eb80945b4e8 name: dns-controller.addons.k8s.io selector: k8s-addon: dns-controller.addons.k8s.io diff --git a/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_bucket_object_private-shared-subnet.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_bucket_object_private-shared-subnet.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content index f510c6b61f416..33dbb652090bd 100644 --- a/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_bucket_object_private-shared-subnet.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content +++ b/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_bucket_object_private-shared-subnet.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.22.0-beta.1 + version: v1.22.0-beta.2 name: dns-controller namespace: kube-system spec: @@ -24,7 +24,7 @@ spec: labels: k8s-addon: dns-controller.addons.k8s.io k8s-app: dns-controller - version: v1.22.0-beta.1 + version: v1.22.0-beta.2 spec: containers: - command: @@ -37,7 +37,7 @@ spec: env: - name: KUBERNETES_SERVICE_HOST value: 127.0.0.1 - image: k8s.gcr.io/kops/dns-controller:1.22.0-beta.1 + image: k8s.gcr.io/kops/dns-controller:1.22.0-beta.2 name: dns-controller resources: requests: diff --git a/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_bucket_object_private-shared-subnet.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content b/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_bucket_object_private-shared-subnet.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content index 06da7a0e43614..c40b62a8f715a 100644 --- a/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_bucket_object_private-shared-subnet.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content +++ b/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_bucket_object_private-shared-subnet.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.22.0-beta.1 + version: v1.22.0-beta.2 name: kops-controller namespace: kube-system spec: @@ -37,7 +37,7 @@ spec: labels: k8s-addon: kops-controller.addons.k8s.io k8s-app: kops-controller - version: v1.22.0-beta.1 + version: v1.22.0-beta.2 spec: containers: - command: @@ -47,7 +47,7 @@ spec: env: - name: KUBERNETES_SERVICE_HOST value: 127.0.0.1 - image: k8s.gcr.io/kops/kops-controller:1.22.0-beta.1 + image: k8s.gcr.io/kops/kops-controller:1.22.0-beta.2 name: kops-controller resources: requests: diff --git a/tests/integration/update_cluster/privatecalico/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content b/tests/integration/update_cluster/privatecalico/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content index 4db818f31aaf6..c8ce8405ba0b6 100644 --- a/tests/integration/update_cluster/privatecalico/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content +++ b/tests/integration/update_cluster/privatecalico/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content @@ -10,7 +10,7 @@ spec: - --client-key=/secrets/client.key command: - /kube-apiserver-healthcheck - image: k8s.gcr.io/kops/kube-apiserver-healthcheck:1.22.0-beta.1 + image: k8s.gcr.io/kops/kube-apiserver-healthcheck:1.22.0-beta.2 livenessProbe: httpGet: host: 127.0.0.1 diff --git a/tests/integration/update_cluster/privatecalico/data/aws_s3_bucket_object_privatecalico.example.com-addons-bootstrap_content b/tests/integration/update_cluster/privatecalico/data/aws_s3_bucket_object_privatecalico.example.com-addons-bootstrap_content index ae3cd68aaeb88..1f638f421aae1 100644 --- a/tests/integration/update_cluster/privatecalico/data/aws_s3_bucket_object_privatecalico.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/privatecalico/data/aws_s3_bucket_object_privatecalico.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: afe3dffdbcde14ffb620524d331a08ad7a22b761fad850a6f1eda985723f9683 + manifestHash: 675fc5566673e322c67c53b8e5130b322d95e9fa64bb50dc7375bac2db7e4568 name: kops-controller.addons.k8s.io needsRollingUpdate: control-plane selector: @@ -40,7 +40,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml - manifestHash: 7934f73e3a3e56972beeb971f6cb30c5479cb97a6917a1d5c1628b06642ebc2a + manifestHash: b1403524d1d9689e27a40cd661cb856a273684f8a1e8bed3cfb71eb80945b4e8 name: dns-controller.addons.k8s.io selector: k8s-addon: dns-controller.addons.k8s.io diff --git a/tests/integration/update_cluster/privatecalico/data/aws_s3_bucket_object_privatecalico.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/privatecalico/data/aws_s3_bucket_object_privatecalico.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content index f510c6b61f416..33dbb652090bd 100644 --- a/tests/integration/update_cluster/privatecalico/data/aws_s3_bucket_object_privatecalico.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content +++ b/tests/integration/update_cluster/privatecalico/data/aws_s3_bucket_object_privatecalico.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.22.0-beta.1 + version: v1.22.0-beta.2 name: dns-controller namespace: kube-system spec: @@ -24,7 +24,7 @@ spec: labels: k8s-addon: dns-controller.addons.k8s.io k8s-app: dns-controller - version: v1.22.0-beta.1 + version: v1.22.0-beta.2 spec: containers: - command: @@ -37,7 +37,7 @@ spec: env: - name: KUBERNETES_SERVICE_HOST value: 127.0.0.1 - image: k8s.gcr.io/kops/dns-controller:1.22.0-beta.1 + image: k8s.gcr.io/kops/dns-controller:1.22.0-beta.2 name: dns-controller resources: requests: diff --git a/tests/integration/update_cluster/privatecalico/data/aws_s3_bucket_object_privatecalico.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content b/tests/integration/update_cluster/privatecalico/data/aws_s3_bucket_object_privatecalico.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content index cdb19c525f894..c7bd5dd9333f5 100644 --- a/tests/integration/update_cluster/privatecalico/data/aws_s3_bucket_object_privatecalico.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content +++ b/tests/integration/update_cluster/privatecalico/data/aws_s3_bucket_object_privatecalico.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.22.0-beta.1 + version: v1.22.0-beta.2 name: kops-controller namespace: kube-system spec: @@ -37,7 +37,7 @@ spec: labels: k8s-addon: kops-controller.addons.k8s.io k8s-app: kops-controller - version: v1.22.0-beta.1 + version: v1.22.0-beta.2 spec: containers: - command: @@ -47,7 +47,7 @@ spec: env: - name: KUBERNETES_SERVICE_HOST value: 127.0.0.1 - image: k8s.gcr.io/kops/kops-controller:1.22.0-beta.1 + image: k8s.gcr.io/kops/kops-controller:1.22.0-beta.2 name: kops-controller resources: requests: diff --git a/tests/integration/update_cluster/privatecanal/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content b/tests/integration/update_cluster/privatecanal/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content index 4db818f31aaf6..c8ce8405ba0b6 100644 --- a/tests/integration/update_cluster/privatecanal/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content +++ b/tests/integration/update_cluster/privatecanal/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content @@ -10,7 +10,7 @@ spec: - --client-key=/secrets/client.key command: - /kube-apiserver-healthcheck - image: k8s.gcr.io/kops/kube-apiserver-healthcheck:1.22.0-beta.1 + image: k8s.gcr.io/kops/kube-apiserver-healthcheck:1.22.0-beta.2 livenessProbe: httpGet: host: 127.0.0.1 diff --git a/tests/integration/update_cluster/privatecanal/data/aws_s3_bucket_object_privatecanal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/privatecanal/data/aws_s3_bucket_object_privatecanal.example.com-addons-bootstrap_content index bfae94ccc36d8..99aaf493604ce 100644 --- a/tests/integration/update_cluster/privatecanal/data/aws_s3_bucket_object_privatecanal.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/privatecanal/data/aws_s3_bucket_object_privatecanal.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: 4ec0466f98a5d1aebc3a0c5e0e1979cb5998028a2c97d4a3415b51c25f55ba8b + manifestHash: ff47b18bab6e7b36bf2bbd5246750e9a81d2f811e4a8ed6e1dd9c3bca84c879a name: kops-controller.addons.k8s.io needsRollingUpdate: control-plane selector: @@ -40,7 +40,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml - manifestHash: 7934f73e3a3e56972beeb971f6cb30c5479cb97a6917a1d5c1628b06642ebc2a + manifestHash: b1403524d1d9689e27a40cd661cb856a273684f8a1e8bed3cfb71eb80945b4e8 name: dns-controller.addons.k8s.io selector: k8s-addon: dns-controller.addons.k8s.io diff --git a/tests/integration/update_cluster/privatecanal/data/aws_s3_bucket_object_privatecanal.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/privatecanal/data/aws_s3_bucket_object_privatecanal.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content index f510c6b61f416..33dbb652090bd 100644 --- a/tests/integration/update_cluster/privatecanal/data/aws_s3_bucket_object_privatecanal.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content +++ b/tests/integration/update_cluster/privatecanal/data/aws_s3_bucket_object_privatecanal.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.22.0-beta.1 + version: v1.22.0-beta.2 name: dns-controller namespace: kube-system spec: @@ -24,7 +24,7 @@ spec: labels: k8s-addon: dns-controller.addons.k8s.io k8s-app: dns-controller - version: v1.22.0-beta.1 + version: v1.22.0-beta.2 spec: containers: - command: @@ -37,7 +37,7 @@ spec: env: - name: KUBERNETES_SERVICE_HOST value: 127.0.0.1 - image: k8s.gcr.io/kops/dns-controller:1.22.0-beta.1 + image: k8s.gcr.io/kops/dns-controller:1.22.0-beta.2 name: dns-controller resources: requests: diff --git a/tests/integration/update_cluster/privatecanal/data/aws_s3_bucket_object_privatecanal.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content b/tests/integration/update_cluster/privatecanal/data/aws_s3_bucket_object_privatecanal.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content index 690a8826358e2..7f9385469d155 100644 --- a/tests/integration/update_cluster/privatecanal/data/aws_s3_bucket_object_privatecanal.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content +++ b/tests/integration/update_cluster/privatecanal/data/aws_s3_bucket_object_privatecanal.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.22.0-beta.1 + version: v1.22.0-beta.2 name: kops-controller namespace: kube-system spec: @@ -37,7 +37,7 @@ spec: labels: k8s-addon: kops-controller.addons.k8s.io k8s-app: kops-controller - version: v1.22.0-beta.1 + version: v1.22.0-beta.2 spec: containers: - command: @@ -47,7 +47,7 @@ spec: env: - name: KUBERNETES_SERVICE_HOST value: 127.0.0.1 - image: k8s.gcr.io/kops/kops-controller:1.22.0-beta.1 + image: k8s.gcr.io/kops/kops-controller:1.22.0-beta.2 name: kops-controller resources: requests: diff --git a/tests/integration/update_cluster/privatecilium/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content b/tests/integration/update_cluster/privatecilium/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content index 4db818f31aaf6..c8ce8405ba0b6 100644 --- a/tests/integration/update_cluster/privatecilium/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content +++ b/tests/integration/update_cluster/privatecilium/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content @@ -10,7 +10,7 @@ spec: - --client-key=/secrets/client.key command: - /kube-apiserver-healthcheck - image: k8s.gcr.io/kops/kube-apiserver-healthcheck:1.22.0-beta.1 + image: k8s.gcr.io/kops/kube-apiserver-healthcheck:1.22.0-beta.2 livenessProbe: httpGet: host: 127.0.0.1 diff --git a/tests/integration/update_cluster/privatecilium/data/aws_s3_bucket_object_privatecilium.example.com-addons-bootstrap_content b/tests/integration/update_cluster/privatecilium/data/aws_s3_bucket_object_privatecilium.example.com-addons-bootstrap_content index e1b62d6228c16..8cfb44a8268f4 100644 --- a/tests/integration/update_cluster/privatecilium/data/aws_s3_bucket_object_privatecilium.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/privatecilium/data/aws_s3_bucket_object_privatecilium.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: e3608e73be4fab10d33ce2b3e9c0b23d33ad99e2d19fff9940992cf0afe272a8 + manifestHash: 72f5a6fce775a7bc7d05e87adc3fe9c8a3e4835641c2d0639ab2ac6de12d4b44 name: kops-controller.addons.k8s.io needsRollingUpdate: control-plane selector: @@ -40,7 +40,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml - manifestHash: 7934f73e3a3e56972beeb971f6cb30c5479cb97a6917a1d5c1628b06642ebc2a + manifestHash: b1403524d1d9689e27a40cd661cb856a273684f8a1e8bed3cfb71eb80945b4e8 name: dns-controller.addons.k8s.io selector: k8s-addon: dns-controller.addons.k8s.io diff --git a/tests/integration/update_cluster/privatecilium/data/aws_s3_bucket_object_privatecilium.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/privatecilium/data/aws_s3_bucket_object_privatecilium.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content index f510c6b61f416..33dbb652090bd 100644 --- a/tests/integration/update_cluster/privatecilium/data/aws_s3_bucket_object_privatecilium.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content +++ b/tests/integration/update_cluster/privatecilium/data/aws_s3_bucket_object_privatecilium.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.22.0-beta.1 + version: v1.22.0-beta.2 name: dns-controller namespace: kube-system spec: @@ -24,7 +24,7 @@ spec: labels: k8s-addon: dns-controller.addons.k8s.io k8s-app: dns-controller - version: v1.22.0-beta.1 + version: v1.22.0-beta.2 spec: containers: - command: @@ -37,7 +37,7 @@ spec: env: - name: KUBERNETES_SERVICE_HOST value: 127.0.0.1 - image: k8s.gcr.io/kops/dns-controller:1.22.0-beta.1 + image: k8s.gcr.io/kops/dns-controller:1.22.0-beta.2 name: dns-controller resources: requests: diff --git a/tests/integration/update_cluster/privatecilium/data/aws_s3_bucket_object_privatecilium.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content b/tests/integration/update_cluster/privatecilium/data/aws_s3_bucket_object_privatecilium.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content index f35fce7b5bda5..5bb068a9f644f 100644 --- a/tests/integration/update_cluster/privatecilium/data/aws_s3_bucket_object_privatecilium.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content +++ b/tests/integration/update_cluster/privatecilium/data/aws_s3_bucket_object_privatecilium.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.22.0-beta.1 + version: v1.22.0-beta.2 name: kops-controller namespace: kube-system spec: @@ -37,7 +37,7 @@ spec: labels: k8s-addon: kops-controller.addons.k8s.io k8s-app: kops-controller - version: v1.22.0-beta.1 + version: v1.22.0-beta.2 spec: containers: - command: @@ -47,7 +47,7 @@ spec: env: - name: KUBERNETES_SERVICE_HOST value: 127.0.0.1 - image: k8s.gcr.io/kops/kops-controller:1.22.0-beta.1 + image: k8s.gcr.io/kops/kops-controller:1.22.0-beta.2 name: kops-controller resources: requests: diff --git a/tests/integration/update_cluster/privatecilium2/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content b/tests/integration/update_cluster/privatecilium2/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content index 4db818f31aaf6..c8ce8405ba0b6 100644 --- a/tests/integration/update_cluster/privatecilium2/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content +++ b/tests/integration/update_cluster/privatecilium2/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content @@ -10,7 +10,7 @@ spec: - --client-key=/secrets/client.key command: - /kube-apiserver-healthcheck - image: k8s.gcr.io/kops/kube-apiserver-healthcheck:1.22.0-beta.1 + image: k8s.gcr.io/kops/kube-apiserver-healthcheck:1.22.0-beta.2 livenessProbe: httpGet: host: 127.0.0.1 diff --git a/tests/integration/update_cluster/privatecilium2/data/aws_s3_bucket_object_privatecilium.example.com-addons-bootstrap_content b/tests/integration/update_cluster/privatecilium2/data/aws_s3_bucket_object_privatecilium.example.com-addons-bootstrap_content index 10725d870a578..95a340e43545c 100644 --- a/tests/integration/update_cluster/privatecilium2/data/aws_s3_bucket_object_privatecilium.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/privatecilium2/data/aws_s3_bucket_object_privatecilium.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: 513d0558e8bbf6963a4c94bf9b0ac0a09e74a432800b602c9c79751396fd2cf8 + manifestHash: 566feb1a068efcf03d0e883960fbdd2fa5bd65ed30c6248ea383ff0bd70da17b name: kops-controller.addons.k8s.io needsRollingUpdate: control-plane selector: @@ -47,7 +47,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml - manifestHash: 7934f73e3a3e56972beeb971f6cb30c5479cb97a6917a1d5c1628b06642ebc2a + manifestHash: b1403524d1d9689e27a40cd661cb856a273684f8a1e8bed3cfb71eb80945b4e8 name: dns-controller.addons.k8s.io selector: k8s-addon: dns-controller.addons.k8s.io diff --git a/tests/integration/update_cluster/privatecilium2/data/aws_s3_bucket_object_privatecilium.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/privatecilium2/data/aws_s3_bucket_object_privatecilium.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content index f510c6b61f416..33dbb652090bd 100644 --- a/tests/integration/update_cluster/privatecilium2/data/aws_s3_bucket_object_privatecilium.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content +++ b/tests/integration/update_cluster/privatecilium2/data/aws_s3_bucket_object_privatecilium.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.22.0-beta.1 + version: v1.22.0-beta.2 name: dns-controller namespace: kube-system spec: @@ -24,7 +24,7 @@ spec: labels: k8s-addon: dns-controller.addons.k8s.io k8s-app: dns-controller - version: v1.22.0-beta.1 + version: v1.22.0-beta.2 spec: containers: - command: @@ -37,7 +37,7 @@ spec: env: - name: KUBERNETES_SERVICE_HOST value: 127.0.0.1 - image: k8s.gcr.io/kops/dns-controller:1.22.0-beta.1 + image: k8s.gcr.io/kops/dns-controller:1.22.0-beta.2 name: dns-controller resources: requests: diff --git a/tests/integration/update_cluster/privatecilium2/data/aws_s3_bucket_object_privatecilium.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content b/tests/integration/update_cluster/privatecilium2/data/aws_s3_bucket_object_privatecilium.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content index 818e46b1ce5ce..23ad4c970c7c2 100644 --- a/tests/integration/update_cluster/privatecilium2/data/aws_s3_bucket_object_privatecilium.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content +++ b/tests/integration/update_cluster/privatecilium2/data/aws_s3_bucket_object_privatecilium.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.22.0-beta.1 + version: v1.22.0-beta.2 name: kops-controller namespace: kube-system spec: @@ -35,7 +35,7 @@ spec: labels: k8s-addon: kops-controller.addons.k8s.io k8s-app: kops-controller - version: v1.22.0-beta.1 + version: v1.22.0-beta.2 spec: containers: - command: @@ -45,7 +45,7 @@ spec: env: - name: KUBERNETES_SERVICE_HOST value: 127.0.0.1 - image: k8s.gcr.io/kops/kops-controller:1.22.0-beta.1 + image: k8s.gcr.io/kops/kops-controller:1.22.0-beta.2 name: kops-controller resources: requests: diff --git a/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content b/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content index 4db818f31aaf6..c8ce8405ba0b6 100644 --- a/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content +++ b/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content @@ -10,7 +10,7 @@ spec: - --client-key=/secrets/client.key command: - /kube-apiserver-healthcheck - image: k8s.gcr.io/kops/kube-apiserver-healthcheck:1.22.0-beta.1 + image: k8s.gcr.io/kops/kube-apiserver-healthcheck:1.22.0-beta.2 livenessProbe: httpGet: host: 127.0.0.1 diff --git a/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_bucket_object_privateciliumadvanced.example.com-addons-bootstrap_content b/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_bucket_object_privateciliumadvanced.example.com-addons-bootstrap_content index 36212467d7ccb..63fcc3dafc164 100644 --- a/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_bucket_object_privateciliumadvanced.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_bucket_object_privateciliumadvanced.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: 760d6fc23f495b3f02278c7e5399e136020a6e9828ff7648a5e462775c167ea3 + manifestHash: 7ba894d38d41655344e9e67426c388637431affb81fdc285bfc4e76937f0f39a name: kops-controller.addons.k8s.io needsRollingUpdate: control-plane selector: @@ -40,7 +40,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml - manifestHash: 7934f73e3a3e56972beeb971f6cb30c5479cb97a6917a1d5c1628b06642ebc2a + manifestHash: b1403524d1d9689e27a40cd661cb856a273684f8a1e8bed3cfb71eb80945b4e8 name: dns-controller.addons.k8s.io selector: k8s-addon: dns-controller.addons.k8s.io diff --git a/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_bucket_object_privateciliumadvanced.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_bucket_object_privateciliumadvanced.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content index f510c6b61f416..33dbb652090bd 100644 --- a/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_bucket_object_privateciliumadvanced.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content +++ b/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_bucket_object_privateciliumadvanced.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.22.0-beta.1 + version: v1.22.0-beta.2 name: dns-controller namespace: kube-system spec: @@ -24,7 +24,7 @@ spec: labels: k8s-addon: dns-controller.addons.k8s.io k8s-app: dns-controller - version: v1.22.0-beta.1 + version: v1.22.0-beta.2 spec: containers: - command: @@ -37,7 +37,7 @@ spec: env: - name: KUBERNETES_SERVICE_HOST value: 127.0.0.1 - image: k8s.gcr.io/kops/dns-controller:1.22.0-beta.1 + image: k8s.gcr.io/kops/dns-controller:1.22.0-beta.2 name: dns-controller resources: requests: diff --git a/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_bucket_object_privateciliumadvanced.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content b/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_bucket_object_privateciliumadvanced.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content index f4f0b32b318c6..076a50aa14d79 100644 --- a/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_bucket_object_privateciliumadvanced.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content +++ b/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_bucket_object_privateciliumadvanced.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.22.0-beta.1 + version: v1.22.0-beta.2 name: kops-controller namespace: kube-system spec: @@ -37,7 +37,7 @@ spec: labels: k8s-addon: kops-controller.addons.k8s.io k8s-app: kops-controller - version: v1.22.0-beta.1 + version: v1.22.0-beta.2 spec: containers: - command: @@ -47,7 +47,7 @@ spec: env: - name: KUBERNETES_SERVICE_HOST value: 127.0.0.1 - image: k8s.gcr.io/kops/kops-controller:1.22.0-beta.1 + image: k8s.gcr.io/kops/kops-controller:1.22.0-beta.2 name: kops-controller resources: requests: diff --git a/tests/integration/update_cluster/privatedns1/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content b/tests/integration/update_cluster/privatedns1/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content index 4db818f31aaf6..c8ce8405ba0b6 100644 --- a/tests/integration/update_cluster/privatedns1/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content +++ b/tests/integration/update_cluster/privatedns1/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content @@ -10,7 +10,7 @@ spec: - --client-key=/secrets/client.key command: - /kube-apiserver-healthcheck - image: k8s.gcr.io/kops/kube-apiserver-healthcheck:1.22.0-beta.1 + image: k8s.gcr.io/kops/kube-apiserver-healthcheck:1.22.0-beta.2 livenessProbe: httpGet: host: 127.0.0.1 diff --git a/tests/integration/update_cluster/privatedns1/data/aws_s3_bucket_object_privatedns1.example.com-addons-bootstrap_content b/tests/integration/update_cluster/privatedns1/data/aws_s3_bucket_object_privatedns1.example.com-addons-bootstrap_content index b43aeafd4ba91..1d0f768d0ea2d 100644 --- a/tests/integration/update_cluster/privatedns1/data/aws_s3_bucket_object_privatedns1.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/privatedns1/data/aws_s3_bucket_object_privatedns1.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: ec97dbc9f7922eb08ec121566fb93d8311eaf2a2e6445b457812169671be890d + manifestHash: f897b4268d366ef91b1b612477a4b8dda96887d5800b2da9b572a6ff53e8d2c7 name: kops-controller.addons.k8s.io needsRollingUpdate: control-plane selector: @@ -40,7 +40,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml - manifestHash: 5e65a526bca86790177744514f71bf26512857a6a092df1f6b29bab70928576e + manifestHash: 0e296a72cbbed79a2a34646f59cb65a88e06998c703756828d6c84bb5166fbca name: dns-controller.addons.k8s.io selector: k8s-addon: dns-controller.addons.k8s.io diff --git a/tests/integration/update_cluster/privatedns1/data/aws_s3_bucket_object_privatedns1.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/privatedns1/data/aws_s3_bucket_object_privatedns1.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content index 120de6bb2d1f0..daf61ed4fbe9d 100644 --- a/tests/integration/update_cluster/privatedns1/data/aws_s3_bucket_object_privatedns1.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content +++ b/tests/integration/update_cluster/privatedns1/data/aws_s3_bucket_object_privatedns1.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.22.0-beta.1 + version: v1.22.0-beta.2 name: dns-controller namespace: kube-system spec: @@ -24,7 +24,7 @@ spec: labels: k8s-addon: dns-controller.addons.k8s.io k8s-app: dns-controller - version: v1.22.0-beta.1 + version: v1.22.0-beta.2 spec: containers: - command: @@ -37,7 +37,7 @@ spec: env: - name: KUBERNETES_SERVICE_HOST value: 127.0.0.1 - image: k8s.gcr.io/kops/dns-controller:1.22.0-beta.1 + image: k8s.gcr.io/kops/dns-controller:1.22.0-beta.2 name: dns-controller resources: requests: diff --git a/tests/integration/update_cluster/privatedns1/data/aws_s3_bucket_object_privatedns1.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content b/tests/integration/update_cluster/privatedns1/data/aws_s3_bucket_object_privatedns1.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content index 1e436aa5f1fe8..cbea5bc173f52 100644 --- a/tests/integration/update_cluster/privatedns1/data/aws_s3_bucket_object_privatedns1.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content +++ b/tests/integration/update_cluster/privatedns1/data/aws_s3_bucket_object_privatedns1.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.22.0-beta.1 + version: v1.22.0-beta.2 name: kops-controller namespace: kube-system spec: @@ -37,7 +37,7 @@ spec: labels: k8s-addon: kops-controller.addons.k8s.io k8s-app: kops-controller - version: v1.22.0-beta.1 + version: v1.22.0-beta.2 spec: containers: - command: @@ -47,7 +47,7 @@ spec: env: - name: KUBERNETES_SERVICE_HOST value: 127.0.0.1 - image: k8s.gcr.io/kops/kops-controller:1.22.0-beta.1 + image: k8s.gcr.io/kops/kops-controller:1.22.0-beta.2 name: kops-controller resources: requests: diff --git a/tests/integration/update_cluster/privatedns2/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content b/tests/integration/update_cluster/privatedns2/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content index 4db818f31aaf6..c8ce8405ba0b6 100644 --- a/tests/integration/update_cluster/privatedns2/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content +++ b/tests/integration/update_cluster/privatedns2/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content @@ -10,7 +10,7 @@ spec: - --client-key=/secrets/client.key command: - /kube-apiserver-healthcheck - image: k8s.gcr.io/kops/kube-apiserver-healthcheck:1.22.0-beta.1 + image: k8s.gcr.io/kops/kube-apiserver-healthcheck:1.22.0-beta.2 livenessProbe: httpGet: host: 127.0.0.1 diff --git a/tests/integration/update_cluster/privatedns2/data/aws_s3_bucket_object_privatedns2.example.com-addons-bootstrap_content b/tests/integration/update_cluster/privatedns2/data/aws_s3_bucket_object_privatedns2.example.com-addons-bootstrap_content index 6609f0df98248..f006cc07a8ef4 100644 --- a/tests/integration/update_cluster/privatedns2/data/aws_s3_bucket_object_privatedns2.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/privatedns2/data/aws_s3_bucket_object_privatedns2.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: edf823c8ec9127aaefbeade641845e62ce0563c62b16900dbdd83c0a179f7634 + manifestHash: 699dd36ccb1be88208155955cbf64dfbee9309b120c6467dbdf16b5dce96e782 name: kops-controller.addons.k8s.io needsRollingUpdate: control-plane selector: @@ -40,7 +40,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml - manifestHash: f1102679c00842b04365dfe1586066ed2b1b67af8af54f08c828143772256be1 + manifestHash: 042d752d92c1342ce9ec05c69826f5009a6d04512f11c3c461f6e6fa8be855de name: dns-controller.addons.k8s.io selector: k8s-addon: dns-controller.addons.k8s.io diff --git a/tests/integration/update_cluster/privatedns2/data/aws_s3_bucket_object_privatedns2.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/privatedns2/data/aws_s3_bucket_object_privatedns2.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content index 1252d1cbe10d7..a85d4176d135e 100644 --- a/tests/integration/update_cluster/privatedns2/data/aws_s3_bucket_object_privatedns2.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content +++ b/tests/integration/update_cluster/privatedns2/data/aws_s3_bucket_object_privatedns2.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.22.0-beta.1 + version: v1.22.0-beta.2 name: dns-controller namespace: kube-system spec: @@ -24,7 +24,7 @@ spec: labels: k8s-addon: dns-controller.addons.k8s.io k8s-app: dns-controller - version: v1.22.0-beta.1 + version: v1.22.0-beta.2 spec: containers: - command: @@ -37,7 +37,7 @@ spec: env: - name: KUBERNETES_SERVICE_HOST value: 127.0.0.1 - image: k8s.gcr.io/kops/dns-controller:1.22.0-beta.1 + image: k8s.gcr.io/kops/dns-controller:1.22.0-beta.2 name: dns-controller resources: requests: diff --git a/tests/integration/update_cluster/privatedns2/data/aws_s3_bucket_object_privatedns2.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content b/tests/integration/update_cluster/privatedns2/data/aws_s3_bucket_object_privatedns2.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content index bc5039868a2fe..1bab4976f8600 100644 --- a/tests/integration/update_cluster/privatedns2/data/aws_s3_bucket_object_privatedns2.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content +++ b/tests/integration/update_cluster/privatedns2/data/aws_s3_bucket_object_privatedns2.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.22.0-beta.1 + version: v1.22.0-beta.2 name: kops-controller namespace: kube-system spec: @@ -37,7 +37,7 @@ spec: labels: k8s-addon: kops-controller.addons.k8s.io k8s-app: kops-controller - version: v1.22.0-beta.1 + version: v1.22.0-beta.2 spec: containers: - command: @@ -47,7 +47,7 @@ spec: env: - name: KUBERNETES_SERVICE_HOST value: 127.0.0.1 - image: k8s.gcr.io/kops/kops-controller:1.22.0-beta.1 + image: k8s.gcr.io/kops/kops-controller:1.22.0-beta.2 name: kops-controller resources: requests: diff --git a/tests/integration/update_cluster/privateflannel/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content b/tests/integration/update_cluster/privateflannel/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content index 4db818f31aaf6..c8ce8405ba0b6 100644 --- a/tests/integration/update_cluster/privateflannel/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content +++ b/tests/integration/update_cluster/privateflannel/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content @@ -10,7 +10,7 @@ spec: - --client-key=/secrets/client.key command: - /kube-apiserver-healthcheck - image: k8s.gcr.io/kops/kube-apiserver-healthcheck:1.22.0-beta.1 + image: k8s.gcr.io/kops/kube-apiserver-healthcheck:1.22.0-beta.2 livenessProbe: httpGet: host: 127.0.0.1 diff --git a/tests/integration/update_cluster/privateflannel/data/aws_s3_bucket_object_privateflannel.example.com-addons-bootstrap_content b/tests/integration/update_cluster/privateflannel/data/aws_s3_bucket_object_privateflannel.example.com-addons-bootstrap_content index 34818d7b63a06..db15be294f67d 100644 --- a/tests/integration/update_cluster/privateflannel/data/aws_s3_bucket_object_privateflannel.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/privateflannel/data/aws_s3_bucket_object_privateflannel.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: c94291985b2c41c2c1fc18f001e00d88ffed099a6ec87e783bb40cc03d9b3587 + manifestHash: f790ca1c5fd16c22d5c23fac92ba0e844eb0698d79d0cf56053c41d22d1a98d6 name: kops-controller.addons.k8s.io needsRollingUpdate: control-plane selector: @@ -40,7 +40,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml - manifestHash: 7934f73e3a3e56972beeb971f6cb30c5479cb97a6917a1d5c1628b06642ebc2a + manifestHash: b1403524d1d9689e27a40cd661cb856a273684f8a1e8bed3cfb71eb80945b4e8 name: dns-controller.addons.k8s.io selector: k8s-addon: dns-controller.addons.k8s.io diff --git a/tests/integration/update_cluster/privateflannel/data/aws_s3_bucket_object_privateflannel.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/privateflannel/data/aws_s3_bucket_object_privateflannel.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content index f510c6b61f416..33dbb652090bd 100644 --- a/tests/integration/update_cluster/privateflannel/data/aws_s3_bucket_object_privateflannel.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content +++ b/tests/integration/update_cluster/privateflannel/data/aws_s3_bucket_object_privateflannel.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.22.0-beta.1 + version: v1.22.0-beta.2 name: dns-controller namespace: kube-system spec: @@ -24,7 +24,7 @@ spec: labels: k8s-addon: dns-controller.addons.k8s.io k8s-app: dns-controller - version: v1.22.0-beta.1 + version: v1.22.0-beta.2 spec: containers: - command: @@ -37,7 +37,7 @@ spec: env: - name: KUBERNETES_SERVICE_HOST value: 127.0.0.1 - image: k8s.gcr.io/kops/dns-controller:1.22.0-beta.1 + image: k8s.gcr.io/kops/dns-controller:1.22.0-beta.2 name: dns-controller resources: requests: diff --git a/tests/integration/update_cluster/privateflannel/data/aws_s3_bucket_object_privateflannel.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content b/tests/integration/update_cluster/privateflannel/data/aws_s3_bucket_object_privateflannel.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content index bef7aa9864d26..15140b5620b3b 100644 --- a/tests/integration/update_cluster/privateflannel/data/aws_s3_bucket_object_privateflannel.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content +++ b/tests/integration/update_cluster/privateflannel/data/aws_s3_bucket_object_privateflannel.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.22.0-beta.1 + version: v1.22.0-beta.2 name: kops-controller namespace: kube-system spec: @@ -37,7 +37,7 @@ spec: labels: k8s-addon: kops-controller.addons.k8s.io k8s-app: kops-controller - version: v1.22.0-beta.1 + version: v1.22.0-beta.2 spec: containers: - command: @@ -47,7 +47,7 @@ spec: env: - name: KUBERNETES_SERVICE_HOST value: 127.0.0.1 - image: k8s.gcr.io/kops/kops-controller:1.22.0-beta.1 + image: k8s.gcr.io/kops/kops-controller:1.22.0-beta.2 name: kops-controller resources: requests: diff --git a/tests/integration/update_cluster/privatekopeio/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content b/tests/integration/update_cluster/privatekopeio/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content index 4db818f31aaf6..c8ce8405ba0b6 100644 --- a/tests/integration/update_cluster/privatekopeio/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content +++ b/tests/integration/update_cluster/privatekopeio/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content @@ -10,7 +10,7 @@ spec: - --client-key=/secrets/client.key command: - /kube-apiserver-healthcheck - image: k8s.gcr.io/kops/kube-apiserver-healthcheck:1.22.0-beta.1 + image: k8s.gcr.io/kops/kube-apiserver-healthcheck:1.22.0-beta.2 livenessProbe: httpGet: host: 127.0.0.1 diff --git a/tests/integration/update_cluster/privatekopeio/data/aws_s3_bucket_object_privatekopeio.example.com-addons-bootstrap_content b/tests/integration/update_cluster/privatekopeio/data/aws_s3_bucket_object_privatekopeio.example.com-addons-bootstrap_content index cabdcf810df62..bac01c4e85b06 100644 --- a/tests/integration/update_cluster/privatekopeio/data/aws_s3_bucket_object_privatekopeio.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/privatekopeio/data/aws_s3_bucket_object_privatekopeio.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: eaadd1367242ef50322f040f0a35aaaf1dcb5c8e362ab9241ff1a961f4613fda + manifestHash: 7c7fb602aa8346849c9a9c5a07afab02170da2eaee97102b60390fe981a5ab2a name: kops-controller.addons.k8s.io needsRollingUpdate: control-plane selector: @@ -40,7 +40,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml - manifestHash: 7934f73e3a3e56972beeb971f6cb30c5479cb97a6917a1d5c1628b06642ebc2a + manifestHash: b1403524d1d9689e27a40cd661cb856a273684f8a1e8bed3cfb71eb80945b4e8 name: dns-controller.addons.k8s.io selector: k8s-addon: dns-controller.addons.k8s.io diff --git a/tests/integration/update_cluster/privatekopeio/data/aws_s3_bucket_object_privatekopeio.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/privatekopeio/data/aws_s3_bucket_object_privatekopeio.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content index f510c6b61f416..33dbb652090bd 100644 --- a/tests/integration/update_cluster/privatekopeio/data/aws_s3_bucket_object_privatekopeio.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content +++ b/tests/integration/update_cluster/privatekopeio/data/aws_s3_bucket_object_privatekopeio.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.22.0-beta.1 + version: v1.22.0-beta.2 name: dns-controller namespace: kube-system spec: @@ -24,7 +24,7 @@ spec: labels: k8s-addon: dns-controller.addons.k8s.io k8s-app: dns-controller - version: v1.22.0-beta.1 + version: v1.22.0-beta.2 spec: containers: - command: @@ -37,7 +37,7 @@ spec: env: - name: KUBERNETES_SERVICE_HOST value: 127.0.0.1 - image: k8s.gcr.io/kops/dns-controller:1.22.0-beta.1 + image: k8s.gcr.io/kops/dns-controller:1.22.0-beta.2 name: dns-controller resources: requests: diff --git a/tests/integration/update_cluster/privatekopeio/data/aws_s3_bucket_object_privatekopeio.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content b/tests/integration/update_cluster/privatekopeio/data/aws_s3_bucket_object_privatekopeio.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content index 3b9488a6eb0ac..f9702a9072b6c 100644 --- a/tests/integration/update_cluster/privatekopeio/data/aws_s3_bucket_object_privatekopeio.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content +++ b/tests/integration/update_cluster/privatekopeio/data/aws_s3_bucket_object_privatekopeio.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.22.0-beta.1 + version: v1.22.0-beta.2 name: kops-controller namespace: kube-system spec: @@ -37,7 +37,7 @@ spec: labels: k8s-addon: kops-controller.addons.k8s.io k8s-app: kops-controller - version: v1.22.0-beta.1 + version: v1.22.0-beta.2 spec: containers: - command: @@ -47,7 +47,7 @@ spec: env: - name: KUBERNETES_SERVICE_HOST value: 127.0.0.1 - image: k8s.gcr.io/kops/kops-controller:1.22.0-beta.1 + image: k8s.gcr.io/kops/kops-controller:1.22.0-beta.2 name: kops-controller resources: requests: diff --git a/tests/integration/update_cluster/privateweave/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content b/tests/integration/update_cluster/privateweave/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content index 4db818f31aaf6..c8ce8405ba0b6 100644 --- a/tests/integration/update_cluster/privateweave/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content +++ b/tests/integration/update_cluster/privateweave/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content @@ -10,7 +10,7 @@ spec: - --client-key=/secrets/client.key command: - /kube-apiserver-healthcheck - image: k8s.gcr.io/kops/kube-apiserver-healthcheck:1.22.0-beta.1 + image: k8s.gcr.io/kops/kube-apiserver-healthcheck:1.22.0-beta.2 livenessProbe: httpGet: host: 127.0.0.1 diff --git a/tests/integration/update_cluster/privateweave/data/aws_s3_bucket_object_privateweave.example.com-addons-bootstrap_content b/tests/integration/update_cluster/privateweave/data/aws_s3_bucket_object_privateweave.example.com-addons-bootstrap_content index f2d0a341b4d38..b94963ca05d88 100644 --- a/tests/integration/update_cluster/privateweave/data/aws_s3_bucket_object_privateweave.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/privateweave/data/aws_s3_bucket_object_privateweave.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: a7faea693ae612ef56ffd6659db7bfe330d827dcafc8e7fbc0bf5f35fe003d22 + manifestHash: cb59f5f7e1646db13d345963bf40b4421bf6e73eccdabb3f4b55e6519f723dc0 name: kops-controller.addons.k8s.io needsRollingUpdate: control-plane selector: @@ -40,7 +40,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml - manifestHash: 7934f73e3a3e56972beeb971f6cb30c5479cb97a6917a1d5c1628b06642ebc2a + manifestHash: b1403524d1d9689e27a40cd661cb856a273684f8a1e8bed3cfb71eb80945b4e8 name: dns-controller.addons.k8s.io selector: k8s-addon: dns-controller.addons.k8s.io diff --git a/tests/integration/update_cluster/privateweave/data/aws_s3_bucket_object_privateweave.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/privateweave/data/aws_s3_bucket_object_privateweave.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content index f510c6b61f416..33dbb652090bd 100644 --- a/tests/integration/update_cluster/privateweave/data/aws_s3_bucket_object_privateweave.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content +++ b/tests/integration/update_cluster/privateweave/data/aws_s3_bucket_object_privateweave.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.22.0-beta.1 + version: v1.22.0-beta.2 name: dns-controller namespace: kube-system spec: @@ -24,7 +24,7 @@ spec: labels: k8s-addon: dns-controller.addons.k8s.io k8s-app: dns-controller - version: v1.22.0-beta.1 + version: v1.22.0-beta.2 spec: containers: - command: @@ -37,7 +37,7 @@ spec: env: - name: KUBERNETES_SERVICE_HOST value: 127.0.0.1 - image: k8s.gcr.io/kops/dns-controller:1.22.0-beta.1 + image: k8s.gcr.io/kops/dns-controller:1.22.0-beta.2 name: dns-controller resources: requests: diff --git a/tests/integration/update_cluster/privateweave/data/aws_s3_bucket_object_privateweave.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content b/tests/integration/update_cluster/privateweave/data/aws_s3_bucket_object_privateweave.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content index 676c8b5a7bfdd..9b8dd37e3acd7 100644 --- a/tests/integration/update_cluster/privateweave/data/aws_s3_bucket_object_privateweave.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content +++ b/tests/integration/update_cluster/privateweave/data/aws_s3_bucket_object_privateweave.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.22.0-beta.1 + version: v1.22.0-beta.2 name: kops-controller namespace: kube-system spec: @@ -37,7 +37,7 @@ spec: labels: k8s-addon: kops-controller.addons.k8s.io k8s-app: kops-controller - version: v1.22.0-beta.1 + version: v1.22.0-beta.2 spec: containers: - command: @@ -47,7 +47,7 @@ spec: env: - name: KUBERNETES_SERVICE_HOST value: 127.0.0.1 - image: k8s.gcr.io/kops/kops-controller:1.22.0-beta.1 + image: k8s.gcr.io/kops/kops-controller:1.22.0-beta.2 name: kops-controller resources: requests: diff --git a/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content b/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content index 4db818f31aaf6..c8ce8405ba0b6 100644 --- a/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content +++ b/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content @@ -10,7 +10,7 @@ spec: - --client-key=/secrets/client.key command: - /kube-apiserver-healthcheck - image: k8s.gcr.io/kops/kube-apiserver-healthcheck:1.22.0-beta.1 + image: k8s.gcr.io/kops/kube-apiserver-healthcheck:1.22.0-beta.2 livenessProbe: httpGet: host: 127.0.0.1 diff --git a/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_bucket_object_minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_bucket_object_minimal.example.com-addons-bootstrap_content index 054cddc3f10aa..4267079e21f6a 100644 --- a/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_bucket_object_minimal.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_bucket_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: a42582d604eb0c80c96d6e52fb9c4dd9d5aa09a54437b017ff1c0d2fc41a1793 + manifestHash: dcf0336d3677bfaac81529e17263ff30dd37276592d8329027ef4815ac6973c8 name: kops-controller.addons.k8s.io needsRollingUpdate: control-plane selector: @@ -40,7 +40,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml - manifestHash: 6de1dca5e9fd89b3781f632bf74aee0a67d0416ca236ecc69811b39acb475271 + manifestHash: b4524ab5361fe3df3ff58ddd183178056077f16989efe551b1ddbeb7dd3ba9a0 name: dns-controller.addons.k8s.io selector: k8s-addon: dns-controller.addons.k8s.io diff --git a/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_bucket_object_minimal.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_bucket_object_minimal.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content index d78d808a72655..7ec7be1ce62af 100644 --- a/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_bucket_object_minimal.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content +++ b/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_bucket_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.22.0-beta.1 + version: v1.22.0-beta.2 name: dns-controller namespace: kube-system spec: @@ -24,7 +24,7 @@ spec: labels: k8s-addon: dns-controller.addons.k8s.io k8s-app: dns-controller - version: v1.22.0-beta.1 + version: v1.22.0-beta.2 spec: containers: - command: @@ -41,7 +41,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: k8s.gcr.io/kops/dns-controller:1.22.0-beta.1 + image: k8s.gcr.io/kops/dns-controller:1.22.0-beta.2 name: dns-controller resources: requests: diff --git a/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_bucket_object_minimal.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content b/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_bucket_object_minimal.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content index b01e7a070b03d..f9e213909c931 100644 --- a/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_bucket_object_minimal.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content +++ b/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_bucket_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.22.0-beta.1 + version: v1.22.0-beta.2 name: kops-controller namespace: kube-system spec: @@ -37,7 +37,7 @@ spec: labels: k8s-addon: kops-controller.addons.k8s.io k8s-app: kops-controller - version: v1.22.0-beta.1 + version: v1.22.0-beta.2 spec: containers: - command: @@ -47,7 +47,7 @@ spec: env: - name: KUBERNETES_SERVICE_HOST value: 127.0.0.1 - image: k8s.gcr.io/kops/kops-controller:1.22.0-beta.1 + image: k8s.gcr.io/kops/kops-controller:1.22.0-beta.2 name: kops-controller resources: requests: diff --git a/tests/integration/update_cluster/shared_subnet/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content b/tests/integration/update_cluster/shared_subnet/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content index 4db818f31aaf6..c8ce8405ba0b6 100644 --- a/tests/integration/update_cluster/shared_subnet/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content +++ b/tests/integration/update_cluster/shared_subnet/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content @@ -10,7 +10,7 @@ spec: - --client-key=/secrets/client.key command: - /kube-apiserver-healthcheck - image: k8s.gcr.io/kops/kube-apiserver-healthcheck:1.22.0-beta.1 + image: k8s.gcr.io/kops/kube-apiserver-healthcheck:1.22.0-beta.2 livenessProbe: httpGet: host: 127.0.0.1 diff --git a/tests/integration/update_cluster/shared_subnet/data/aws_s3_bucket_object_sharedsubnet.example.com-addons-bootstrap_content b/tests/integration/update_cluster/shared_subnet/data/aws_s3_bucket_object_sharedsubnet.example.com-addons-bootstrap_content index c6d257e3c9eea..7ced0e6086628 100644 --- a/tests/integration/update_cluster/shared_subnet/data/aws_s3_bucket_object_sharedsubnet.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/shared_subnet/data/aws_s3_bucket_object_sharedsubnet.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: cfb2e2007044e7ef06eda1329bfd45606eebf7f09dbb84906580bfed5c1684b5 + manifestHash: c2e713cfd7acf02ce80a042e98bd9247c9bdc3668fae6baa8111b6bafaf506bc name: kops-controller.addons.k8s.io needsRollingUpdate: control-plane selector: @@ -40,7 +40,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml - manifestHash: 7934f73e3a3e56972beeb971f6cb30c5479cb97a6917a1d5c1628b06642ebc2a + manifestHash: b1403524d1d9689e27a40cd661cb856a273684f8a1e8bed3cfb71eb80945b4e8 name: dns-controller.addons.k8s.io selector: k8s-addon: dns-controller.addons.k8s.io diff --git a/tests/integration/update_cluster/shared_subnet/data/aws_s3_bucket_object_sharedsubnet.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/shared_subnet/data/aws_s3_bucket_object_sharedsubnet.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content index f510c6b61f416..33dbb652090bd 100644 --- a/tests/integration/update_cluster/shared_subnet/data/aws_s3_bucket_object_sharedsubnet.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content +++ b/tests/integration/update_cluster/shared_subnet/data/aws_s3_bucket_object_sharedsubnet.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.22.0-beta.1 + version: v1.22.0-beta.2 name: dns-controller namespace: kube-system spec: @@ -24,7 +24,7 @@ spec: labels: k8s-addon: dns-controller.addons.k8s.io k8s-app: dns-controller - version: v1.22.0-beta.1 + version: v1.22.0-beta.2 spec: containers: - command: @@ -37,7 +37,7 @@ spec: env: - name: KUBERNETES_SERVICE_HOST value: 127.0.0.1 - image: k8s.gcr.io/kops/dns-controller:1.22.0-beta.1 + image: k8s.gcr.io/kops/dns-controller:1.22.0-beta.2 name: dns-controller resources: requests: diff --git a/tests/integration/update_cluster/shared_subnet/data/aws_s3_bucket_object_sharedsubnet.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content b/tests/integration/update_cluster/shared_subnet/data/aws_s3_bucket_object_sharedsubnet.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content index 102609e9e3520..3935d6bc798fb 100644 --- a/tests/integration/update_cluster/shared_subnet/data/aws_s3_bucket_object_sharedsubnet.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content +++ b/tests/integration/update_cluster/shared_subnet/data/aws_s3_bucket_object_sharedsubnet.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.22.0-beta.1 + version: v1.22.0-beta.2 name: kops-controller namespace: kube-system spec: @@ -37,7 +37,7 @@ spec: labels: k8s-addon: kops-controller.addons.k8s.io k8s-app: kops-controller - version: v1.22.0-beta.1 + version: v1.22.0-beta.2 spec: containers: - command: @@ -47,7 +47,7 @@ spec: env: - name: KUBERNETES_SERVICE_HOST value: 127.0.0.1 - image: k8s.gcr.io/kops/kops-controller:1.22.0-beta.1 + image: k8s.gcr.io/kops/kops-controller:1.22.0-beta.2 name: kops-controller resources: requests: diff --git a/tests/integration/update_cluster/shared_vpc/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content b/tests/integration/update_cluster/shared_vpc/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content index 4db818f31aaf6..c8ce8405ba0b6 100644 --- a/tests/integration/update_cluster/shared_vpc/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content +++ b/tests/integration/update_cluster/shared_vpc/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content @@ -10,7 +10,7 @@ spec: - --client-key=/secrets/client.key command: - /kube-apiserver-healthcheck - image: k8s.gcr.io/kops/kube-apiserver-healthcheck:1.22.0-beta.1 + image: k8s.gcr.io/kops/kube-apiserver-healthcheck:1.22.0-beta.2 livenessProbe: httpGet: host: 127.0.0.1 diff --git a/tests/integration/update_cluster/shared_vpc/data/aws_s3_bucket_object_sharedvpc.example.com-addons-bootstrap_content b/tests/integration/update_cluster/shared_vpc/data/aws_s3_bucket_object_sharedvpc.example.com-addons-bootstrap_content index ed717e8edc065..839e67a40b458 100644 --- a/tests/integration/update_cluster/shared_vpc/data/aws_s3_bucket_object_sharedvpc.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/shared_vpc/data/aws_s3_bucket_object_sharedvpc.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: 4c4ae45f1daf8aa032000d62b4440fcc543387eac58d226a47ca8680169f19ca + manifestHash: b70d7307cdd74b46681b63eedbbca259411bc2822b14b10b48f70d13b0670686 name: kops-controller.addons.k8s.io needsRollingUpdate: control-plane selector: @@ -40,7 +40,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml - manifestHash: 7934f73e3a3e56972beeb971f6cb30c5479cb97a6917a1d5c1628b06642ebc2a + manifestHash: b1403524d1d9689e27a40cd661cb856a273684f8a1e8bed3cfb71eb80945b4e8 name: dns-controller.addons.k8s.io selector: k8s-addon: dns-controller.addons.k8s.io diff --git a/tests/integration/update_cluster/shared_vpc/data/aws_s3_bucket_object_sharedvpc.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/shared_vpc/data/aws_s3_bucket_object_sharedvpc.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content index f510c6b61f416..33dbb652090bd 100644 --- a/tests/integration/update_cluster/shared_vpc/data/aws_s3_bucket_object_sharedvpc.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content +++ b/tests/integration/update_cluster/shared_vpc/data/aws_s3_bucket_object_sharedvpc.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.22.0-beta.1 + version: v1.22.0-beta.2 name: dns-controller namespace: kube-system spec: @@ -24,7 +24,7 @@ spec: labels: k8s-addon: dns-controller.addons.k8s.io k8s-app: dns-controller - version: v1.22.0-beta.1 + version: v1.22.0-beta.2 spec: containers: - command: @@ -37,7 +37,7 @@ spec: env: - name: KUBERNETES_SERVICE_HOST value: 127.0.0.1 - image: k8s.gcr.io/kops/dns-controller:1.22.0-beta.1 + image: k8s.gcr.io/kops/dns-controller:1.22.0-beta.2 name: dns-controller resources: requests: diff --git a/tests/integration/update_cluster/shared_vpc/data/aws_s3_bucket_object_sharedvpc.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content b/tests/integration/update_cluster/shared_vpc/data/aws_s3_bucket_object_sharedvpc.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content index 9142f13652838..d243338f9a8e1 100644 --- a/tests/integration/update_cluster/shared_vpc/data/aws_s3_bucket_object_sharedvpc.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content +++ b/tests/integration/update_cluster/shared_vpc/data/aws_s3_bucket_object_sharedvpc.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.22.0-beta.1 + version: v1.22.0-beta.2 name: kops-controller namespace: kube-system spec: @@ -37,7 +37,7 @@ spec: labels: k8s-addon: kops-controller.addons.k8s.io k8s-app: kops-controller - version: v1.22.0-beta.1 + version: v1.22.0-beta.2 spec: containers: - command: @@ -47,7 +47,7 @@ spec: env: - name: KUBERNETES_SERVICE_HOST value: 127.0.0.1 - image: k8s.gcr.io/kops/kops-controller:1.22.0-beta.1 + image: k8s.gcr.io/kops/kops-controller:1.22.0-beta.2 name: kops-controller resources: requests: diff --git a/tests/integration/update_cluster/unmanaged/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content b/tests/integration/update_cluster/unmanaged/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content index 4db818f31aaf6..c8ce8405ba0b6 100644 --- a/tests/integration/update_cluster/unmanaged/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content +++ b/tests/integration/update_cluster/unmanaged/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content @@ -10,7 +10,7 @@ spec: - --client-key=/secrets/client.key command: - /kube-apiserver-healthcheck - image: k8s.gcr.io/kops/kube-apiserver-healthcheck:1.22.0-beta.1 + image: k8s.gcr.io/kops/kube-apiserver-healthcheck:1.22.0-beta.2 livenessProbe: httpGet: host: 127.0.0.1 diff --git a/tests/integration/update_cluster/unmanaged/data/aws_s3_bucket_object_unmanaged.example.com-addons-bootstrap_content b/tests/integration/update_cluster/unmanaged/data/aws_s3_bucket_object_unmanaged.example.com-addons-bootstrap_content index c66298404906c..cb610d75901e1 100644 --- a/tests/integration/update_cluster/unmanaged/data/aws_s3_bucket_object_unmanaged.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/unmanaged/data/aws_s3_bucket_object_unmanaged.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: f45a40e858175cb953e4a30055264637476438c1316a5cd73ae37e4145dc1b6e + manifestHash: c617291802d30973ed32a3a51e24f55ba32e2593e14fee7c507a16c22486999b name: kops-controller.addons.k8s.io needsRollingUpdate: control-plane selector: @@ -40,7 +40,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml - manifestHash: 7934f73e3a3e56972beeb971f6cb30c5479cb97a6917a1d5c1628b06642ebc2a + manifestHash: b1403524d1d9689e27a40cd661cb856a273684f8a1e8bed3cfb71eb80945b4e8 name: dns-controller.addons.k8s.io selector: k8s-addon: dns-controller.addons.k8s.io diff --git a/tests/integration/update_cluster/unmanaged/data/aws_s3_bucket_object_unmanaged.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/unmanaged/data/aws_s3_bucket_object_unmanaged.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content index f510c6b61f416..33dbb652090bd 100644 --- a/tests/integration/update_cluster/unmanaged/data/aws_s3_bucket_object_unmanaged.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content +++ b/tests/integration/update_cluster/unmanaged/data/aws_s3_bucket_object_unmanaged.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.22.0-beta.1 + version: v1.22.0-beta.2 name: dns-controller namespace: kube-system spec: @@ -24,7 +24,7 @@ spec: labels: k8s-addon: dns-controller.addons.k8s.io k8s-app: dns-controller - version: v1.22.0-beta.1 + version: v1.22.0-beta.2 spec: containers: - command: @@ -37,7 +37,7 @@ spec: env: - name: KUBERNETES_SERVICE_HOST value: 127.0.0.1 - image: k8s.gcr.io/kops/dns-controller:1.22.0-beta.1 + image: k8s.gcr.io/kops/dns-controller:1.22.0-beta.2 name: dns-controller resources: requests: diff --git a/tests/integration/update_cluster/unmanaged/data/aws_s3_bucket_object_unmanaged.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content b/tests/integration/update_cluster/unmanaged/data/aws_s3_bucket_object_unmanaged.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content index dcc7255b31480..7f633c726a9be 100644 --- a/tests/integration/update_cluster/unmanaged/data/aws_s3_bucket_object_unmanaged.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content +++ b/tests/integration/update_cluster/unmanaged/data/aws_s3_bucket_object_unmanaged.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.22.0-beta.1 + version: v1.22.0-beta.2 name: kops-controller namespace: kube-system spec: @@ -37,7 +37,7 @@ spec: labels: k8s-addon: kops-controller.addons.k8s.io k8s-app: kops-controller - version: v1.22.0-beta.1 + version: v1.22.0-beta.2 spec: containers: - command: @@ -47,7 +47,7 @@ spec: env: - name: KUBERNETES_SERVICE_HOST value: 127.0.0.1 - image: k8s.gcr.io/kops/kops-controller:1.22.0-beta.1 + image: k8s.gcr.io/kops/kops-controller:1.22.0-beta.2 name: kops-controller resources: requests: diff --git a/tests/integration/update_cluster/vfs-said/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content b/tests/integration/update_cluster/vfs-said/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content index 4db818f31aaf6..c8ce8405ba0b6 100644 --- a/tests/integration/update_cluster/vfs-said/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content +++ b/tests/integration/update_cluster/vfs-said/data/aws_s3_bucket_object_manifests-static-kube-apiserver-healthcheck_content @@ -10,7 +10,7 @@ spec: - --client-key=/secrets/client.key command: - /kube-apiserver-healthcheck - image: k8s.gcr.io/kops/kube-apiserver-healthcheck:1.22.0-beta.1 + image: k8s.gcr.io/kops/kube-apiserver-healthcheck:1.22.0-beta.2 livenessProbe: httpGet: host: 127.0.0.1 diff --git a/tests/integration/update_cluster/vfs-said/data/aws_s3_bucket_object_minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/vfs-said/data/aws_s3_bucket_object_minimal.example.com-addons-bootstrap_content index 4f7c9e45c154b..c89646eb792a5 100644 --- a/tests/integration/update_cluster/vfs-said/data/aws_s3_bucket_object_minimal.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/vfs-said/data/aws_s3_bucket_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: a42582d604eb0c80c96d6e52fb9c4dd9d5aa09a54437b017ff1c0d2fc41a1793 + manifestHash: dcf0336d3677bfaac81529e17263ff30dd37276592d8329027ef4815ac6973c8 name: kops-controller.addons.k8s.io needsRollingUpdate: control-plane selector: @@ -40,7 +40,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml - manifestHash: 7934f73e3a3e56972beeb971f6cb30c5479cb97a6917a1d5c1628b06642ebc2a + manifestHash: b1403524d1d9689e27a40cd661cb856a273684f8a1e8bed3cfb71eb80945b4e8 name: dns-controller.addons.k8s.io selector: k8s-addon: dns-controller.addons.k8s.io diff --git a/tests/integration/update_cluster/vfs-said/data/aws_s3_bucket_object_minimal.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/vfs-said/data/aws_s3_bucket_object_minimal.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content index f510c6b61f416..33dbb652090bd 100644 --- a/tests/integration/update_cluster/vfs-said/data/aws_s3_bucket_object_minimal.example.com-addons-dns-controller.addons.k8s.io-k8s-1.12_content +++ b/tests/integration/update_cluster/vfs-said/data/aws_s3_bucket_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.22.0-beta.1 + version: v1.22.0-beta.2 name: dns-controller namespace: kube-system spec: @@ -24,7 +24,7 @@ spec: labels: k8s-addon: dns-controller.addons.k8s.io k8s-app: dns-controller - version: v1.22.0-beta.1 + version: v1.22.0-beta.2 spec: containers: - command: @@ -37,7 +37,7 @@ spec: env: - name: KUBERNETES_SERVICE_HOST value: 127.0.0.1 - image: k8s.gcr.io/kops/dns-controller:1.22.0-beta.1 + image: k8s.gcr.io/kops/dns-controller:1.22.0-beta.2 name: dns-controller resources: requests: diff --git a/tests/integration/update_cluster/vfs-said/data/aws_s3_bucket_object_minimal.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content b/tests/integration/update_cluster/vfs-said/data/aws_s3_bucket_object_minimal.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content index b01e7a070b03d..f9e213909c931 100644 --- a/tests/integration/update_cluster/vfs-said/data/aws_s3_bucket_object_minimal.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content +++ b/tests/integration/update_cluster/vfs-said/data/aws_s3_bucket_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.22.0-beta.1 + version: v1.22.0-beta.2 name: kops-controller namespace: kube-system spec: @@ -37,7 +37,7 @@ spec: labels: k8s-addon: kops-controller.addons.k8s.io k8s-app: kops-controller - version: v1.22.0-beta.1 + version: v1.22.0-beta.2 spec: containers: - command: @@ -47,7 +47,7 @@ spec: env: - name: KUBERNETES_SERVICE_HOST value: 127.0.0.1 - image: k8s.gcr.io/kops/kops-controller:1.22.0-beta.1 + image: k8s.gcr.io/kops/kops-controller:1.22.0-beta.2 name: kops-controller resources: requests: diff --git a/upup/models/cloudup/resources/addons/dns-controller.addons.k8s.io/k8s-1.12.yaml.template b/upup/models/cloudup/resources/addons/dns-controller.addons.k8s.io/k8s-1.12.yaml.template index 4b4f44376da9a..e2a32a8b860dd 100644 --- a/upup/models/cloudup/resources/addons/dns-controller.addons.k8s.io/k8s-1.12.yaml.template +++ b/upup/models/cloudup/resources/addons/dns-controller.addons.k8s.io/k8s-1.12.yaml.template @@ -6,7 +6,7 @@ metadata: labels: k8s-addon: dns-controller.addons.k8s.io k8s-app: dns-controller - version: v1.22.0-beta.1 + version: v1.22.0-beta.2 spec: replicas: 1 strategy: @@ -19,7 +19,7 @@ spec: labels: k8s-addon: dns-controller.addons.k8s.io k8s-app: dns-controller - version: v1.22.0-beta.1 + version: v1.22.0-beta.2 annotations: scheduler.alpha.kubernetes.io/critical-pod: '' spec: @@ -38,7 +38,7 @@ spec: serviceAccount: dns-controller containers: - name: dns-controller - image: k8s.gcr.io/kops/dns-controller:1.22.0-beta.1 + image: k8s.gcr.io/kops/dns-controller:1.22.0-beta.2 command: {{ range $arg := DnsControllerArgv }} - "{{ $arg }}" diff --git a/upup/models/cloudup/resources/addons/kops-controller.addons.k8s.io/k8s-1.16.yaml.template b/upup/models/cloudup/resources/addons/kops-controller.addons.k8s.io/k8s-1.16.yaml.template index 4c2bd0d582b9f..ce4719419bc53 100644 --- a/upup/models/cloudup/resources/addons/kops-controller.addons.k8s.io/k8s-1.16.yaml.template +++ b/upup/models/cloudup/resources/addons/kops-controller.addons.k8s.io/k8s-1.16.yaml.template @@ -19,7 +19,7 @@ metadata: labels: k8s-addon: kops-controller.addons.k8s.io k8s-app: kops-controller - version: v1.22.0-beta.1 + version: v1.22.0-beta.2 spec: selector: matchLabels: @@ -31,7 +31,7 @@ spec: labels: k8s-addon: kops-controller.addons.k8s.io k8s-app: kops-controller - version: v1.22.0-beta.1 + version: v1.22.0-beta.2 {{ if UseKopsControllerForNodeBootstrap }} annotations: dns.alpha.kubernetes.io/internal: kops-controller.internal.{{ ClusterName }} @@ -53,7 +53,7 @@ spec: serviceAccount: kops-controller containers: - name: kops-controller - image: k8s.gcr.io/kops/kops-controller:1.22.0-beta.1 + image: k8s.gcr.io/kops/kops-controller:1.22.0-beta.2 volumeMounts: {{ if .UseHostCertificates }} - mountPath: /etc/ssl/certs diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc-containerd/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc-containerd/manifest.yaml index f7633803dfcff..aa5579133cb79 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc-containerd/manifest.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc-containerd/manifest.yaml @@ -6,7 +6,7 @@ spec: addons: - id: k8s-1.16 manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml - manifestHash: f3eb07482ed9c1a370304554b294170d386a61a0b440648319f8c4bab6b84ee9 + manifestHash: 99f6c9c0be6f35981ac56384dfeaf82740aa48927d091c18e8e75578cced7b10 name: kops-controller.addons.k8s.io needsRollingUpdate: control-plane selector: @@ -40,7 +40,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml - manifestHash: 7934f73e3a3e56972beeb971f6cb30c5479cb97a6917a1d5c1628b06642ebc2a + manifestHash: b1403524d1d9689e27a40cd661cb856a273684f8a1e8bed3cfb71eb80945b4e8 name: dns-controller.addons.k8s.io selector: k8s-addon: dns-controller.addons.k8s.io diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc/manifest.yaml index f7633803dfcff..aa5579133cb79 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc/manifest.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc/manifest.yaml @@ -6,7 +6,7 @@ spec: addons: - id: k8s-1.16 manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml - manifestHash: f3eb07482ed9c1a370304554b294170d386a61a0b440648319f8c4bab6b84ee9 + manifestHash: 99f6c9c0be6f35981ac56384dfeaf82740aa48927d091c18e8e75578cced7b10 name: kops-controller.addons.k8s.io needsRollingUpdate: control-plane selector: @@ -40,7 +40,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml - manifestHash: 7934f73e3a3e56972beeb971f6cb30c5479cb97a6917a1d5c1628b06642ebc2a + manifestHash: b1403524d1d9689e27a40cd661cb856a273684f8a1e8bed3cfb71eb80945b4e8 name: dns-controller.addons.k8s.io selector: k8s-addon: dns-controller.addons.k8s.io diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awscloudcontroller/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awscloudcontroller/manifest.yaml index 6971825fad395..8f588e2383fde 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awscloudcontroller/manifest.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awscloudcontroller/manifest.yaml @@ -6,7 +6,7 @@ spec: addons: - id: k8s-1.16 manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml - manifestHash: f3eb07482ed9c1a370304554b294170d386a61a0b440648319f8c4bab6b84ee9 + manifestHash: 99f6c9c0be6f35981ac56384dfeaf82740aa48927d091c18e8e75578cced7b10 name: kops-controller.addons.k8s.io needsRollingUpdate: control-plane selector: @@ -40,7 +40,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml - manifestHash: 7934f73e3a3e56972beeb971f6cb30c5479cb97a6917a1d5c1628b06642ebc2a + manifestHash: b1403524d1d9689e27a40cd661cb856a273684f8a1e8bed3cfb71eb80945b4e8 name: dns-controller.addons.k8s.io selector: k8s-addon: dns-controller.addons.k8s.io diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awsiamauthenticator/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awsiamauthenticator/manifest.yaml index ab4175454e5dc..ed6bca0a5f576 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awsiamauthenticator/manifest.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awsiamauthenticator/manifest.yaml @@ -6,7 +6,7 @@ spec: addons: - id: k8s-1.16 manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml - manifestHash: f3eb07482ed9c1a370304554b294170d386a61a0b440648319f8c4bab6b84ee9 + manifestHash: 99f6c9c0be6f35981ac56384dfeaf82740aa48927d091c18e8e75578cced7b10 name: kops-controller.addons.k8s.io needsRollingUpdate: control-plane selector: @@ -40,7 +40,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml - manifestHash: 7934f73e3a3e56972beeb971f6cb30c5479cb97a6917a1d5c1628b06642ebc2a + manifestHash: b1403524d1d9689e27a40cd661cb856a273684f8a1e8bed3cfb71eb80945b4e8 name: dns-controller.addons.k8s.io selector: k8s-addon: dns-controller.addons.k8s.io diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/kops-controller.addons.k8s.io-k8s-1.16.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/kops-controller.addons.k8s.io-k8s-1.16.yaml index cd6d5a73fb351..70312b8884389 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/kops-controller.addons.k8s.io-k8s-1.16.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/kops-controller.addons.k8s.io-k8s-1.16.yaml @@ -23,7 +23,7 @@ metadata: app.kubernetes.io/managed-by: kops k8s-addon: kops-controller.addons.k8s.io k8s-app: kops-controller - version: v1.22.0-beta.1 + version: v1.22.0-beta.2 name: kops-controller namespace: kube-system spec: @@ -35,7 +35,7 @@ spec: labels: k8s-addon: kops-controller.addons.k8s.io k8s-app: kops-controller - version: v1.22.0-beta.1 + version: v1.22.0-beta.2 spec: containers: - command: @@ -45,7 +45,7 @@ spec: env: - name: KUBERNETES_SERVICE_HOST value: 127.0.0.1 - image: k8s.gcr.io/kops/kops-controller:1.22.0-beta.1 + image: k8s.gcr.io/kops/kops-controller:1.22.0-beta.2 name: kops-controller resources: requests: diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/manifest.yaml index afe1ed3032a4c..10e0dc2e05944 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/manifest.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/manifest.yaml @@ -6,7 +6,7 @@ spec: addons: - id: k8s-1.16 manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml - manifestHash: 6feafa292df467d473bac54e74dc527f0b1e7197f41cb83e1e1ffe2e66b0fd30 + manifestHash: 530df6a7dcc09c6de355239a0985ce1830142c5ba1cabc3f6acb15784207b27f name: kops-controller.addons.k8s.io needsRollingUpdate: control-plane selector: @@ -47,7 +47,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml - manifestHash: 7934f73e3a3e56972beeb971f6cb30c5479cb97a6917a1d5c1628b06642ebc2a + manifestHash: b1403524d1d9689e27a40cd661cb856a273684f8a1e8bed3cfb71eb80945b4e8 name: dns-controller.addons.k8s.io selector: k8s-addon: dns-controller.addons.k8s.io diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/coredns/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/coredns/manifest.yaml index ef9d434b13b55..f3d0deb7191c1 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/coredns/manifest.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/coredns/manifest.yaml @@ -6,7 +6,7 @@ spec: addons: - id: k8s-1.16 manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml - manifestHash: f3eb07482ed9c1a370304554b294170d386a61a0b440648319f8c4bab6b84ee9 + manifestHash: 99f6c9c0be6f35981ac56384dfeaf82740aa48927d091c18e8e75578cced7b10 name: kops-controller.addons.k8s.io needsRollingUpdate: control-plane selector: @@ -40,7 +40,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml - manifestHash: 7934f73e3a3e56972beeb971f6cb30c5479cb97a6917a1d5c1628b06642ebc2a + manifestHash: b1403524d1d9689e27a40cd661cb856a273684f8a1e8bed3cfb71eb80945b4e8 name: dns-controller.addons.k8s.io selector: k8s-addon: dns-controller.addons.k8s.io diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/metrics-server/insecure-1.18/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/metrics-server/insecure-1.18/manifest.yaml index b9fdb1e73cc6c..b89a61afe9e03 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/metrics-server/insecure-1.18/manifest.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/metrics-server/insecure-1.18/manifest.yaml @@ -6,7 +6,7 @@ spec: addons: - id: k8s-1.16 manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml - manifestHash: 6feafa292df467d473bac54e74dc527f0b1e7197f41cb83e1e1ffe2e66b0fd30 + manifestHash: 530df6a7dcc09c6de355239a0985ce1830142c5ba1cabc3f6acb15784207b27f name: kops-controller.addons.k8s.io needsRollingUpdate: control-plane selector: @@ -47,7 +47,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml - manifestHash: 7934f73e3a3e56972beeb971f6cb30c5479cb97a6917a1d5c1628b06642ebc2a + manifestHash: b1403524d1d9689e27a40cd661cb856a273684f8a1e8bed3cfb71eb80945b4e8 name: dns-controller.addons.k8s.io selector: k8s-addon: dns-controller.addons.k8s.io 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 899028e963634..d7fcf5b695655 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 @@ -6,7 +6,7 @@ spec: addons: - id: k8s-1.16 manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml - manifestHash: f3eb07482ed9c1a370304554b294170d386a61a0b440648319f8c4bab6b84ee9 + manifestHash: 99f6c9c0be6f35981ac56384dfeaf82740aa48927d091c18e8e75578cced7b10 name: kops-controller.addons.k8s.io needsRollingUpdate: control-plane selector: @@ -40,7 +40,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml - manifestHash: 7934f73e3a3e56972beeb971f6cb30c5479cb97a6917a1d5c1628b06642ebc2a + manifestHash: b1403524d1d9689e27a40cd661cb856a273684f8a1e8bed3cfb71eb80945b4e8 name: dns-controller.addons.k8s.io selector: k8s-addon: dns-controller.addons.k8s.io diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/metrics-server/secure-1.18/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/metrics-server/secure-1.18/manifest.yaml index 5c396b035224e..0eaf021197af2 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/metrics-server/secure-1.18/manifest.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/metrics-server/secure-1.18/manifest.yaml @@ -6,7 +6,7 @@ spec: addons: - id: k8s-1.16 manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml - manifestHash: 6feafa292df467d473bac54e74dc527f0b1e7197f41cb83e1e1ffe2e66b0fd30 + manifestHash: 530df6a7dcc09c6de355239a0985ce1830142c5ba1cabc3f6acb15784207b27f name: kops-controller.addons.k8s.io needsRollingUpdate: control-plane selector: @@ -47,7 +47,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml - manifestHash: 7934f73e3a3e56972beeb971f6cb30c5479cb97a6917a1d5c1628b06642ebc2a + manifestHash: b1403524d1d9689e27a40cd661cb856a273684f8a1e8bed3cfb71eb80945b4e8 name: dns-controller.addons.k8s.io selector: k8s-addon: dns-controller.addons.k8s.io 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 15fe1b9d1ce59..dade5e32f7c08 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 @@ -6,7 +6,7 @@ spec: addons: - id: k8s-1.16 manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml - manifestHash: f3eb07482ed9c1a370304554b294170d386a61a0b440648319f8c4bab6b84ee9 + manifestHash: 99f6c9c0be6f35981ac56384dfeaf82740aa48927d091c18e8e75578cced7b10 name: kops-controller.addons.k8s.io needsRollingUpdate: control-plane selector: @@ -40,7 +40,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml - manifestHash: 7934f73e3a3e56972beeb971f6cb30c5479cb97a6917a1d5c1628b06642ebc2a + manifestHash: b1403524d1d9689e27a40cd661cb856a273684f8a1e8bed3cfb71eb80945b4e8 name: dns-controller.addons.k8s.io selector: k8s-addon: dns-controller.addons.k8s.io diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/service-account-iam/dns-controller.addons.k8s.io-k8s-1.12.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/service-account-iam/dns-controller.addons.k8s.io-k8s-1.12.yaml index d78d808a72655..7ec7be1ce62af 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/service-account-iam/dns-controller.addons.k8s.io-k8s-1.12.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/service-account-iam/dns-controller.addons.k8s.io-k8s-1.12.yaml @@ -7,7 +7,7 @@ metadata: app.kubernetes.io/managed-by: kops k8s-addon: dns-controller.addons.k8s.io k8s-app: dns-controller - version: v1.22.0-beta.1 + version: v1.22.0-beta.2 name: dns-controller namespace: kube-system spec: @@ -24,7 +24,7 @@ spec: labels: k8s-addon: dns-controller.addons.k8s.io k8s-app: dns-controller - version: v1.22.0-beta.1 + version: v1.22.0-beta.2 spec: containers: - command: @@ -41,7 +41,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: k8s.gcr.io/kops/dns-controller:1.22.0-beta.1 + image: k8s.gcr.io/kops/dns-controller:1.22.0-beta.2 name: dns-controller resources: requests: diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/service-account-iam/kops-controller.addons.k8s.io-k8s-1.16.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/service-account-iam/kops-controller.addons.k8s.io-k8s-1.16.yaml index d303ab3224ce6..11c2f64de30c4 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/service-account-iam/kops-controller.addons.k8s.io-k8s-1.16.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/service-account-iam/kops-controller.addons.k8s.io-k8s-1.16.yaml @@ -23,7 +23,7 @@ metadata: app.kubernetes.io/managed-by: kops k8s-addon: kops-controller.addons.k8s.io k8s-app: kops-controller - version: v1.22.0-beta.1 + version: v1.22.0-beta.2 name: kops-controller namespace: kube-system spec: @@ -37,7 +37,7 @@ spec: labels: k8s-addon: kops-controller.addons.k8s.io k8s-app: kops-controller - version: v1.22.0-beta.1 + version: v1.22.0-beta.2 spec: containers: - command: @@ -47,7 +47,7 @@ spec: env: - name: KUBERNETES_SERVICE_HOST value: 127.0.0.1 - image: k8s.gcr.io/kops/kops-controller:1.22.0-beta.1 + image: k8s.gcr.io/kops/kops-controller:1.22.0-beta.2 name: kops-controller resources: requests: diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/service-account-iam/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/service-account-iam/manifest.yaml index b490df8c3628d..588f26bb67d04 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/service-account-iam/manifest.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/service-account-iam/manifest.yaml @@ -6,7 +6,7 @@ spec: addons: - id: k8s-1.16 manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml - manifestHash: f3eb07482ed9c1a370304554b294170d386a61a0b440648319f8c4bab6b84ee9 + manifestHash: 99f6c9c0be6f35981ac56384dfeaf82740aa48927d091c18e8e75578cced7b10 name: kops-controller.addons.k8s.io needsRollingUpdate: control-plane selector: @@ -40,7 +40,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml - manifestHash: 6de1dca5e9fd89b3781f632bf74aee0a67d0416ca236ecc69811b39acb475271 + manifestHash: b4524ab5361fe3df3ff58ddd183178056077f16989efe551b1ddbeb7dd3ba9a0 name: dns-controller.addons.k8s.io selector: k8s-addon: dns-controller.addons.k8s.io diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/kops-controller.addons.k8s.io-k8s-1.16.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/kops-controller.addons.k8s.io-k8s-1.16.yaml index d303ab3224ce6..11c2f64de30c4 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/kops-controller.addons.k8s.io-k8s-1.16.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/kops-controller.addons.k8s.io-k8s-1.16.yaml @@ -23,7 +23,7 @@ metadata: app.kubernetes.io/managed-by: kops k8s-addon: kops-controller.addons.k8s.io k8s-app: kops-controller - version: v1.22.0-beta.1 + version: v1.22.0-beta.2 name: kops-controller namespace: kube-system spec: @@ -37,7 +37,7 @@ spec: labels: k8s-addon: kops-controller.addons.k8s.io k8s-app: kops-controller - version: v1.22.0-beta.1 + version: v1.22.0-beta.2 spec: containers: - command: @@ -47,7 +47,7 @@ spec: env: - name: KUBERNETES_SERVICE_HOST value: 127.0.0.1 - image: k8s.gcr.io/kops/kops-controller:1.22.0-beta.1 + image: k8s.gcr.io/kops/kops-controller:1.22.0-beta.2 name: kops-controller resources: requests: diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/manifest.yaml index 7e79da4cd9924..1ba6220c884ca 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/manifest.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/manifest.yaml @@ -6,7 +6,7 @@ spec: addons: - id: k8s-1.16 manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml - manifestHash: f3eb07482ed9c1a370304554b294170d386a61a0b440648319f8c4bab6b84ee9 + manifestHash: 99f6c9c0be6f35981ac56384dfeaf82740aa48927d091c18e8e75578cced7b10 name: kops-controller.addons.k8s.io needsRollingUpdate: control-plane selector: @@ -40,7 +40,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml - manifestHash: 7934f73e3a3e56972beeb971f6cb30c5479cb97a6917a1d5c1628b06642ebc2a + manifestHash: b1403524d1d9689e27a40cd661cb856a273684f8a1e8bed3cfb71eb80945b4e8 name: dns-controller.addons.k8s.io selector: k8s-addon: dns-controller.addons.k8s.io diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/weave/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/weave/manifest.yaml index bcbbb33b931e2..cd3fa8d9d6a53 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/weave/manifest.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/weave/manifest.yaml @@ -6,7 +6,7 @@ spec: addons: - id: k8s-1.16 manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml - manifestHash: f3eb07482ed9c1a370304554b294170d386a61a0b440648319f8c4bab6b84ee9 + manifestHash: 99f6c9c0be6f35981ac56384dfeaf82740aa48927d091c18e8e75578cced7b10 name: kops-controller.addons.k8s.io needsRollingUpdate: control-plane selector: @@ -40,7 +40,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml - manifestHash: 7934f73e3a3e56972beeb971f6cb30c5479cb97a6917a1d5c1628b06642ebc2a + manifestHash: b1403524d1d9689e27a40cd661cb856a273684f8a1e8bed3cfb71eb80945b4e8 name: dns-controller.addons.k8s.io selector: k8s-addon: dns-controller.addons.k8s.io diff --git a/upup/pkg/fi/cloudup/urls_test.go b/upup/pkg/fi/cloudup/urls_test.go index 82bbc8f95b3b3..8e632ca7dd989 100644 --- a/upup/pkg/fi/cloudup/urls_test.go +++ b/upup/pkg/fi/cloudup/urls_test.go @@ -36,29 +36,29 @@ func Test_BuildMirroredAsset(t *testing.T) { { url: "https://artifacts.k8s.io/binaries/kops/%s/images/protokube-linux-amd64", expected: []string{ - "https://artifacts.k8s.io/binaries/kops/1.22.0-beta.1/images/protokube-linux-amd64", - "https://github.com/kubernetes/kops/releases/download/v1.22.0-beta.1/images-protokube-linux-amd64", + "https://artifacts.k8s.io/binaries/kops/1.22.0-beta.2/images/protokube-linux-amd64", + "https://github.com/kubernetes/kops/releases/download/v1.22.0-beta.2/images-protokube-linux-amd64", }, }, { url: "https://artifacts.k8s.io/binaries/kops/%s/images/protokube-linux-arm64", expected: []string{ - "https://artifacts.k8s.io/binaries/kops/1.22.0-beta.1/images/protokube-linux-arm64", - "https://github.com/kubernetes/kops/releases/download/v1.22.0-beta.1/images-protokube-linux-arm64", + "https://artifacts.k8s.io/binaries/kops/1.22.0-beta.2/images/protokube-linux-arm64", + "https://github.com/kubernetes/kops/releases/download/v1.22.0-beta.2/images-protokube-linux-arm64", }, }, { url: "https://artifacts.k8s.io/binaries/kops/%s/linux/amd64/nodeup", expected: []string{ - "https://artifacts.k8s.io/binaries/kops/1.22.0-beta.1/linux/amd64/nodeup", - "https://github.com/kubernetes/kops/releases/download/v1.22.0-beta.1/nodeup-linux-amd64", + "https://artifacts.k8s.io/binaries/kops/1.22.0-beta.2/linux/amd64/nodeup", + "https://github.com/kubernetes/kops/releases/download/v1.22.0-beta.2/nodeup-linux-amd64", }, }, { url: "https://artifacts.k8s.io/binaries/kops/%s/linux/arm64/nodeup", expected: []string{ - "https://artifacts.k8s.io/binaries/kops/1.22.0-beta.1/linux/arm64/nodeup", - "https://github.com/kubernetes/kops/releases/download/v1.22.0-beta.1/nodeup-linux-arm64", + "https://artifacts.k8s.io/binaries/kops/1.22.0-beta.2/linux/arm64/nodeup", + "https://github.com/kubernetes/kops/releases/download/v1.22.0-beta.2/nodeup-linux-arm64", }, }, } diff --git a/version.go b/version.go index 998ae42682ba9..6e74118cf15d3 100644 --- a/version.go +++ b/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.22.0-beta.1" - KOPS_CI_VERSION = "1.22.0-beta.2" + KOPS_RELEASE_VERSION = "1.22.0-beta.2" + KOPS_CI_VERSION = "1.22.0-beta.3" ) // GitVersion should be replaced by the makefile