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.

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

Jump to bottom

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

Merged
merged 14 commits into from Apr 10, 2024
Merged

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

merged 14 commits into from Apr 10, 2024

Conversation

ialidzhikov
Copy link
Member

@ialidzhikov ialidzhikov commented Mar 26, 2024 •
edited

How to categorize this PR?

/kind enhancement

What this PR does / why we need it:
Upgrade k8s.io/* to v0.28, sigs.k8s.io/controller-runtime to v0.16.

The most notable sigs.k8s.io/controller-runtime changes are described in:

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

Special notes for your reviewer:

  • It is recommended to review the PR commit by commit.
  • I decided to drop the units tests for AddToManager funcs:

    gardener-custom-metrics/pkg/input/controller/controller_test.go

    Line 38 in 24edc50

    Describe("AddNewControllerToManager", func() {
    and

    gardener-custom-metrics/pkg/input/input_data_service_test.go

    Line 74 in 24edc50

    Describe("AddToManager", func() {
    . The reason is that with the new version of the sigs.k8s.io/controller-runtime dependency we need to do the following change: 
    -	if err := controller.Watch(&source.Kind{Type: args.ControlledObjectType}, &handler.EnqueueRequestForObject{}, args.Predicates...); err != nil {
+	if err := controller.Watch(source.Kind(mgr.GetCache(), args.ControlledObjectType), &handler.EnqueueRequestForObject{}, args.Predicates...); err != nil {
    The mgr.GetCache() is not used when setting up the watch and this requires to add a fake cache implementation to the fake manager we have. We don't unit test AddToManager funcs in gardener/gardener (or in any other repo). This should be rather covered with e2e tests.
  • This PR depends on vendor/ dir removal: Drop vendoring #13

Release note:

The following dependencies are updated:
- `k8s.io/*` : `v0.23.17` -> `v0.28.3`
- `sigs.k8s.io/controller-runtime`: `v0.11.2` -> `v0.16.5`

@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 Mar 26, 2024
@gardener-robot gardener-robot added kind/enhancement Enhancement, improvement, extension needs/review Needs review size/xl Size of pull request is huge (see gardener-robot robot/bots/size.py) needs/second-opinion Needs second review by someone else labels Mar 26, 2024
@gardener-robot-ci-3 gardener-robot-ci-3 added 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 Mar 26, 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 Mar 27, 2024
@gardener-robot-ci-2 gardener-robot-ci-2 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 Mar 27, 2024
@ialidzhikov ialidzhikov changed the title [WIP] Upgrade k8s.io/* to v0.28, sigs.k8s.io/controller-runtime to v0.16 Upgrade k8s.io/* to v0.28, sigs.k8s.io/controller-runtime to v0.16 Mar 27, 2024
@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 Mar 27, 2024
@gardener-robot-ci-3 gardener-robot-ci-3 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 Mar 27, 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) 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 Mar 27, 2024
@ialidzhikov ialidzhikov mentioned this pull request Mar 27, 2024
Closed
@gardener-robot-ci-3 gardener-robot-ci-3 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 Mar 28, 2024
@gardener-robot-ci-2 gardener-robot-ci-2 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 Mar 28, 2024
@ialidzhikov ialidzhikov marked this pull request as ready for review March 28, 2024 07:34
@ialidzhikov ialidzhikov requested a review from a team as a code owner March 28, 2024 07:34
@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 Mar 28, 2024
@ialidzhikov ialidzhikov mentioned this pull request Mar 28, 2024
Open
29 tasks
@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) 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 Mar 31, 2024
@gardener-robot-ci-2 gardener-robot-ci-2 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 Apr 5, 2024
@plkokanov
Copy link

/unhold
/ok-to-test
The issues with github have been resolved and the adaptations should now be present

@gardener-robot gardener-robot removed the reviewed/do-not-merge Has no approval for merging as it may break things, be of poor quality or have (ext.) dependencies label Apr 5, 2024
@plkokanov plkokanov 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 needs/ok-to-test Needs approval for testing (check PR in detail before setting this label because PR is run on CI/CD) labels Apr 5, 2024
@ialidzhikov
[prerequisite] Drop the unused client field from the actuators
bd5fe30
@ialidzhikov
[prerequisite] Drop dependency injection funcs
55fa1dd
@ialidzhikov
Upgrade k8s.io/* to v0.28, sigs.k8s.io/controller-runtime to `v…
2f8582a 
…0.16`
@ialidzhikov
Adapt to the breaking change in the manager.Options struct
38e2e0b
@ialidzhikov
Adapt to the breaking change how the watch is being set up
12b66ac
@ialidzhikov
Use the upstream fake client instead of a custom fake manager
4783272
@ialidzhikov
Drop unit tests for AddNewControllerToManager
7d924ca
@ialidzhikov
Use k8s.io/utils/ptr instead of the deprecated k8s.io/utils/pointer pkg
86d8456
@ialidzhikov
Use the upstream fake client instead of the custom fake client
36931e3
@ialidzhikov
Drop the custom fake client
33848c2
@ialidzhikov
Drop the fake manager
f1ab044
@ialidzhikov
Use consistent naming for the manager
30abc9f
@ialidzhikov
Drop custom OpenAPIConfig instead of the default one from custom-metr…
4f204e7 
…ics-apiserver

See gardener#8 (comment)
@ialidzhikov
Adapt to the breaking change how the cache is restricted to object wi…
f082b3b 
…th label selectors
@gardener-robot-ci-1 gardener-robot-ci-1 added 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 Apr 8, 2024
plkokanov
plkokanov approved these changes Apr 9, 2024
View reviewed changes
Copy link

@plkokanov plkokanov 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 needs/second-opinion Needs second review by someone else labels Apr 9, 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 Apr 9, 2024
@ialidzhikov ialidzhikov merged commit 7346aef into gardener:main Apr 10, 2024
5 checks passed
@ialidzhikov ialidzhikov deleted the enh/update-dependencies branch April 10, 2024 06:00
@gardener-robot gardener-robot added the status/closed Issue is closed (either delivered or triaged) label Apr 10, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@plkokanov plkokanov plkokanov approved these changes

Assignees

@plkokanov plkokanov

Labels
kind/enhancement Enhancement, improvement, extension needs/ok-to-test Needs approval for testing (check PR in detail before setting this label because PR is run on CI/CD) 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/xl Size of pull request is huge (see gardener-robot robot/bots/size.py) status/closed Issue is closed (either delivered or triaged)
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@ialidzhikov @plkokanov @gardener-robot-ci-1 @gardener-robot-ci-2 @gardener-robot-ci-3 @gardener-robot