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

⚠️ remove DNS type from v1alpha4 #4516

Merged
merged 1 commit into from
Apr 28, 2021

Conversation

ludusrusso
Copy link
Contributor

@ludusrusso ludusrusso commented Apr 22, 2021

What this PR does / why we need it:

This PR removes the DNS.Type field from v1alpha4, as discussed in #4177

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 #4177

/cc @fabriziopandini

@k8s-ci-robot
Copy link
Contributor

Hi @ludusrusso. 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 needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Apr 22, 2021
@ludusrusso ludusrusso force-pushed the issue/4177 branch 2 times, most recently from ea56f03 to ca725f2 Compare April 24, 2021 16:18
@fabriziopandini
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 Apr 25, 2021
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.

First pass, I still have some files to check, but I plan to make another round of comments as soon as CI is passing.
@ludusrusso if I get the CI error right, you have to run make-generate to get the updated conversion files; if the system can't generate some conversion files due to the changes, you have to provide the missing conversion files in the conversion.go files like in https://github.com/fabriziopandini/cluster-api/blob/404215420c883e8003fb9422cd81a46eb2b678a2/bootstrap/kubeadm/api/v1alpha3/conversion.go#L73-L77

bootstrap/kubeadm/api/v1alpha3/conversion_test.go Outdated Show resolved Hide resolved
bootstrap/kubeadm/api/v1alpha3/conversion_test.go Outdated Show resolved Hide resolved
bootstrap/kubeadm/types/v1beta1/conversion_test.go Outdated Show resolved Hide resolved
bootstrap/kubeadm/types/v1beta1/conversion_test.go Outdated Show resolved Hide resolved
bootstrap/kubeadm/types/v1beta2/conversion_test.go Outdated Show resolved Hide resolved
controlplane/kubeadm/api/v1alpha3/conversion_test.go Outdated Show resolved Hide resolved
controlplane/kubeadm/api/v1alpha3/conversion_test.go Outdated Show resolved Hide resolved
@ludusrusso
Copy link
Contributor Author

@ludusrusso: The following tests failed, say /retest to rerun all failed tests:

Test name Commit Details Rerun command
pull-cluster-api-apidiff-main ca725f2 link /test pull-cluster-api-apidiff-main
pull-cluster-api-test-main ca725f2 link /test pull-cluster-api-test-main
pull-cluster-api-verify ca725f2 link /test pull-cluster-api-verify
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.

Uhm, it seems I forgot to run tests locally after my last push 😇

@ludusrusso ludusrusso force-pushed the issue/4177 branch 3 times, most recently from 24885b1 to 45701f5 Compare April 26, 2021 07:13
@ludusrusso
Copy link
Contributor Author

First pass, I still have some files to check, but I plan to make another round of comments as soon as CI is passing.
@ludusrusso if I get the CI error right, you have to run make-generate to get the updated conversion files; if the system can't generate some conversion files due to the changes, you have to provide the missing conversion files in the conversion.go files like in https://github.com/fabriziopandini/cluster-api/blob/404215420c883e8003fb9422cd81a46eb2b678a2/bootstrap/kubeadm/api/v1alpha3/conversion.go#L73-L77

Got it! I'm working to fix this!

@ludusrusso ludusrusso force-pushed the issue/4177 branch 2 times, most recently from 5b0cef2 to 8baf489 Compare April 26, 2021 20:28
@ludusrusso
Copy link
Contributor Author

@fabriziopandini Ok, I think now this PR is ok! What do you think?

Test pull-cluster-api-apidiff-mai is still failing but I think this is normal, am I right?

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.

@ludusrusso the PR looks great now! I have only a couple of nits about comments, to keep track of why custom conversion functions are required.

pull-cluster-api-apidiff-main is just a signal for the reviewer that the PR Is introducing API changes, but this is expected in this case and properly reported via the ⚠️ in the title

bootstrap/kubeadm/types/v1beta1/conversion.go Outdated Show resolved Hide resolved
bootstrap/kubeadm/types/v1beta2/conversion.go Outdated Show resolved Hide resolved
bootstrap/kubeadm/api/v1alpha3/conversion.go Show resolved Hide resolved
bootstrap/kubeadm/api/v1alpha3/conversion.go Show resolved Hide resolved
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 @sbueringer PTAL

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Apr 27, 2021
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.

It looks good to me, but definitely not familiar enough with the details of our conversion..

bootstrap/kubeadm/api/v1alpha3/conversion.go Outdated Show resolved Hide resolved
@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Apr 27, 2021
@k8s-ci-robot
Copy link
Contributor

@ludusrusso: The following test failed, say /retest to rerun all failed tests:

Test name Commit Details Rerun command
pull-cluster-api-apidiff-main a0186d2 link /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/test-infra repository. I understand the commands that are listed here.

@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 Apr 28, 2021
@CecileRobertMichon
Copy link
Contributor

/approve

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: CecileRobertMichon

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 Apr 28, 2021
@k8s-ci-robot k8s-ci-robot merged commit 0beb260 into kubernetes-sigs:master Apr 28, 2021
@k8s-ci-robot k8s-ci-robot added this to the v0.4 milestone Apr 28, 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. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. 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.

remove DNS Type field from DNS spec
5 participants