✨ Add kubeadm v1beta4 types #10709

fabriziopandini · 2024-05-31T13:58:31Z

What this PR does / why we need it:
Playing around this issue, still need to figure out some stuff

Which issue(s) this PR fixes:
Fixes #10708
Part of #10653

/area provider/bootstrap-kubeadm

…lane to Init/JoinConfiguration.Timeouts.ControlPlaneComponentHealthCheck

…uration.Timeouts.TLSBootstrap

sbueringer

Really nice work and clean implementation!

bootstrap/kubeadm/internal/controllers/kubeadmconfig_controller.go

bootstrap/kubeadm/types/upstreamv1beta1/conversion_test.go

bootstrap/kubeadm/types/upstreamv1beta3/conversion.go

bootstrap/kubeadm/types/upstreamv1beta4/bootstraptokenstring.go

bootstrap/kubeadm/types/upstreamv1beta4/conversion.go

bootstrap/kubeadm/types/upstreamv1beta4/conversion_test.go

bootstrap/kubeadm/types/utils.go

sbueringer · 2024-06-14T14:11:38Z

/test pull-cluster-api-e2e-main

sbueringer · 2024-06-14T14:12:03Z

/test pull-cluster-api-e2e-upgrade-1-30-1-31-main
(no idea if this could work :))

bootstrap/kubeadm/types/utils.go

sbueringer · 2024-06-17T13:56:28Z

/test pull-cluster-api-e2e-upgrade-1-30-1-31-main

sbueringer · 2024-06-17T14:12:55Z

/test ?

k8s-ci-robot · 2024-06-17T14:12:57Z

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

/test pull-cluster-api-build-main
/test pull-cluster-api-e2e-blocking-main
/test pull-cluster-api-e2e-conformance-ci-latest-main
/test pull-cluster-api-e2e-conformance-main
/test pull-cluster-api-e2e-main
/test pull-cluster-api-e2e-mink8s-main
/test pull-cluster-api-e2e-upgrade-1-30-1-31-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

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

sbueringer · 2024-06-17T14:13:20Z

/test pull-cluster-api-e2e-conformance-ci-latest-main
/test pull-cluster-api-e2e-conformance-main
/test pull-cluster-api-e2e-main
/test pull-cluster-api-e2e-mink8s-main
/test pull-cluster-api-e2e-upgrade-1-30-1-31-main

sbueringer · 2024-06-17T14:15:56Z

/cherry-pick release-1.7

(required for Kubernetes 1.31 support)

k8s-infra-cherrypick-robot · 2024-06-17T14:15:58Z

@sbueringer: once the present PR merges, I will cherry-pick it on top of release-1.7 in a new PR and assign it to you.

In response to this:

/cherry-pick release-1.7

(required for Kubernetes 1.31 support)

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 · 2024-06-17T14:56:52Z

/hold

until all jobs are finished. Also want to see if main fails without this PR (with the merged kubeadm PR in k/k, xref: kubernetes/kubernetes#125029)

/assign @chrischdi

bootstrap/kubeadm/internal/controllers/kubeadmconfig_controller.go

sbueringer · 2024-06-17T16:04:53Z

/test pull-cluster-api-e2e-conformance-ci-latest-main
/test pull-cluster-api-e2e-conformance-main
/test pull-cluster-api-e2e-main
/test pull-cluster-api-e2e-mink8s-main
/test pull-cluster-api-e2e-upgrade-1-30-1-31-main

sbueringer · 2024-06-17T16:05:21Z

/lgtm
from my side

k8s-ci-robot · 2024-06-17T16:05:27Z

LGTM label has been added.

Git tree hash: d4aaaa312379a3f86c6e3949529a0fbf0057624d

k8s-ci-robot · 2024-06-17T16:07:12Z

@fabriziopandini: 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	`9b3e4d9`	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-sigs/prow repository. I understand the commands that are listed here.

chrischdi · 2024-06-17T16:12:14Z

/approve

k8s-ci-robot · 2024-06-17T16:12:23Z

[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:

~~OWNERS~~ [chrischdi]

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

sbueringer · 2024-06-17T18:18:16Z

/hold cancel

periodics were green even without this change (just fyi)

k8s-infra-cherrypick-robot · 2024-06-17T18:23:29Z

@sbueringer: #10709 failed to apply on top of branch "release-1.7":

Applying: Add kubeadm v1beta4 types
Applying: cleanup conversions for kubeadm v1beta1, v1beta2, v1beta3
Applying: Implement conversions for kubeadm v1beta4 types
Using index info to reconstruct a base tree...
M	Makefile
Falling back to patching base and 3-way merge...
Auto-merging Makefile
CONFLICT (content): Merge conflict in Makefile
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0003 Implement conversions for kubeadm v1beta4 types
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-1.7

(required for Kubernetes 1.31 support)

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.

* 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 added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. area/provider/bootstrap-kubeadm Issues or PRs related to CAPBK cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels May 31, 2024

k8s-ci-robot requested review from jackfrancis and JoelSpeed May 31, 2024 13:58

k8s-ci-robot added the size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. label May 31, 2024

fabriziopandini added 5 commits June 12, 2024 21:23

Add kubeadm v1beta4 types

a7cb7ec

cleanup conversions for kubeadm v1beta1, v1beta2, v1beta3

67c5f4b

Implement conversions for kubeadm v1beta4 types

73caf8f

Handle Migration of ClusterConfiguration.APIServer.TimeoutForControlP…

8c17470

…lane to Init/JoinConfiguration.Timeouts.ControlPlaneComponentHealthCheck

Handle Migration of JoinConfiguration.Discovery.Timeout to JoinConfig…

a0a370a

…uration.Timeouts.TLSBootstrap

fabriziopandini force-pushed the support-kubeadm-v1beta4-api branch from c905373 to a728ea1 Compare June 13, 2024 10:58

Final alignment with kubeadm PR

d1b981f

fabriziopandini force-pushed the support-kubeadm-v1beta4-api branch from a728ea1 to d1b981f Compare June 13, 2024 11:15

fabriziopandini mentioned this pull request Jun 13, 2024

Implement support for kubeadm v1beta4 API #10708

Open

10 tasks

sbueringer reviewed Jun 14, 2024

View reviewed changes

kubernetes-sigs deleted a comment from k8s-ci-robot Jun 14, 2024

sbueringer reviewed Jun 14, 2024

View reviewed changes

bootstrap/kubeadm/types/utils.go Outdated Show resolved Hide resolved

Address comments

d049e32

sbueringer mentioned this pull request Jun 17, 2024

Tasks to bump to Kubernetes v1.31 #10653

Open

14 tasks

sbueringer changed the title ~~[WIP] ✨ add kubeadm v1beta4 types~~ ✨ Add kubeadm v1beta4 types Jun 17, 2024

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 Jun 17, 2024

sbueringer added the tide/merge-method-squash Denotes a PR that should be squashed by tide when it merges. label Jun 17, 2024

k8s-ci-robot assigned chrischdi Jun 17, 2024

k8s-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jun 17, 2024

chrischdi reviewed Jun 17, 2024

View reviewed changes

bootstrap/kubeadm/internal/controllers/kubeadmconfig_controller.go Outdated Show resolved Hide resolved

fix nit

9b3e4d9

sbueringer force-pushed the support-kubeadm-v1beta4-api branch from 675cbb6 to 9b3e4d9 Compare June 17, 2024 16:04

k8s-ci-robot assigned sbueringer Jun 17, 2024

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

k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 17, 2024

k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jun 17, 2024

k8s-ci-robot merged commit dc88672 into kubernetes-sigs:main Jun 17, 2024
24 of 25 checks passed

k8s-ci-robot added this to the v1.8 milestone Jun 17, 2024

sbueringer mentioned this pull request Jun 17, 2024

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

Merged

fabriziopandini deleted the support-kubeadm-v1beta4-api branch June 24, 2024 11:45

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

✨ Add kubeadm v1beta4 types #10709

✨ Add kubeadm v1beta4 types #10709

fabriziopandini commented May 31, 2024 •

edited by sbueringer

Loading

sbueringer left a comment

sbueringer commented Jun 14, 2024

sbueringer commented Jun 14, 2024

sbueringer commented Jun 17, 2024

sbueringer commented Jun 17, 2024

k8s-ci-robot commented Jun 17, 2024

sbueringer commented Jun 17, 2024

sbueringer commented Jun 17, 2024

k8s-infra-cherrypick-robot commented Jun 17, 2024

sbueringer commented Jun 17, 2024 •

edited

Loading

sbueringer commented Jun 17, 2024

sbueringer commented Jun 17, 2024

k8s-ci-robot commented Jun 17, 2024

k8s-ci-robot commented Jun 17, 2024

chrischdi commented Jun 17, 2024

k8s-ci-robot commented Jun 17, 2024

sbueringer commented Jun 17, 2024

k8s-infra-cherrypick-robot commented Jun 17, 2024

✨ Add kubeadm v1beta4 types #10709

✨ Add kubeadm v1beta4 types #10709

Conversation

fabriziopandini commented May 31, 2024 • edited by sbueringer Loading

sbueringer left a comment

Choose a reason for hiding this comment

sbueringer commented Jun 14, 2024

sbueringer commented Jun 14, 2024

sbueringer commented Jun 17, 2024

sbueringer commented Jun 17, 2024

k8s-ci-robot commented Jun 17, 2024

sbueringer commented Jun 17, 2024

sbueringer commented Jun 17, 2024

k8s-infra-cherrypick-robot commented Jun 17, 2024

sbueringer commented Jun 17, 2024 • edited Loading

sbueringer commented Jun 17, 2024

sbueringer commented Jun 17, 2024

k8s-ci-robot commented Jun 17, 2024

k8s-ci-robot commented Jun 17, 2024

chrischdi commented Jun 17, 2024

k8s-ci-robot commented Jun 17, 2024

sbueringer commented Jun 17, 2024

k8s-infra-cherrypick-robot commented Jun 17, 2024

fabriziopandini commented May 31, 2024 •

edited by sbueringer

Loading

sbueringer commented Jun 17, 2024 •

edited

Loading