diff --git a/pkg/model/components/gcpcloudcontrollermanager.go b/pkg/model/components/gcpcloudcontrollermanager.go index 48fd878c98fd2..9fd82fc2487f2 100644 --- a/pkg/model/components/gcpcloudcontrollermanager.go +++ b/pkg/model/components/gcpcloudcontrollermanager.go @@ -71,10 +71,9 @@ func (b *GCPCloudControllerManagerOptionsBuilder) BuildOptions(cluster *kops.Clu } if ccmConfig.Image == "" { - // TODO: Implement CCM image publishing switch b.ControlPlaneKubernetesVersion().Minor() { default: - ccmConfig.Image = "registry.k8s.io/cloud-provider-gcp/cloud-controller-manager:v33.1.1" + ccmConfig.Image = "registry.k8s.io/cloud-provider-gcp/cloud-controller-manager:v34.2.0" } } diff --git a/tests/integration/update_cluster/ha_gce/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/ha_gce/data/aws_s3_object_cluster-completed.spec_content index 071fa614b29e5..6d253f3732b4b 100644 --- a/tests/integration/update_cluster/ha_gce/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/ha_gce/data/aws_s3_object_cluster-completed.spec_content @@ -23,7 +23,7 @@ spec: clusterName: ha-gce-example-com controllers: - '*' - image: registry.k8s.io/cloud-provider-gcp/cloud-controller-manager:v33.1.1 + image: registry.k8s.io/cloud-provider-gcp/cloud-controller-manager:v34.2.0 leaderElection: leaderElect: true cloudProvider: gce diff --git a/tests/integration/update_cluster/ha_gce/data/aws_s3_object_ha-gce.example.com-addons-bootstrap_content b/tests/integration/update_cluster/ha_gce/data/aws_s3_object_ha-gce.example.com-addons-bootstrap_content index d29ff055f05fa..253648cd24617 100644 --- a/tests/integration/update_cluster/ha_gce/data/aws_s3_object_ha-gce.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/ha_gce/data/aws_s3_object_ha-gce.example.com-addons-bootstrap_content @@ -54,7 +54,7 @@ spec: version: 9.99.0 - id: k8s-1.23 manifest: gcp-cloud-controller.addons.k8s.io/k8s-1.23.yaml - manifestHash: d05688c98128f6bb7361a931705fc2a64f535d010c8c11f0d6177c9aa7ae16f9 + manifestHash: 9e82a18eb446294f009d209d8f8a0903b1fe789b4cf1c4754142469d355a1687 name: gcp-cloud-controller.addons.k8s.io prune: kinds: diff --git a/tests/integration/update_cluster/ha_gce/data/aws_s3_object_ha-gce.example.com-addons-gcp-cloud-controller.addons.k8s.io-k8s-1.23_content b/tests/integration/update_cluster/ha_gce/data/aws_s3_object_ha-gce.example.com-addons-gcp-cloud-controller.addons.k8s.io-k8s-1.23_content index 3cba1c9d94f27..2a6aec426cf9f 100644 --- a/tests/integration/update_cluster/ha_gce/data/aws_s3_object_ha-gce.example.com-addons-gcp-cloud-controller.addons.k8s.io-k8s-1.23_content +++ b/tests/integration/update_cluster/ha_gce/data/aws_s3_object_ha-gce.example.com-addons-gcp-cloud-controller.addons.k8s.io-k8s-1.23_content @@ -44,7 +44,7 @@ spec: env: - name: KUBERNETES_SERVICE_HOST value: 127.0.0.1 - image: registry.k8s.io/cloud-provider-gcp/cloud-controller-manager:v33.1.1 + image: registry.k8s.io/cloud-provider-gcp/cloud-controller-manager:v34.2.0 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 3 diff --git a/tests/integration/update_cluster/many-addons-gce/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/many-addons-gce/data/aws_s3_object_cluster-completed.spec_content index fbeb4692f7051..b66cab1752ccd 100644 --- a/tests/integration/update_cluster/many-addons-gce/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/many-addons-gce/data/aws_s3_object_cluster-completed.spec_content @@ -24,7 +24,7 @@ spec: clusterName: minimal-example-com controllers: - '*' - image: registry.k8s.io/cloud-provider-gcp/cloud-controller-manager:v33.1.1 + image: registry.k8s.io/cloud-provider-gcp/cloud-controller-manager:v34.2.0 leaderElection: leaderElect: true cloudProvider: gce diff --git a/tests/integration/update_cluster/many-addons-gce/data/aws_s3_object_minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/many-addons-gce/data/aws_s3_object_minimal.example.com-addons-bootstrap_content index 70068a2f16eee..4c679e5702ed3 100644 --- a/tests/integration/update_cluster/many-addons-gce/data/aws_s3_object_minimal.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/many-addons-gce/data/aws_s3_object_minimal.example.com-addons-bootstrap_content @@ -125,7 +125,7 @@ spec: version: 9.99.0 - id: k8s-1.23 manifest: gcp-cloud-controller.addons.k8s.io/k8s-1.23.yaml - manifestHash: 2778517c19f2247cead060bfa7e3c34027d4611b202e8365d552248b89a552cb + manifestHash: edfe9c3eb5ae99cb2622968999c435d3a67152b3c0245754127a728a09c7446c name: gcp-cloud-controller.addons.k8s.io prune: kinds: diff --git a/tests/integration/update_cluster/many-addons-gce/data/aws_s3_object_minimal.example.com-addons-gcp-cloud-controller.addons.k8s.io-k8s-1.23_content b/tests/integration/update_cluster/many-addons-gce/data/aws_s3_object_minimal.example.com-addons-gcp-cloud-controller.addons.k8s.io-k8s-1.23_content index e5ea0910c7ac3..ae20b7c007e70 100644 --- a/tests/integration/update_cluster/many-addons-gce/data/aws_s3_object_minimal.example.com-addons-gcp-cloud-controller.addons.k8s.io-k8s-1.23_content +++ b/tests/integration/update_cluster/many-addons-gce/data/aws_s3_object_minimal.example.com-addons-gcp-cloud-controller.addons.k8s.io-k8s-1.23_content @@ -44,7 +44,7 @@ spec: env: - name: KUBERNETES_SERVICE_HOST value: 127.0.0.1 - image: registry.k8s.io/cloud-provider-gcp/cloud-controller-manager:v33.1.1 + image: registry.k8s.io/cloud-provider-gcp/cloud-controller-manager:v34.2.0 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 3 diff --git a/tests/integration/update_cluster/minimal_gce/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal_gce/data/aws_s3_object_cluster-completed.spec_content index 8b41f21adfa09..0e13b49f96c28 100644 --- a/tests/integration/update_cluster/minimal_gce/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal_gce/data/aws_s3_object_cluster-completed.spec_content @@ -23,7 +23,7 @@ spec: clusterName: minimal-gce-example-com controllers: - '*' - image: registry.k8s.io/cloud-provider-gcp/cloud-controller-manager:v33.1.1 + image: registry.k8s.io/cloud-provider-gcp/cloud-controller-manager:v34.2.0 leaderElection: leaderElect: true cloudProvider: gce diff --git a/tests/integration/update_cluster/minimal_gce/data/aws_s3_object_minimal-gce.example.com-addons-bootstrap_content b/tests/integration/update_cluster/minimal_gce/data/aws_s3_object_minimal-gce.example.com-addons-bootstrap_content index f62b083bffaf2..d691c7aac40fd 100644 --- a/tests/integration/update_cluster/minimal_gce/data/aws_s3_object_minimal-gce.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/minimal_gce/data/aws_s3_object_minimal-gce.example.com-addons-bootstrap_content @@ -54,7 +54,7 @@ spec: version: 9.99.0 - id: k8s-1.23 manifest: gcp-cloud-controller.addons.k8s.io/k8s-1.23.yaml - manifestHash: dd48ce99e79111f6fa61e057cc3740b802c63e5fee4af1cd55b39fe1651298c6 + manifestHash: 8bc52ae1d41caceb2ca8dd61d99700f5d01d6f7ffb27c97c486fbb9d700378e9 name: gcp-cloud-controller.addons.k8s.io prune: kinds: diff --git a/tests/integration/update_cluster/minimal_gce/data/aws_s3_object_minimal-gce.example.com-addons-gcp-cloud-controller.addons.k8s.io-k8s-1.23_content b/tests/integration/update_cluster/minimal_gce/data/aws_s3_object_minimal-gce.example.com-addons-gcp-cloud-controller.addons.k8s.io-k8s-1.23_content index c8f61179355f0..faffacfd6eb5f 100644 --- a/tests/integration/update_cluster/minimal_gce/data/aws_s3_object_minimal-gce.example.com-addons-gcp-cloud-controller.addons.k8s.io-k8s-1.23_content +++ b/tests/integration/update_cluster/minimal_gce/data/aws_s3_object_minimal-gce.example.com-addons-gcp-cloud-controller.addons.k8s.io-k8s-1.23_content @@ -44,7 +44,7 @@ spec: env: - name: KUBERNETES_SERVICE_HOST value: 127.0.0.1 - image: registry.k8s.io/cloud-provider-gcp/cloud-controller-manager:v33.1.1 + image: registry.k8s.io/cloud-provider-gcp/cloud-controller-manager:v34.2.0 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 3 diff --git a/tests/integration/update_cluster/minimal_gce_dns-none/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal_gce_dns-none/data/aws_s3_object_cluster-completed.spec_content index 28e4de21095ad..3a0e8d2891a36 100644 --- a/tests/integration/update_cluster/minimal_gce_dns-none/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal_gce_dns-none/data/aws_s3_object_cluster-completed.spec_content @@ -26,7 +26,7 @@ spec: clusterName: minimal-gce-example-com controllers: - '*' - image: registry.k8s.io/cloud-provider-gcp/cloud-controller-manager:v33.1.1 + image: registry.k8s.io/cloud-provider-gcp/cloud-controller-manager:v34.2.0 leaderElection: leaderElect: true cloudProvider: gce diff --git a/tests/integration/update_cluster/minimal_gce_dns-none/data/aws_s3_object_minimal-gce.example.com-addons-bootstrap_content b/tests/integration/update_cluster/minimal_gce_dns-none/data/aws_s3_object_minimal-gce.example.com-addons-bootstrap_content index b641bb466b0c3..c107e3ad8b1fb 100644 --- a/tests/integration/update_cluster/minimal_gce_dns-none/data/aws_s3_object_minimal-gce.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/minimal_gce_dns-none/data/aws_s3_object_minimal-gce.example.com-addons-bootstrap_content @@ -47,7 +47,7 @@ spec: version: 9.99.0 - id: k8s-1.23 manifest: gcp-cloud-controller.addons.k8s.io/k8s-1.23.yaml - manifestHash: dd48ce99e79111f6fa61e057cc3740b802c63e5fee4af1cd55b39fe1651298c6 + manifestHash: 8bc52ae1d41caceb2ca8dd61d99700f5d01d6f7ffb27c97c486fbb9d700378e9 name: gcp-cloud-controller.addons.k8s.io prune: kinds: diff --git a/tests/integration/update_cluster/minimal_gce_dns-none/data/aws_s3_object_minimal-gce.example.com-addons-gcp-cloud-controller.addons.k8s.io-k8s-1.23_content b/tests/integration/update_cluster/minimal_gce_dns-none/data/aws_s3_object_minimal-gce.example.com-addons-gcp-cloud-controller.addons.k8s.io-k8s-1.23_content index c8f61179355f0..faffacfd6eb5f 100644 --- a/tests/integration/update_cluster/minimal_gce_dns-none/data/aws_s3_object_minimal-gce.example.com-addons-gcp-cloud-controller.addons.k8s.io-k8s-1.23_content +++ b/tests/integration/update_cluster/minimal_gce_dns-none/data/aws_s3_object_minimal-gce.example.com-addons-gcp-cloud-controller.addons.k8s.io-k8s-1.23_content @@ -44,7 +44,7 @@ spec: env: - name: KUBERNETES_SERVICE_HOST value: 127.0.0.1 - image: registry.k8s.io/cloud-provider-gcp/cloud-controller-manager:v33.1.1 + image: registry.k8s.io/cloud-provider-gcp/cloud-controller-manager:v34.2.0 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 3 diff --git a/tests/integration/update_cluster/minimal_gce_ilb/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal_gce_ilb/data/aws_s3_object_cluster-completed.spec_content index c76a1a353e390..e2a2a1c439041 100644 --- a/tests/integration/update_cluster/minimal_gce_ilb/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal_gce_ilb/data/aws_s3_object_cluster-completed.spec_content @@ -27,7 +27,7 @@ spec: clusterName: minimal-gce-ilb-example-com controllers: - '*' - image: registry.k8s.io/cloud-provider-gcp/cloud-controller-manager:v33.1.1 + image: registry.k8s.io/cloud-provider-gcp/cloud-controller-manager:v34.2.0 leaderElection: leaderElect: true cloudProvider: gce diff --git a/tests/integration/update_cluster/minimal_gce_ilb/data/aws_s3_object_minimal-gce-ilb.example.com-addons-bootstrap_content b/tests/integration/update_cluster/minimal_gce_ilb/data/aws_s3_object_minimal-gce-ilb.example.com-addons-bootstrap_content index 5bc91b912cbb1..a133c18a92142 100644 --- a/tests/integration/update_cluster/minimal_gce_ilb/data/aws_s3_object_minimal-gce-ilb.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/minimal_gce_ilb/data/aws_s3_object_minimal-gce-ilb.example.com-addons-bootstrap_content @@ -54,7 +54,7 @@ spec: version: 9.99.0 - id: k8s-1.23 manifest: gcp-cloud-controller.addons.k8s.io/k8s-1.23.yaml - manifestHash: befa575c858bc6c278ce42d4cdba1353a54be025a22af21f796ddb710079e9ba + manifestHash: 1aac11efeafb217c65bd3a79c657168a412c489c30ed7595b4cf2b338357d635 name: gcp-cloud-controller.addons.k8s.io prune: kinds: diff --git a/tests/integration/update_cluster/minimal_gce_ilb/data/aws_s3_object_minimal-gce-ilb.example.com-addons-gcp-cloud-controller.addons.k8s.io-k8s-1.23_content b/tests/integration/update_cluster/minimal_gce_ilb/data/aws_s3_object_minimal-gce-ilb.example.com-addons-gcp-cloud-controller.addons.k8s.io-k8s-1.23_content index 31fda46705b7b..26eb647e1b4b0 100644 --- a/tests/integration/update_cluster/minimal_gce_ilb/data/aws_s3_object_minimal-gce-ilb.example.com-addons-gcp-cloud-controller.addons.k8s.io-k8s-1.23_content +++ b/tests/integration/update_cluster/minimal_gce_ilb/data/aws_s3_object_minimal-gce-ilb.example.com-addons-gcp-cloud-controller.addons.k8s.io-k8s-1.23_content @@ -44,7 +44,7 @@ spec: env: - name: KUBERNETES_SERVICE_HOST value: 127.0.0.1 - image: registry.k8s.io/cloud-provider-gcp/cloud-controller-manager:v33.1.1 + image: registry.k8s.io/cloud-provider-gcp/cloud-controller-manager:v34.2.0 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 3 diff --git a/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/aws_s3_object_cluster-completed.spec_content index 23a24ffe15435..944ea63841a34 100644 --- a/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/aws_s3_object_cluster-completed.spec_content @@ -27,7 +27,7 @@ spec: clusterName: minimal-gce-with-a-very-very-very-very-very-long-name-example-com controllers: - '*' - image: registry.k8s.io/cloud-provider-gcp/cloud-controller-manager:v33.1.1 + image: registry.k8s.io/cloud-provider-gcp/cloud-controller-manager:v34.2.0 leaderElection: leaderElect: true cloudProvider: gce diff --git a/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/aws_s3_object_minimal-gce-with-a-very-very-very-very-very-long-name.example.com-addons-bootstrap_content b/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/aws_s3_object_minimal-gce-with-a-very-very-very-very-very-long-name.example.com-addons-bootstrap_content index b279e3bbff83a..253834bf62fa7 100644 --- a/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/aws_s3_object_minimal-gce-with-a-very-very-very-very-very-long-name.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/aws_s3_object_minimal-gce-with-a-very-very-very-very-very-long-name.example.com-addons-bootstrap_content @@ -54,7 +54,7 @@ spec: version: 9.99.0 - id: k8s-1.23 manifest: gcp-cloud-controller.addons.k8s.io/k8s-1.23.yaml - manifestHash: aa6299d98f5937c231a634cb8ef36473f7f8b7d42132be8422981e48fc4c539e + manifestHash: 41e80d91325e313ae2786cf6d54f6261751213ed40729ce7bcce3aeafd3e0f42 name: gcp-cloud-controller.addons.k8s.io prune: kinds: diff --git a/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/aws_s3_object_minimal-gce-with-a-very-very-very-very-very-long-name.example.com-addons-gcp-cloud-controller.addons.k8s.io-k8s-1.23_content b/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/aws_s3_object_minimal-gce-with-a-very-very-very-very-very-long-name.example.com-addons-gcp-cloud-controller.addons.k8s.io-k8s-1.23_content index 4536aafe7b617..b3ae992054872 100644 --- a/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/aws_s3_object_minimal-gce-with-a-very-very-very-very-very-long-name.example.com-addons-gcp-cloud-controller.addons.k8s.io-k8s-1.23_content +++ b/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/aws_s3_object_minimal-gce-with-a-very-very-very-very-very-long-name.example.com-addons-gcp-cloud-controller.addons.k8s.io-k8s-1.23_content @@ -44,7 +44,7 @@ spec: env: - name: KUBERNETES_SERVICE_HOST value: 127.0.0.1 - image: registry.k8s.io/cloud-provider-gcp/cloud-controller-manager:v33.1.1 + image: registry.k8s.io/cloud-provider-gcp/cloud-controller-manager:v34.2.0 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 3 diff --git a/tests/integration/update_cluster/minimal_gce_longclustername/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal_gce_longclustername/data/aws_s3_object_cluster-completed.spec_content index 1f9c3295cefb6..684aca7e21768 100644 --- a/tests/integration/update_cluster/minimal_gce_longclustername/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal_gce_longclustername/data/aws_s3_object_cluster-completed.spec_content @@ -24,7 +24,7 @@ spec: clusterName: minimal-gce-with-a-very-very-very-very-very-long-name-example-com controllers: - '*' - image: registry.k8s.io/cloud-provider-gcp/cloud-controller-manager:v33.1.1 + image: registry.k8s.io/cloud-provider-gcp/cloud-controller-manager:v34.2.0 leaderElection: leaderElect: true cloudProvider: gce diff --git a/tests/integration/update_cluster/minimal_gce_longclustername/data/aws_s3_object_minimal-gce-with-a-very-very-very-very-very-long-name.example.com-addons-bootstrap_content b/tests/integration/update_cluster/minimal_gce_longclustername/data/aws_s3_object_minimal-gce-with-a-very-very-very-very-very-long-name.example.com-addons-bootstrap_content index b279e3bbff83a..253834bf62fa7 100644 --- a/tests/integration/update_cluster/minimal_gce_longclustername/data/aws_s3_object_minimal-gce-with-a-very-very-very-very-very-long-name.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/minimal_gce_longclustername/data/aws_s3_object_minimal-gce-with-a-very-very-very-very-very-long-name.example.com-addons-bootstrap_content @@ -54,7 +54,7 @@ spec: version: 9.99.0 - id: k8s-1.23 manifest: gcp-cloud-controller.addons.k8s.io/k8s-1.23.yaml - manifestHash: aa6299d98f5937c231a634cb8ef36473f7f8b7d42132be8422981e48fc4c539e + manifestHash: 41e80d91325e313ae2786cf6d54f6261751213ed40729ce7bcce3aeafd3e0f42 name: gcp-cloud-controller.addons.k8s.io prune: kinds: diff --git a/tests/integration/update_cluster/minimal_gce_longclustername/data/aws_s3_object_minimal-gce-with-a-very-very-very-very-very-long-name.example.com-addons-gcp-cloud-controller.addons.k8s.io-k8s-1.23_content b/tests/integration/update_cluster/minimal_gce_longclustername/data/aws_s3_object_minimal-gce-with-a-very-very-very-very-very-long-name.example.com-addons-gcp-cloud-controller.addons.k8s.io-k8s-1.23_content index 4536aafe7b617..b3ae992054872 100644 --- a/tests/integration/update_cluster/minimal_gce_longclustername/data/aws_s3_object_minimal-gce-with-a-very-very-very-very-very-long-name.example.com-addons-gcp-cloud-controller.addons.k8s.io-k8s-1.23_content +++ b/tests/integration/update_cluster/minimal_gce_longclustername/data/aws_s3_object_minimal-gce-with-a-very-very-very-very-very-long-name.example.com-addons-gcp-cloud-controller.addons.k8s.io-k8s-1.23_content @@ -44,7 +44,7 @@ spec: env: - name: KUBERNETES_SERVICE_HOST value: 127.0.0.1 - image: registry.k8s.io/cloud-provider-gcp/cloud-controller-manager:v33.1.1 + image: registry.k8s.io/cloud-provider-gcp/cloud-controller-manager:v34.2.0 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 3 diff --git a/tests/integration/update_cluster/minimal_gce_plb/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal_gce_plb/data/aws_s3_object_cluster-completed.spec_content index d53ad66d968a0..e411f477960a1 100644 --- a/tests/integration/update_cluster/minimal_gce_plb/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal_gce_plb/data/aws_s3_object_cluster-completed.spec_content @@ -27,7 +27,7 @@ spec: clusterName: minimal-gce-plb-example-com controllers: - '*' - image: registry.k8s.io/cloud-provider-gcp/cloud-controller-manager:v33.1.1 + image: registry.k8s.io/cloud-provider-gcp/cloud-controller-manager:v34.2.0 leaderElection: leaderElect: true cloudProvider: gce diff --git a/tests/integration/update_cluster/minimal_gce_plb/data/aws_s3_object_minimal-gce-plb.example.com-addons-bootstrap_content b/tests/integration/update_cluster/minimal_gce_plb/data/aws_s3_object_minimal-gce-plb.example.com-addons-bootstrap_content index fabaa301b30a8..7f27dfb6484e1 100644 --- a/tests/integration/update_cluster/minimal_gce_plb/data/aws_s3_object_minimal-gce-plb.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/minimal_gce_plb/data/aws_s3_object_minimal-gce-plb.example.com-addons-bootstrap_content @@ -54,7 +54,7 @@ spec: version: 9.99.0 - id: k8s-1.23 manifest: gcp-cloud-controller.addons.k8s.io/k8s-1.23.yaml - manifestHash: 02dcb12b0d482c47742cd189b8de84a390aa34da5459b75c9c47704c69723a3f + manifestHash: 733593f0043331ecb3df5c9b98f4d66e5c489e1152a4fa0147476a27200845fb name: gcp-cloud-controller.addons.k8s.io prune: kinds: diff --git a/tests/integration/update_cluster/minimal_gce_plb/data/aws_s3_object_minimal-gce-plb.example.com-addons-gcp-cloud-controller.addons.k8s.io-k8s-1.23_content b/tests/integration/update_cluster/minimal_gce_plb/data/aws_s3_object_minimal-gce-plb.example.com-addons-gcp-cloud-controller.addons.k8s.io-k8s-1.23_content index 1cf030facac8c..2a6a8805125b3 100644 --- a/tests/integration/update_cluster/minimal_gce_plb/data/aws_s3_object_minimal-gce-plb.example.com-addons-gcp-cloud-controller.addons.k8s.io-k8s-1.23_content +++ b/tests/integration/update_cluster/minimal_gce_plb/data/aws_s3_object_minimal-gce-plb.example.com-addons-gcp-cloud-controller.addons.k8s.io-k8s-1.23_content @@ -44,7 +44,7 @@ spec: env: - name: KUBERNETES_SERVICE_HOST value: 127.0.0.1 - image: registry.k8s.io/cloud-provider-gcp/cloud-controller-manager:v33.1.1 + image: registry.k8s.io/cloud-provider-gcp/cloud-controller-manager:v34.2.0 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 3 diff --git a/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_object_cluster-completed.spec_content index 3e4addfdd705d..c3cab0df04158 100644 --- a/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_object_cluster-completed.spec_content @@ -23,7 +23,7 @@ spec: clusterName: minimal-gce-private-example-com controllers: - '*' - image: registry.k8s.io/cloud-provider-gcp/cloud-controller-manager:v33.1.1 + image: registry.k8s.io/cloud-provider-gcp/cloud-controller-manager:v34.2.0 leaderElection: leaderElect: true cloudProvider: gce diff --git a/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_object_minimal-gce-private.example.com-addons-bootstrap_content b/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_object_minimal-gce-private.example.com-addons-bootstrap_content index 1ef77ec5d036a..14eb6cce0773b 100644 --- a/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_object_minimal-gce-private.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_object_minimal-gce-private.example.com-addons-bootstrap_content @@ -54,7 +54,7 @@ spec: version: 9.99.0 - id: k8s-1.23 manifest: gcp-cloud-controller.addons.k8s.io/k8s-1.23.yaml - manifestHash: d2dac1f94b9b2a5f9b7e63e6110bd521cd832bf48c5a1cd402e1da6411b110f3 + manifestHash: c5c9751ac7154228d752b2a58835aff898dc21d923b37fe207c7a919a1de8ca0 name: gcp-cloud-controller.addons.k8s.io prune: kinds: diff --git a/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_object_minimal-gce-private.example.com-addons-gcp-cloud-controller.addons.k8s.io-k8s-1.23_content b/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_object_minimal-gce-private.example.com-addons-gcp-cloud-controller.addons.k8s.io-k8s-1.23_content index f1de4e331cbce..7d9a4acbe7171 100644 --- a/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_object_minimal-gce-private.example.com-addons-gcp-cloud-controller.addons.k8s.io-k8s-1.23_content +++ b/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_object_minimal-gce-private.example.com-addons-gcp-cloud-controller.addons.k8s.io-k8s-1.23_content @@ -44,7 +44,7 @@ spec: env: - name: KUBERNETES_SERVICE_HOST value: 127.0.0.1 - image: registry.k8s.io/cloud-provider-gcp/cloud-controller-manager:v33.1.1 + image: registry.k8s.io/cloud-provider-gcp/cloud-controller-manager:v34.2.0 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 3