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

✨ Add Patches field in InitConfiguration and JoinConfiguration #5897

Merged
merged 1 commit into from
Jan 18, 2022
Merged

✨ Add Patches field in InitConfiguration and JoinConfiguration #5897

merged 1 commit into from
Jan 18, 2022

Conversation

asifdxtreme
Copy link
Contributor

@asifdxtreme asifdxtreme commented Jan 4, 2022 •
edited
Loading

What this PR does / why we need it:
This PR adds the Patches field for InitConfiguration and JoinConfiguration which were recently added in kubernetes over here

Which issue(s) this PR fixes :
Fixes #4874

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Jan 4, 2022
@k8s-ci-robot
Copy link
Contributor

Welcome @asifdxtreme!

It looks like this is your first PR to kubernetes-sigs/cluster-api 🎉. Please refer to our pull request process documentation to help your PR have a smooth ride to approval.

You will be prompted by a bot to use commands during the review process. Do not be afraid to follow the prompts! It is okay to experiment. Here is the bot commands documentation.

You can also check if kubernetes-sigs/cluster-api has its own contribution guidelines.

You may want to refer to our testing guide if you run into trouble with your tests not passing.

If you are having difficulty getting your pull request seen, please follow the recommended escalation practices. Also, for tips and tricks in the contribution process you may want to read the Kubernetes contributor cheat sheet. We want to make sure your contribution gets all the attention it needs!

Thank you, and welcome to Kubernetes. 😃

@k8s-ci-robot
Copy link
Contributor

Hi @asifdxtreme. Thanks for your PR.

I'm waiting for a kubernetes-sigs member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

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.

@k8s-ci-robot k8s-ci-robot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Jan 4, 2022
@ShwethaKumbla
Copy link
Member

/ok-to-test

@k8s-ci-robot k8s-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Jan 4, 2022
apricote
apricote suggested changes Jan 5, 2022
View reviewed changes
Copy link
Member

@apricote apricote left a comment

Choose a reason for hiding this comment

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

I think the new fields must also be added to the bootstrap/kubeadm/types/upstreamv1beta3 types. The test failures seem to indicate the same.

fabriziopandini
fabriziopandini reviewed Jan 5, 2022
View reviewed changes
Copy link
Member

@fabriziopandini fabriziopandini left a comment

Choose a reason for hiding this comment

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

@asifdxtreme thanks for your first PR to Cluster API 🎉
A couple of nits on the field description. Also, conversion and conversions to/from following API should be updated according to those changes:

  • older version of the CABPK API (v1alpha3, v1alpha4)
  • all the version of upstram kubeam API (v1beta1, v1beta2, v1beta3)

bootstrap/kubeadm/api/v1beta1/kubeadm_types.go Outdated Show resolved Hide resolved
bootstrap/kubeadm/api/v1beta1/kubeadm_types.go Outdated Show resolved Hide resolved
bootstrap/kubeadm/api/v1beta1/kubeadm_types.go Outdated Show resolved Hide resolved
bootstrap/kubeadm/api/v1beta1/kubeadm_types.go Show resolved Hide resolved
@k8s-ci-robot k8s-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Jan 11, 2022
@asifdxtreme asifdxtreme force-pushed the patch-dir branch 2 times, most recently from 98cb3c8 to 38218f0 Compare January 12, 2022 02:08
@k8s-ci-robot k8s-ci-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. 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. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Jan 12, 2022
sbueringer
sbueringer reviewed Jan 18, 2022
View reviewed changes
Copy link
Member

@sbueringer sbueringer left a comment

Choose a reason for hiding this comment

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

Looks great! A few nits, otherwise lgtm from me

/cc @fabriziopandini

bootstrap/kubeadm/api/v1beta1/kubeadm_types.go Outdated Show resolved Hide resolved
bootstrap/kubeadm/api/v1beta1/kubeadm_types.go Outdated Show resolved Hide resolved
bootstrap/kubeadm/types/upstreamv1beta2/conversion_test.go Outdated Show resolved Hide resolved
bootstrap/kubeadm/types/upstreamv1beta3/types.go Outdated Show resolved Hide resolved
@asifdxtreme asifdxtreme changed the title ✨ Add additional fields in InitConfiguration and JoinConfiguration ✨ Add Patches field in InitConfiguration and JoinConfiguration Jan 18, 2022
@sbueringer
Copy link
Member

Thank you!
/lgtm

PTAL @fabriziopandini

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jan 18, 2022
fabriziopandini
fabriziopandini reviewed Jan 18, 2022
View reviewed changes
Copy link
Member

@fabriziopandini fabriziopandini left a comment

Choose a reason for hiding this comment

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

/lgtm
@vincepri @CecileRobertMichon @enxebre PTAL
This PR exposes a feature available in kubeadm starting from K8s 1.22 version onwards, the Patches field in the kubeadm InitConfiguration and JoinConfiguration.
NOTE: the field is silently ignored if specified for an older version of Kubernetes, but I'm leaning towards +1 given that I consider using kubeadm patches an advanced use case

vincepri
vincepri approved these changes Jan 18, 2022
View reviewed changes
Copy link
Member

@vincepri vincepri left a comment

Choose a reason for hiding this comment

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

/approve

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: vincepri

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 18, 2022
@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jan 18, 2022
@fabriziopandini
Copy link
Member

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jan 18, 2022
@k8s-ci-robot k8s-ci-robot merged commit 146988a into kubernetes-sigs:main Jan 18, 2022
@k8s-ci-robot k8s-ci-robot added this to the v1.1 milestone Jan 18, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@fabriziopandini fabriziopandini fabriziopandini left review comments

@sbueringer sbueringer sbueringer left review comments

@apricote apricote apricote requested changes

@vincepri vincepri vincepri approved these changes

@JoelSpeed JoelSpeed Awaiting requested review from JoelSpeed

Assignees

@sbueringer sbueringer

@fabriziopandini fabriziopandini

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. 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. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files.
Projects
None yet
Milestone
v1.1
Development

Successfully merging this pull request may close these issues.

Consider if to add Patches field to InitConfiguration and JoinConfiguration
7 participants
@asifdxtreme @k8s-ci-robot @ShwethaKumbla @sbueringer @fabriziopandini @vincepri @apricote