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

[release-1.7] ✨ Add kubeadm v1beta4 types #10771

Merged
merged 1 commit into from
Jun 18, 2024
Merged

[release-1.7] ✨ Add kubeadm v1beta4 types #10771

merged 1 commit into from
Jun 18, 2024

Conversation

sbueringer
Copy link
Member

What this PR does / why we need it:
Manual cherry-pick of #10709

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

@k8s-ci-robot k8s-ci-robot added this to the v1.7 milestone Jun 17, 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/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Jun 17, 2024
@sbueringer sbueringer mentioned this pull request Jun 17, 2024
Open
15 tasks
@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-release-1-7
  • /test pull-cluster-api-e2e-blocking-release-1-7
  • /test pull-cluster-api-e2e-conformance-ci-latest-release-1-7
  • /test pull-cluster-api-e2e-conformance-release-1-7
  • /test pull-cluster-api-e2e-mink8s-release-1-7
  • /test pull-cluster-api-e2e-release-1-7
  • /test pull-cluster-api-e2e-upgrade-1-29-1-30-release-1-7
  • /test pull-cluster-api-test-mink8s-release-1-7
  • /test pull-cluster-api-test-release-1-7
  • /test pull-cluster-api-verify-release-1-7

The following commands are available to trigger optional jobs:

  • /test pull-cluster-api-apidiff-release-1-7

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

  • pull-cluster-api-apidiff-release-1-7
  • pull-cluster-api-build-release-1-7
  • pull-cluster-api-e2e-blocking-release-1-7
  • pull-cluster-api-test-release-1-7
  • pull-cluster-api-verify-release-1-7

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-sigs/prow repository.

@sbueringer sbueringer added the area/provider/bootstrap-kubeadm Issues or PRs related to CAPBK label Jun 17, 2024
@k8s-ci-robot k8s-ci-robot removed the do-not-merge/needs-area PR is missing an area label label Jun 17, 2024
@sbueringer
Copy link
Member Author

/assign @chrischdi

(fyi, only had to resolve merge conflicts in Makefile)

@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-release-1-7
  • /test pull-cluster-api-e2e-blocking-release-1-7
  • /test pull-cluster-api-e2e-conformance-ci-latest-release-1-7
  • /test pull-cluster-api-e2e-conformance-release-1-7
  • /test pull-cluster-api-e2e-mink8s-release-1-7
  • /test pull-cluster-api-e2e-release-1-7
  • /test pull-cluster-api-e2e-upgrade-1-29-1-30-release-1-7
  • /test pull-cluster-api-test-mink8s-release-1-7
  • /test pull-cluster-api-test-release-1-7
  • /test pull-cluster-api-verify-release-1-7

The following commands are available to trigger optional jobs:

  • /test pull-cluster-api-apidiff-release-1-7

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

  • pull-cluster-api-apidiff-release-1-7
  • pull-cluster-api-build-release-1-7
  • pull-cluster-api-e2e-blocking-release-1-7
  • pull-cluster-api-test-release-1-7
  • pull-cluster-api-verify-release-1-7

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-sigs/prow repository.

@sbueringer
Copy link
Member Author

/test pull-cluster-api-e2e-conformance-ci-latest-release-1-7
/test pull-cluster-api-e2e-conformance-release-1-7
/test pull-cluster-api-e2e-mink8s-release-1-7
/test pull-cluster-api-e2e-release-1-7
/test pull-cluster-api-e2e-upgrade-1-29-1-30-release-1-7

@sbueringer
Copy link
Member Author

/test pull-cluster-api-e2e-conformance-ci-latest-release-1-7
/test pull-cluster-api-e2e-conformance-release-1-7
/test pull-cluster-api-e2e-mink8s-release-1-7
/test pull-cluster-api-e2e-release-1-7
/test pull-cluster-api-e2e-upgrade-1-29-1-30-release-1-7

@fabriziopandini @sbueringer
✨ Add kubeadm v1beta4 types (kubernetes-sigs#10709)
ba281e4 
* Add kubeadm v1beta4 types

* cleanup conversions for kubeadm v1beta1, v1beta2, v1beta3

* Implement conversions for kubeadm v1beta4 types

* Handle Migration of ClusterConfiguration.APIServer.TimeoutForControlPlane to Init/JoinConfiguration.Timeouts.ControlPlaneComponentHealthCheck

* Handle Migration of JoinConfiguration.Discovery.Timeout to JoinConfiguration.Timeouts.TLSBootstrap

* Final alignment with kubeadm PR

* Address comments

* fix nit

---------

Co-authored-by: Stefan Bueringer <buringerst@vmware.com>
@k8s-ci-robot
Copy link
Contributor

k8s-ci-robot commented Jun 18, 2024 •
edited

@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-release-1-7 ba281e4 link false /test pull-cluster-api-apidiff-release-1-7

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-sigs/prow repository. I understand the commands that are listed here.

@sbueringer
Copy link
Member Author

/test pull-cluster-api-e2e-conformance-ci-latest-release-1-7
/test pull-cluster-api-e2e-conformance-release-1-7
/test pull-cluster-api-e2e-mink8s-release-1-7
/test pull-cluster-api-e2e-release-1-7
/test pull-cluster-api-e2e-upgrade-1-29-1-30-release-1-7

@chrischdi
Copy link
Member

/lgtm
/approve

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

LGTM label has been added.

Git tree hash: cf251baa3be00e57ddbb4d79a6d8eecef4272be6

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: chrischdi

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 Jun 18, 2024
@k8s-ci-robot k8s-ci-robot merged commit abd3c4c into kubernetes-sigs:release-1.7 Jun 18, 2024
24 of 25 checks passed
@kranurag7 kranurag7 mentioned this pull request Jul 11, 2024
Merged
3 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@fabriziopandini fabriziopandini Awaiting requested review from fabriziopandini

@jackfrancis jackfrancis Awaiting requested review from jackfrancis

Assignees

@chrischdi chrischdi

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/provider/bootstrap-kubeadm Issues or PRs related to CAPBK 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/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Milestone
v1.7
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@sbueringer @k8s-ci-robot @chrischdi @fabriziopandini