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

Cleanup nodelocaldns configuration #11238

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Cleanup nodelocaldns configuration #11238

wants to merge 3 commits into from

Conversation

evan-a-a
Copy link

@evan-a-a evan-a-a commented May 27, 2024 •
edited
Loading

What type of PR is this?
/kind cleanup

What this PR does / why we need it:
This PR makes some minor cleanups to the node local dns config. Notably, it aligns the labels with the kubernetes sample configuration and enables the use of templating values in the Corefile.

Does this PR introduce a user-facing change?:

NONE

@k8s-ci-robot k8s-ci-robot added release-note-none Denotes a PR that doesn't merit a release note. kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. labels May 27, 2024
@linux-foundation-easycla Linux Foundation: EasyCLA
Copy link

linux-foundation-easycla bot commented May 27, 2024 •
edited
Loading

CLA Signed

The committers listed above are authorized under a signed CLA.

@k8s-ci-robot k8s-ci-robot added the cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. label May 27, 2024
@k8s-ci-robot
Copy link
Contributor

Welcome @evan-a-a!

It looks like this is your first PR to kubernetes-sigs/kubespray 🎉. 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/kubespray 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 @evan-a-a. 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-sigs/prow 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. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels May 27, 2024
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: evan-a-a
Once this PR has been reviewed and has the lgtm label, please assign mzaian for approval. For more information see the Kubernetes Code Review Process.

The full list of commands accepted by this bot can be found 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 cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. and removed cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. labels May 27, 2024
@evan-a-a
Fix nodelocaldns Corefile path
001b16e 
* Use Corefile.base so that nodelocaldns supports templating
@evan-a-a
Reconcile nodelocaldns config with kubernetes sample config
454be28 
* Add label kubernetes.io/cluster-service: "true"
* Set k8s-app label to node-local-dns
@evan-a-a
Remove upstreamsvc option from nodelocaldns
c6d9c16 
* Since we configure the upstream server through ansible templating,
this arugment has no impact on node-cache
@evan-a-a evan-a-a force-pushed the nodelocaldns_config_cleanup branch from 27204ea to c6d9c16 Compare May 27, 2024 21:13
ant31
ant31 reviewed May 28, 2024
View reviewed changes
roles/kubernetes-apps/ansible/templates/nodelocaldns-daemonset.yml.j2
@@ -42,9 +43,7 @@ spec:
- -localip
- {{ nodelocaldns_ip }}
- -conf
- /etc/coredns/Corefile
- -upstreamsvc
Copy link
Contributor

Choose a reason for hiding this comment

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

why removing the upstreamsvc?

Copy link
Author

@evan-a-a evan-a-a May 28, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

I explain this in the commit message, but this is a no-op in the Kubespray configuration, since we use Ansible to template the Corefile. The sole purpose of upstreamsvc is to replace __PILLAR__CLUSTER__DNS__ during templating from Corefile.base with the IP of the upstream service.

ant31
ant31 reviewed May 28, 2024
View reviewed changes
roles/kubernetes-apps/ansible/templates/nodelocaldns-daemonset.yml.j2
- /etc/coredns/Corefile
- -upstreamsvc
- coredns
- /etc/Corefile
Copy link
Contributor

Choose a reason for hiding this comment

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

how is this file configured ?

Copy link
Author

Choose a reason for hiding this comment

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

Node-cache generates the Corefile from Corefile.base, substituting any templated values in the process.

ant31
ant31 reviewed May 28, 2024
View reviewed changes
roles/kubernetes-apps/ansible/templates/nodelocaldns-daemonset.yml.j2
@@ -97,7 +96,7 @@ spec:
name: nodelocaldns
items:
- key: Corefile
path: Corefile
path: Corefile.base
Copy link
Contributor

Choose a reason for hiding this comment

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

Corefile.base doesn't seem used anywhere

Copy link
Author

Choose a reason for hiding this comment

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

Ref #11238 (comment)

@ant31
Copy link
Contributor

ant31 commented May 28, 2024

Hi,
Thank you for the PR, and welcome ! 🥳

@evan-a-a
Copy link
Author

evan-a-a commented May 28, 2024 •
edited
Loading

This PR will make more sense in the context of a future PR I'm preparing to properly configure nodelocaldns when using cilium as the CNI. I decided to break out some of the cleanup stuff separately since it wasn't directly related.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ant31 ant31 ant31 left review comments

@VannTen VannTen Awaiting requested review from VannTen

@yankay yankay Awaiting requested review from yankay

Assignees
No one assigned
Labels
cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. release-note-none Denotes a PR that doesn't merit a release note. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@evan-a-a @k8s-ci-robot @ant31