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

⚠️ Remove unused DNSAddOnType constants from kubeadm/v1alpha4 #4547

Merged
merged 1 commit into from
Apr 29, 2021
Merged

⚠️ Remove unused DNSAddOnType constants from kubeadm/v1alpha4 #4547

merged 1 commit into from
Apr 29, 2021

Conversation

ludusrusso
Copy link
Contributor

What this PR does / why we need it:

Remove unused DNSAddOnType constants from kubeadm/v1alpha4

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

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Apr 29, 2021
@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 the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Apr 29, 2021
@k8s-ci-robot k8s-ci-robot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Apr 29, 2021
sbueringer
sbueringer reviewed Apr 29, 2021
View reviewed changes
controlplane/kubeadm/internal/kubeadm_config_map.go
@@ -205,7 +205,6 @@ func (k *kubeadmConfig) UpdateCoreDNSImageInfo(repository, tag string) error {
return errors.Wrapf(err, "unable to decode kubeadm ConfigMap's %q to Unstructured object", clusterConfigurationKey)
}
dnsMap := map[string]string{
dnsTypeKey: string(bootstrapv1.CoreDNS),
Copy link
Member

Choose a reason for hiding this comment

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

We don't need that as it's default and we don't want to / have to overwrite a pre-existing potentially different value?

Copy link
Contributor Author

@ludusrusso ludusrusso Apr 29, 2021 •
edited
Loading

Choose a reason for hiding this comment

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

I'm not sure about this but in v1apha4 we removed the field dnstype so it should not be needed here!

Copy link
Member

Choose a reason for hiding this comment

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

Shouldn't we still set this as part of the Kubeadm configuration?

@fabriziopandini

Copy link
Member

Choose a reason for hiding this comment

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

We don't need to write it. If this field is empty, kubeadm will default it to CoreDNS;
For existing clusters, if the users are on. something different than CoreDNS, they are also using the SkipCore DNS annotation, so we should be fine

Copy link
Member

Choose a reason for hiding this comment

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

Also, #4443 is going to reword how we are managing the Kubeadm config map leverage on API conversions (including this code)

@vincepri
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 29, 2021
@ludusrusso ludusrusso changed the title 🐛 Remove unused DNSAddOnType constants from kubeadm/v1alpha4 ⚠️ Remove unused DNSAddOnType constants from kubeadm/v1alpha4 Apr 29, 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 0eb7406 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.

@vincepri
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 29, 2021
@sbueringer
Copy link
Member

/lgtm

@fabriziopandini
Copy link
Member

/approve

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: fabriziopandini

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 29, 2021
@k8s-ci-robot k8s-ci-robot merged commit 355cc78 into kubernetes-sigs:master Apr 29, 2021
@k8s-ci-robot k8s-ci-robot added this to the v0.4 milestone Apr 29, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sbueringer sbueringer sbueringer left review comments

@vincepri vincepri vincepri left review comments

@CecileRobertMichon CecileRobertMichon Awaiting requested review from CecileRobertMichon

@fabriziopandini fabriziopandini Awaiting requested review from fabriziopandini

Assignees

@vincepri vincepri

@sbueringer sbueringer

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/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Milestone
v0.4
Development

Successfully merging this pull request may close these issues.

Remove unused DNSAddOnType constants from kubeadm/v1alpha4
5 participants
@ludusrusso @k8s-ci-robot @vincepri @sbueringer @fabriziopandini