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.

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

🌱 Stop gap for kubeadm types removal #4227

Merged

Conversation

fabriziopandini
Copy link
Member

What this PR does / why we need it:
This PR implements a stop-gap solution for kubeadm types removal explicitly designed for back-porting on the v1alpha3 branch.

The solution implemented is described in the #4170 (and more specifically this is alternative 2 for v1alpha3).

After this will be backported, a proper conversion mechanism is going to be implemented in v1alpha4 only (also described in the proposal).

Which issue(s) this PR fixes:
Fixes #

/milestone v0.4.0
/hold
For the CAEP to merge

@vincepri

@k8s-ci-robot k8s-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Feb 23, 2021
@k8s-ci-robot k8s-ci-robot added this to the v0.4.0 milestone Feb 23, 2021
@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Feb 23, 2021
@k8s-ci-robot k8s-ci-robot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Feb 23, 2021
@vincepri
Copy link
Member

sigs.k8s.io/cluster-api/bootstrap/kubeadm/types/v1beta1
  Incompatible changes:
  - ConfigurationToYAML: changed from func(k8s.io/apimachinery/pkg/runtime.Object) (string, error) to func(k8s.io/apimachinery/pkg/runtime.Object, string) (string, error)
  - GetCodecs: removed
  - MarshalToYamlForCodecs: removed
  Compatible changes:
  - K8sVersionToKubeadmAPIGroupVersion: added

We should keep those exported functions, and Add a new ConfigurationToYAML

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.

Minor comments, otherwise lgtm

bootstrap/kubeadm/types/v1beta1/utils.go Outdated Show resolved Hide resolved
bootstrap/kubeadm/types/v1beta1/utils.go Outdated Show resolved Hide resolved
@vincepri
Copy link
Member

I don't think this change requires the proposal to be merged?

@fabriziopandini fabriziopandini force-pushed the kubeadm-types-stop-gap branch from 756e1eb to 805b781 Compare March 2, 2021 14:29
@fabriziopandini
Copy link
Member Author

I don't think this change requires the proposal to be merged?

As much test cycles we can get, the better!
The proposal is out from some time now and AFAIK there are no blockers. Also this PR was discussed in the last Meeting, and no objection were raised there/on this PR, so I guess we are fine.

@fabriziopandini
Copy link
Member Author

/hold cancel

@k8s-ci-robot k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Mar 2, 2021
@fabriziopandini
Copy link
Member Author

@CecileRobertMichon @detiber any objection to get this work moving so we can get as much a possible test cycles on this change?

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.

/lgtm

/assign @CecileRobertMichon
for final approval

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Mar 2, 2021
@detiber
Copy link
Member

detiber commented Mar 10, 2021

/approve
/hold
adding hold in case @CecileRobertMichon still wanted to review, feel free to remove if that is not the case.

@k8s-ci-robot k8s-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Mar 10, 2021
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: detiber

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 Mar 10, 2021
@CecileRobertMichon
Copy link
Contributor

/hold cancel

sorry completely missed the ping on this

@k8s-ci-robot k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Mar 10, 2021
@k8s-ci-robot k8s-ci-robot merged commit a9144a8 into kubernetes-sigs:master Mar 10, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
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. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants