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

⚠️ Bump to controller-runtime v0.17.0 & k8s.io v0.29 #9964

Merged
merged 5 commits into from
Jan 17, 2024
Merged

⚠️ Bump to controller-runtime v0.17.0 & k8s.io v0.29 #9964

merged 5 commits into from
Jan 17, 2024

Conversation

sbueringer
Copy link
Member

@sbueringer sbueringer commented Jan 8, 2024 •
edited
Loading

Signed-off-by: Stefan Büringer buringerst@vmware.com

What this PR does / why we need it:
I've split the PR intentionally in separate commits, to make the follow-up tasks after the bump clear and to make it easier to review.

Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
Part of #9578

@k8s-ci-robot k8s-ci-robot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jan 8, 2024
@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. do-not-merge/needs-area PR is missing an area label size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Jan 8, 2024
@sbueringer sbueringer added the area/dependency Issues or PRs related to dependency changes label Jan 8, 2024
@k8s-ci-robot k8s-ci-robot removed the do-not-merge/needs-area PR is missing an area label label Jan 8, 2024
@sbueringer
Copy link
Member Author

/test ?

@k8s-ci-robot
Copy link
Contributor

@sbueringer: The following commands are available to trigger required jobs:

  • /test pull-cluster-api-build-main
  • /test pull-cluster-api-e2e-full-dualstack-and-ipv6-main
  • /test pull-cluster-api-e2e-full-main
  • /test pull-cluster-api-e2e-main
  • /test pull-cluster-api-e2e-mink8s-main
  • /test pull-cluster-api-e2e-workload-upgrade-1-29-latest-main
  • /test pull-cluster-api-test-main
  • /test pull-cluster-api-test-mink8s-main
  • /test pull-cluster-api-verify-main

The following commands are available to trigger optional jobs:

  • /test pull-cluster-api-apidiff-main
  • /test pull-cluster-api-e2e-scale-main-experimental

Use /test all to run the following jobs that were automatically triggered:

  • pull-cluster-api-apidiff-main
  • pull-cluster-api-build-main
  • pull-cluster-api-e2e-main
  • pull-cluster-api-test-main
  • pull-cluster-api-verify-main

In response to this:

/test ?

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.

@sbueringer
Copy link
Member Author

/test pull-cluster-api-e2e-full-main
/test pull-cluster-api-e2e-workload-upgrade-1-29-latest-main

/test pull-cluster-api-e2e-mink8s-main
/test pull-cluster-api-test-mink8s-main

@k8s-ci-robot k8s-ci-robot added size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Jan 9, 2024
@sbueringer
Copy link
Member Author

/test pull-cluster-api-e2e-full-main
/test pull-cluster-api-e2e-workload-upgrade-1-29-latest-main

/test pull-cluster-api-e2e-mink8s-main
/test pull-cluster-api-test-mink8s-main

@sbueringer sbueringer force-pushed the pr-bump-cr-v0.17 branch 2 times, most recently from 5a08f09 to 128c1c4 Compare January 10, 2024 16:59
@sbueringer
Copy link
Member Author

/test pull-cluster-api-e2e-full-main
/test pull-cluster-api-e2e-workload-upgrade-1-29-latest-main

/test pull-cluster-api-e2e-mink8s-main
/test pull-cluster-api-test-mink8s-main

@sbueringer
Copy link
Member Author

/test pull-cluster-api-e2e-full-main
/test pull-cluster-api-e2e-workload-upgrade-1-29-latest-main

/test pull-cluster-api-e2e-mink8s-main
/test pull-cluster-api-test-mink8s-main

@k8s-ci-robot k8s-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jan 16, 2024
@k8s-ci-robot k8s-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jan 16, 2024
@sbueringer
Bump to controller-runtime v0.17.0 & k8s.io v0.29.0
f265638 
Signed-off-by: Stefan Büringer buringerst@vmware.com
@sbueringer
Fix log level log line in main.go files
8d4a510 
Signed-off-by: Stefan Büringer buringerst@vmware.com
@sbueringer
Stop relying on GVK being set
acfa234 
Some more adjustments as fake client is now setting GVK only for Unstructured.
So I found a few more cases.

Signed-off-by: Stefan Büringer buringerst@vmware.com
@sbueringer
A few more default log level
3cf12d7 
Signed-off-by: Stefan Büringer buringerst@vmware.com
@sbueringer
Replace deprecated klogr.New()
4c5fa85 
Signed-off-by: Stefan Büringer buringerst@vmware.com
@sbueringer
Copy link
Member Author

/test pull-cluster-api-e2e-full-main
/test pull-cluster-api-e2e-workload-upgrade-1-29-latest-main

/test pull-cluster-api-e2e-mink8s-main
/test pull-cluster-api-test-mink8s-main

@sbueringer sbueringer changed the title [WIP] ⚠️ Bump to controller-runtime v0.17.0 & k8s.io v0.29 ⚠️ Bump to controller-runtime v0.17.0 & k8s.io v0.29 Jan 16, 2024
@k8s-ci-robot k8s-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jan 16, 2024
@sbueringer
Copy link
Member Author

/assign @fabriziopandini @chrischdi

Ready for review now

@sbueringer sbueringer mentioned this pull request Jan 16, 2024
Closed
14 tasks
@fabriziopandini
Copy link
Member

Great work!
/lgtm

What about adding a comment to the changes in API diff into the migration v16-->1.7 doc

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jan 16, 2024
@k8s-ci-robot
Copy link
Contributor

LGTM label has been added.

Git tree hash: df0c6a6308410438418a84d9939d2f3003f388ab

@kashifest
Copy link
Contributor

lgtm
Thanks @sbueringer , would this be backported to release-1.6 branch or ?

@sbueringer
Copy link
Member Author

lgtm Thanks @sbueringer , would this be backported to release-1.6 branch or ?

No. We consider minor bumps of controller-runtime and Kubernetes libraries a breaking change, so we won't backport them.

@kashifest
Copy link
Contributor

No. We consider minor bumps of controller-runtime and Kubernetes libraries a breaking change, so we won't backport them.

Makes sense, thanks

@k8s-ci-robot
Copy link
Contributor

k8s-ci-robot commented Jan 16, 2024 •
edited
Loading

@sbueringer: 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-cluster-api-apidiff-main 4c5fa85 link false /test pull-cluster-api-apidiff-main

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

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.

chrischdi
chrischdi reviewed Jan 16, 2024
View reviewed changes
Copy link
Member

@chrischdi chrischdi left a comment

Choose a reason for hiding this comment

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

Just some questions / nits around klogr.New replacements. lgtm otherwise

internal/controllers/machinedeployment/mdutil/util_test.go Show resolved Hide resolved
internal/controllers/machinedeployment/machinedeployment_sync_test.go Show resolved Hide resolved
internal/test/envtest/environment.go Show resolved Hide resolved
chrischdi
chrischdi reviewed Jan 17, 2024
View reviewed changes
Copy link
Member

@chrischdi chrischdi left a comment

Choose a reason for hiding this comment

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

/lgtm

@fabriziopandini
Copy link
Member

@sbueringer it seems that all the comments are addressed
are we good to go now?

@sbueringer
Copy link
Member Author

@fabriziopandini Yes we are!

@fabriziopandini
Copy link
Member

yay!
/lgtm
/approve

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: fabriziopandini

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 17, 2024
@k8s-ci-robot k8s-ci-robot merged commit 096ffa6 into kubernetes-sigs:main Jan 17, 2024
42 of 43 checks passed
@k8s-ci-robot k8s-ci-robot added this to the v1.7 milestone Jan 17, 2024
@g-gaston g-gaston mentioned this pull request Jan 22, 2024
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@chrischdi chrischdi chrischdi left review comments

@richardcase richardcase Awaiting requested review from richardcase

Assignees

@chrischdi chrischdi

@fabriziopandini fabriziopandini

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/dependency Issues or PRs related to dependency changes cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files.
Projects
None yet
Milestone
v1.7
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@sbueringer @k8s-ci-robot @fabriziopandini @kashifest @chrischdi