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 controller-runtime to 0.14.1 / k8s 1.26.1 #11600

Merged
merged 8 commits into from Jan 25, 2023
Merged

Bump controller-runtime to 0.14.1 / k8s 1.26.1 #11600

merged 8 commits into from Jan 25, 2023

Conversation

xrstf
Copy link
Contributor

@xrstf xrstf commented Dec 28, 2022 •
edited

What this PR does / why we need it:
This PR bumps ctrl-runtime to 0.14, Kubernetes 1.26 (to match what ctrl-runtime is using) and also machine-controller (required to make it compatible with ctrl-runtime 0.14).

99% of this PR is just adjusting to the new generics-based set implementation.

What type of PR is this?
/kind chore

Does this PR introduce a user-facing change? Then add your Release Note here:

Update codebase to Kubernetes 1.26

Documentation:

NONE

@kubermatic-bot kubermatic-bot added release-note Denotes a PR that will be considered when it comes time to generate release notes. docs/none Denotes a PR that doesn't need documentation (changes). kind/chore Updating grunt tasks etc; no production code changes. dco-signoff: yes Denotes that all commits in the pull request have the valid DCO signoff message. approved Indicates a PR has been approved by an approver from all required OWNERS files. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. sig/cluster-management Denotes a PR or issue as being assigned to SIG Cluster Management. sig/app-management Denotes a PR or issue as being assigned to SIG App Management. sig/networking Denotes a PR or issue as being assigned to SIG Networking. sig/virtualization Denotes a PR or issue as being assigned to SIG Virtualization. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed approved Indicates a PR has been approved by an approver from all required OWNERS files. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Dec 28, 2022
@xrstf xrstf changed the title bump controller-runtime to 0.14.1 / k8s 1.26.0 WIP - bump controller-runtime to 0.14.1 / k8s 1.26.0 Dec 28, 2022
@kubermatic-bot kubermatic-bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Dec 28, 2022
@xrstf
Copy link
Contributor Author

xrstf commented Dec 28, 2022

This is on hold because the generated CRDs are broken, due to kubernetes/kubernetes#114585 -- backport (kubernetes/kubernetes#114617) is merged, but 1.26.1 is not yet released.

@xrstf xrstf added the lifecycle/blocked Denotes an issue or PR is blocked. label Dec 28, 2022
@xrstf xrstf removed the lifecycle/blocked Denotes an issue or PR is blocked. label Jan 24, 2023
@xrstf xrstf changed the title WIP - bump controller-runtime to 0.14.1 / k8s 1.26.0 WIP - bump controller-runtime to 0.14.1 / k8s 1.26.1 Jan 24, 2023
@ahmedwaleedmalik
Copy link
Member

/retest

@ahmedwaleedmalik ahmedwaleedmalik added this to the KKP 2.22 milestone Jan 24, 2023
@xrstf xrstf changed the title WIP - bump controller-runtime to 0.14.1 / k8s 1.26.1 Bump controller-runtime to 0.14.1 / k8s 1.26.1 Jan 25, 2023
@kubermatic-bot kubermatic-bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jan 25, 2023
@mate4st
Copy link
Contributor

mate4st commented Jan 25, 2023

/approve

ahmedwaleedmalik
ahmedwaleedmalik approved these changes Jan 25, 2023
View reviewed changes
Copy link
Member

@ahmedwaleedmalik ahmedwaleedmalik left a comment

Choose a reason for hiding this comment

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

/approve

@kubermatic-bot kubermatic-bot added the lgtm Indicates that a PR is ready to be merged. label Jan 25, 2023
@kubermatic-bot
Copy link
Contributor

LGTM label has been added.

Git tree hash: bc0086f8bd63caef89d98c204a67e4a26e3b353a

@hdurand0710
Copy link
Contributor

/approve

@kubermatic-bot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ahmedwaleedmalik, hdurand0710, WeirdMachine, xrstf

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

@kubermatic-bot kubermatic-bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 25, 2023
@ahmedwaleedmalik ahmedwaleedmalik mentioned this pull request Jan 25, 2023
Merged
@ahmedwaleedmalik
Copy link
Member

/retest

@ahmedwaleedmalik
Copy link
Member

/retest
FFS

@xrstf
Copy link
Contributor Author

xrstf commented Jan 25, 2023

/retest

@kubermatic-bot
Copy link
Contributor

kubermatic-bot commented Jan 25, 2023 •
edited

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

Test name Commit Details Required Rerun command
pre-kubermatic-e2e-vsphere-ubuntu-1.25-customfolder 581bc23 link true /test pre-kubermatic-e2e-vsphere-ubuntu-1.25-customfolder
pre-kubermatic-e2e-vsphere-ubuntu-1.25 581bc23 link true /test pre-kubermatic-e2e-vsphere-ubuntu-1.25
pre-kubermatic-e2e-vsphere-ubuntu-1.25-datastore-cluster 581bc23 link true /test pre-kubermatic-e2e-vsphere-ubuntu-1.25-datastore-cluster

Full PR test history

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.

@xrstf
Copy link
Contributor Author

xrstf commented Jan 25, 2023

/retest

@kubermatic-bot kubermatic-bot merged commit 7239870 into kubermatic:main Jan 25, 2023
@xrstf xrstf deleted the ctrl-runtime-0.14.1 branch January 25, 2023 15:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ahmedwaleedmalik ahmedwaleedmalik ahmedwaleedmalik approved these changes

Assignees

@ahmedwaleedmalik ahmedwaleedmalik

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. dco-signoff: yes Denotes that all commits in the pull request have the valid DCO signoff message. docs/none Denotes a PR that doesn't need documentation (changes). kind/chore Updating grunt tasks etc; no production code changes. lgtm Indicates that a PR is ready to be merged. release-note Denotes a PR that will be considered when it comes time to generate release notes. sig/app-management Denotes a PR or issue as being assigned to SIG App Management. sig/cluster-management Denotes a PR or issue as being assigned to SIG Cluster Management. sig/networking Denotes a PR or issue as being assigned to SIG Networking. sig/virtualization Denotes a PR or issue as being assigned to SIG Virtualization. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Milestone
KKP 2.22
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@xrstf @ahmedwaleedmalik @mate4st @kubermatic-bot @hdurand0710