Skip to content
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.

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

Update CCM for k8s 1.31 #842

Merged
merged 2 commits into from
Sep 12, 2024
Merged

Conversation

AndreasBurger
Copy link
Member

How to categorize this PR?

/area control-plane
/kind cleanup
/platform gcp

What this PR does / why we need it:
Updates the CCM to be used for kubernetes 1.31.0 or greater to the one provided by GCP.

Which issue(s) this PR fixes:
Fixes #679

Special notes for your reviewer:
see inline comment

Release note:

Switch to upstream CCM for kubernetes versions greater than `1.31.0`

@AndreasBurger AndreasBurger requested review from a team as code owners September 10, 2024 11:58
@gardener-robot gardener-robot added needs/review Needs review area/control-plane Control plane related kind/cleanup Something that is not needed anymore and can be cleaned up platform/gcp Google cloud platform/infrastructure size/xs Size of pull request is tiny (see gardener-robot robot/bots/size.py) labels Sep 10, 2024
@gardener-robot-ci-1 gardener-robot-ci-1 added reviewed/ok-to-test Has approval for testing (check PR in detail before setting this label because PR is run on CI/CD) needs/ok-to-test Needs approval for testing (check PR in detail before setting this label because PR is run on CI/CD) and removed reviewed/ok-to-test Has approval for testing (check PR in detail before setting this label because PR is run on CI/CD) labels Sep 10, 2024
Comment on lines 40 to 42
{{- if le (semver .Values.kubernetesVersion | (semver "1.31.0").Compare) 0 }}
command: ["/cloud-controller-manager"]
{{- end}}
Copy link
Member Author

@AndreasBurger AndreasBurger Sep 10, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not entirely sure whether that is the way to go. This would work, but it is a bit unwieldy and we should remove the condition once older versions drop out of support.

However, we use ENTRYPOINT in our image whereas the upstream one uses CMD (and sets ENTRYPOINT to /go-runner), so one could be tempted to just specify CMD explicitly for both cases. However, in that case we would have to set it to /gcp-cloud-controller-manager for our images, so the conditional here would remain.

@AndreasBurger
Copy link
Member Author

verify failing due to golang 1.23 related stuff. Will rebase once fix is on master.

@gardener-robot-ci-3 gardener-robot-ci-3 added reviewed/ok-to-test Has approval for testing (check PR in detail before setting this label because PR is run on CI/CD) and removed reviewed/ok-to-test Has approval for testing (check PR in detail before setting this label because PR is run on CI/CD) labels Sep 11, 2024
@AndreasBurger
Copy link
Member Author

Rebased.

@gardener-robot-ci-2 gardener-robot-ci-2 added the reviewed/ok-to-test Has approval for testing (check PR in detail before setting this label because PR is run on CI/CD) label Sep 12, 2024
@gardener-robot-ci-1 gardener-robot-ci-1 removed the reviewed/ok-to-test Has approval for testing (check PR in detail before setting this label because PR is run on CI/CD) label Sep 12, 2024
Copy link
Contributor

@kon-angelo kon-angelo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

@gardener-robot gardener-robot added reviewed/lgtm Has approval for merging and removed needs/review Needs review labels Sep 12, 2024
@gardener-robot-ci-1 gardener-robot-ci-1 added the reviewed/ok-to-test Has approval for testing (check PR in detail before setting this label because PR is run on CI/CD) label Sep 12, 2024
@AndreasBurger AndreasBurger merged commit 1cf4a4d into gardener:master Sep 12, 2024
13 checks passed
@gardener-robot gardener-robot added the status/closed Issue is closed (either delivered or triaged) label Sep 12, 2024
ialidzhikov added a commit to ialidzhikov/gardener-extension-provider-gcp that referenced this pull request Sep 16, 2024
The cloud-controller-manager image for K8s 1.31 was already adapted with gardener#842.
ialidzhikov added a commit to ialidzhikov/gardener-extension-provider-gcp that referenced this pull request Sep 16, 2024
The cloud-controller-manager image for K8s 1.31 was already adapted with gardener#842.
ialidzhikov added a commit to ialidzhikov/gardener-extension-provider-gcp that referenced this pull request Sep 27, 2024
The cloud-controller-manager image for K8s 1.31 was already adapted with gardener#842.
kon-angelo pushed a commit that referenced this pull request Oct 4, 2024
* Add Kubernetes 1.31 support to README.md

* Update cloud-controller-manager images

The cloud-controller-manager image for K8s 1.31 was already adapted with #842.

* Adapt to the removal of the `InTreePluginGCEUnregister` feature gate

* Adapt to the removal of the `PersistentVolumeLabel` admission plugin
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/control-plane Control plane related kind/cleanup Something that is not needed anymore and can be cleaned up needs/ok-to-test Needs approval for testing (check PR in detail before setting this label because PR is run on CI/CD) platform/gcp Google cloud platform/infrastructure reviewed/lgtm Has approval for merging reviewed/ok-to-test Has approval for testing (check PR in detail before setting this label because PR is run on CI/CD) size/xs Size of pull request is tiny (see gardener-robot robot/bots/size.py) status/closed Issue is closed (either delivered or triaged)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Consider switching to the out-of-tree GCP cloud-controller-manager
6 participants