Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
K
Kubespray
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Model registry
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Mirror
Kubespray
Commits
4aa1ef28
Unverified
Commit
4aa1ef28
authored
Nov 3, 2022
by
Jiffs Maverick
Committed by
GitHub
Nov 3, 2022
Browse files
Options
Downloads
Patches
Plain Diff
Don't use coredns_server in dhclient.conf if nodelocaldns is enabled (#9392)
parent
58faef6f
No related branches found
No related tags found
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
roles/kubernetes/preinstall/tasks/0040-set_facts.yml
+1
-1
1 addition, 1 deletion
roles/kubernetes/preinstall/tasks/0040-set_facts.yml
with
1 addition
and
1 deletion
roles/kubernetes/preinstall/tasks/0040-set_facts.yml
+
1
−
1
View file @
4aa1ef28
...
...
@@ -195,7 +195,7 @@
nameserverentries
:
|-
{{ (([nodelocaldns_ip] if enable_nodelocaldns else []) + (coredns_server|d([]) if not enable_nodelocaldns else []) + nameservers|d([]) + cloud_resolver|d([]) + (configured_nameservers|d([]) if not disable_host_nameservers|d()|bool else [])) | unique | join(',') }}
supersede_nameserver
:
supersede domain-name-servers {{ ( ( [nodelocaldns_ip] if enable_nodelocaldns else []) + coredns_server|d([]) + nameservers|d([]) + cloud_resolver|d([])) | unique | join(', ') }};
supersede domain-name-servers {{ ( ( [nodelocaldns_ip] if enable_nodelocaldns else []) +
(
coredns_server|d([])
if not enable_nodelocaldns else [])
+ nameservers|d([]) + cloud_resolver|d([])) | unique | join(', ') }};
when
:
not dns_early or dns_late
# This task should run instead of the above task when cluster/nodelocal DNS hasn't
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment