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
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Mirror
Kubespray
Commits
a8b5b856
Commit
a8b5b856
authored
8 years ago
by
Alexander Block
Browse files
Options
Downloads
Patches
Plain Diff
Only use default resolver in dnsmasq when we are using host_resolvconf mode
parent
1d2a18b3
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
roles/dnsmasq/templates/01-kube-dns.conf.j2
+4
-2
4 additions, 2 deletions
roles/dnsmasq/templates/01-kube-dns.conf.j2
with
4 additions
and
2 deletions
roles/dnsmasq/templates/01-kube-dns.conf.j2
+
4
−
2
View file @
a8b5b856
...
@@ -15,15 +15,17 @@ local=/{{ bogus_domains }}
...
@@ -15,15 +15,17 @@ local=/{{ bogus_domains }}
{% for srv in upstream_dns_servers %}
{% for srv in upstream_dns_servers %}
server={{ srv }}
server={{ srv }}
{% endfor %}
{% endfor %}
{% else %}
no-resolv
{% elif resolvconf_mode == 'host_resolvconf' %}
{# The default resolver is only needed when the hosts resolv.conf was modified by us. If it was not modified, we can rely on dnsmasq to reuse the systems resolv.conf #}
server={{ default_resolver }}
server={{ default_resolver }}
no-resolv
{% endif %}
{% endif %}
{% if kube_log_level == '4' %}
{% if kube_log_level == '4' %}
log-queries
log-queries
{% endif %}
{% endif %}
bogus-priv
bogus-priv
no-resolv
no-negcache
no-negcache
cache-size=1000
cache-size=1000
max-cache-ttl=10
max-cache-ttl=10
...
...
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