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

Upgrade k8s.io/* to v0.28, sigs.k8s.io/controller-runtime to v0.16 #8464

Merged
merged 15 commits into from Sep 19, 2023

Conversation

acumino
Copy link
Member

@acumino acumino commented Sep 12, 2023

How to categorize this PR?

/area open-source
/kind enhancement

What this PR does / why we need it:
This PR vendor k8s.io/*@v0.28.2, sigs.k8s.io/controller-runtime@v0.16.2 and sigs.k8s.io/controller-tools@v0.13.0 and adapts to the breaking / most notable changes

Which issue(s) this PR fixes:
Part of #8382

Special notes for your reviewer:
In draft for -

Release note:

The following golang dependencies have been upgraded, please consult the upstream release notes and [this issue](https://github.com/gardener/gardener/issues/8382) for guidance on upgrading your golang dependencies when vendoring this gardener version:
- `k8s.io/*` to `v0.28.2`
- `sigs.k8s.io/controller-runtime` to `v0.16.2`
- `sigs.k8s.io/controller-tools` to `v0.13.0`
`leader-election-resource-lock` flag is dropped and the leader-election resource-lock is hard coded to leases.

@gardener-prow
Copy link
Contributor

gardener-prow bot commented Sep 12, 2023

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

@gardener-prow gardener-prow bot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. do-not-merge/invalid-commit-message Indicates that a PR should not merge because it has an invalid commit message. area/open-source Open Source (community, enablement, contributions, conferences, CNCF, etc.) related kind/enhancement Enhancement, improvement, extension cla: yes Indicates the PR's author has signed the cla-assistant.io CLA. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Sep 12, 2023
@acumino acumino changed the title Vendor k/*@v0.28 and controller-runtime@v0.16 Vendor k/*v0.28 and controller-runtimev0.16 Sep 12, 2023
@gardener-prow gardener-prow bot removed the do-not-merge/invalid-commit-message Indicates that a PR should not merge because it has an invalid commit message. label Sep 12, 2023
@gardener-prow gardener-prow bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Sep 13, 2023
@gardener-prow gardener-prow bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Sep 13, 2023
@rfranzke rfranzke changed the title Vendor k/*v0.28 and controller-runtimev0.16 Upgrade k8s.io/* to v0.28, sigs.k8s.io/controller-runtime to v0.16 Sep 13, 2023
@gardener-prow gardener-prow bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Sep 13, 2023
@gardener-prow gardener-prow bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Sep 14, 2023
@shafeeqes
Copy link
Contributor

Please also update

ENVTEST_K8S_VERSION=${ENVTEST_K8S_VERSION:-"1.27"}

and the version in integration tests like
TargetKubernetesVersion: semver.MustParse("1.27.0"),

@shafeeqes
Copy link
Contributor

v0.16.2 also contains kubernetes-sigs/controller-runtime#2472, I have not checked in detail, but from kubernetes-sigs/controller-runtime#2425 (comment), it seems like it fixes what kubernetes-sigs/controller-runtime#2425 was trying to.

@acumino
Copy link
Member Author

acumino commented Sep 15, 2023

Please also update

ENVTEST_K8S_VERSION=${ENVTEST_K8S_VERSION:-"1.27"}

and the version in integration tests like

TargetKubernetesVersion: semver.MustParse("1.27.0"),

It can only be done once 1.28 is support is available.

v0.16.2 also contains kubernetes-sigs/controller-runtime#2472, I have not checked in detail, but from kubernetes-sigs/controller-runtime#2425 (comment), it seems like it fixes what kubernetes-sigs/controller-runtime#2425 was trying to.

I will check for it separately(separate PR).

@acumino acumino marked this pull request as ready for review September 15, 2023 14:56
@gardener-prow gardener-prow bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Sep 15, 2023
@acumino
Copy link
Member Author

acumino commented Sep 15, 2023

/retest

@gardener-prow gardener-prow bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Sep 19, 2023
@gardener-prow gardener-prow bot removed the lgtm Indicates that a PR is ready to be merged. label Sep 19, 2023
@acumino
Copy link
Member Author

acumino commented Sep 19, 2023

/hold
Something wrong is going on with GitHub changes pushed to the branch is not getting reflected in PR.

@gardener-prow gardener-prow bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Sep 19, 2023
@gardener-prow
Copy link
Contributor

gardener-prow bot commented Sep 19, 2023

@acumino: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
pull-gardener-apidiff 21e1b1c link false /test pull-gardener-apidiff

Full PR test history. Your PR dashboard. Command help for this repository.
Please help us cut down on flakes by linking this test failure to an open flake report or filing a new flake report if you can't find an existing one. Also see our testing guideline for how to avoid and hunt flakes.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

@acumino
Copy link
Member Author

acumino commented Sep 19, 2023

/unhold

@gardener-prow gardener-prow bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Sep 19, 2023
@acumino acumino force-pushed the k8s128 branch 2 times, most recently from 73a38d4 to 85a9a9a Compare September 19, 2023 13:44
@shafeeqes
Copy link
Contributor

/lgtm

@gardener-prow gardener-prow bot added the lgtm Indicates that a PR is ready to be merged. label Sep 19, 2023
@gardener-prow
Copy link
Contributor

gardener-prow bot commented Sep 19, 2023

LGTM label has been added.

Git tree hash: b57b14f12fb36bb1dc16f16d84009c309d7582b6

@gardener-prow gardener-prow bot merged commit b60abf2 into gardener:master Sep 19, 2023
15 of 16 checks passed
@acumino acumino deleted the k8s128 branch September 19, 2023 14:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/open-source Open Source (community, enablement, contributions, conferences, CNCF, etc.) related cla: yes Indicates the PR's author has signed the cla-assistant.io CLA. kind/enhancement Enhancement, improvement, extension lgtm Indicates that a PR is ready to be merged. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants