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
c3e5aac1
Commit
c3e5aac1
authored
8 years ago
by
Matthew Mosesohn
Browse files
Options
Downloads
Patches
Plain Diff
Add variable kube_resolv_conf
Allow configuration of a custom /etc/resolv.conf for kubelet.
parent
10b38ab9
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
roles/kubernetes/node/defaults/main.yml
+3
-0
3 additions, 0 deletions
roles/kubernetes/node/defaults/main.yml
roles/kubernetes/node/templates/kubelet.j2
+1
-1
1 addition, 1 deletion
roles/kubernetes/node/templates/kubelet.j2
with
4 additions
and
1 deletion
roles/kubernetes/node/defaults/main.yml
+
3
−
0
View file @
c3e5aac1
...
...
@@ -29,6 +29,9 @@ kube_log_dir: "/var/log/kubernetes"
dns_domain
:
"
{{
cluster_name
}}"
# resolv.conf to base dns config
kube_resolv_conf
:
"
/etc/resolv.conf"
kube_proxy_mode
:
iptables
# An experimental dev/test only dynamic volumes provisioner,
...
...
This diff is collapsed.
Click to expand it.
roles/kubernetes/node/templates/kubelet.j2
+
1
−
1
View file @
c3e5aac1
...
...
@@ -21,7 +21,7 @@ KUBELET_REGISTER_NODE="--register-node=false"
{% endif %}
# location of the api-server
{% if dns_setup %}
KUBELET_ARGS="--cluster_dns={{ dns_server }} --cluster_domain={{ dns_domain }} --kubeconfig={{ kube_config_dir}}/node-kubeconfig.yaml --config={{ kube_manifest_dir }}"
KUBELET_ARGS="--cluster_dns={{ dns_server }} --cluster_domain={{ dns_domain }} --kubeconfig={{ kube_config_dir}}/node-kubeconfig.yaml --config={{ kube_manifest_dir
}} --resolv-conf={{ kube_resolv_conf
}}"
{% else %}
KUBELET_ARGS="--kubeconfig={{ kube_config_dir}}/kubelet.kubeconfig --config={{ kube_manifest_dir }}"
{% endif %}
...
...
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