Skip to content

gcp: Update ccm to fix broken arm64 jobs #17793

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
k8s-ci-robot merged 1 commit into from
Dec 5, 2025
+28 −29
Merged

gcp: Update ccm to fix broken arm64 jobs #17793

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions pkg/model/components/gcpcloudcontrollermanager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}

Expand Down
2 changes: 1 addition & 1 deletion tests/integration/update_cluster/ha_gce/data/aws_s3_object_cluster-completed.spec_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,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
Expand Down
2 changes: 1 addition & 1 deletion ...tion/update_cluster/ha_gce/data/aws_s3_object_ha-gce.example.com-addons-bootstrap_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion ...s_s3_object_ha-gce.example.com-addons-gcp-cloud-controller.addons.k8s.io-k8s-1.23_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ...egration/update_cluster/many-addons-gce/data/aws_s3_object_cluster-completed.spec_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,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
Expand Down
2 changes: 1 addition & 1 deletion ...e_cluster/many-addons-gce/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion ..._s3_object_minimal.example.com-addons-gcp-cloud-controller.addons.k8s.io-k8s-1.23_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .../integration/update_cluster/minimal_gce/data/aws_s3_object_cluster-completed.spec_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,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
Expand Down
2 changes: 1 addition & 1 deletion ...e_cluster/minimal_gce/data/aws_s3_object_minimal-gce.example.com-addons-bootstrap_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion ...object_minimal-gce.example.com-addons-gcp-cloud-controller.addons.k8s.io-k8s-1.23_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ...ion/update_cluster/minimal_gce_dns-none/data/aws_s3_object_cluster-completed.spec_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,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
Expand Down
2 changes: 1 addition & 1 deletion .../minimal_gce_dns-none/data/aws_s3_object_minimal-gce.example.com-addons-bootstrap_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion ...object_minimal-gce.example.com-addons-gcp-cloud-controller.addons.k8s.io-k8s-1.23_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ...egration/update_cluster/minimal_gce_ilb/data/aws_s3_object_cluster-completed.spec_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,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
Expand Down
2 changes: 1 addition & 1 deletion ...r/minimal_gce_ilb/data/aws_s3_object_minimal-gce-ilb.example.com-addons-bootstrap_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion ...ct_minimal-gce-ilb.example.com-addons-gcp-cloud-controller.addons.k8s.io-k8s-1.23_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ...cluster/minimal_gce_ilb_longclustername/data/aws_s3_object_cluster-completed.spec_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,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
Expand Down
2 changes: 1 addition & 1 deletion ...inimal-gce-with-a-very-very-very-very-very-long-name.example.com-addons-bootstrap_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion ...ery-very-long-name.example.com-addons-gcp-cloud-controller.addons.k8s.io-k8s-1.23_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ...ate_cluster/minimal_gce_longclustername/data/aws_s3_object_cluster-completed.spec_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,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
Expand Down
2 changes: 1 addition & 1 deletion ...inimal-gce-with-a-very-very-very-very-very-long-name.example.com-addons-bootstrap_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion ...ery-very-long-name.example.com-addons-gcp-cloud-controller.addons.k8s.io-k8s-1.23_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ...egration/update_cluster/minimal_gce_plb/data/aws_s3_object_cluster-completed.spec_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,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
Expand Down
2 changes: 1 addition & 1 deletion ...r/minimal_gce_plb/data/aws_s3_object_minimal-gce-plb.example.com-addons-bootstrap_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion ...ct_minimal-gce-plb.example.com-addons-gcp-cloud-controller.addons.k8s.io-k8s-1.23_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ...tion/update_cluster/minimal_gce_private/data/aws_s3_object_cluster-completed.spec_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,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
Expand Down
2 changes: 1 addition & 1 deletion ...l_gce_private/data/aws_s3_object_minimal-gce-private.example.com-addons-bootstrap_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion ...inimal-gce-private.example.com-addons-gcp-cloud-controller.addons.k8s.io-k8s-1.23_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading