C12s/c12s-kubespray
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

dns vars for skydns submodule

Browse source
This commit is contained in:
Smaine Kahlouch 2015-10-13 17:12:59 +02:00
parent 481d16d5ad
commit 6183a4d3b1
5 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
environments/dev/group_vars/k8s-cluster.yml
View file

@ -44,9 +44,9 @@ upstream_dns_servers:
- 8.8.8.8 - 8.8.8.8
- 4.4.8.8 - 4.4.8.8
# Turn this varable to 'false' to disable whole DNS configuration. # Use dns server : https://github.com/ansibl8s/k8s-skydns/blob/master/skydns-README.md
dns_setup: true dns_setup: true
dns_domain: "{{ cluster_name }}" dns_domain: "{{ cluster_name }}"
# Ip address of the kubernetes dns service # Ip address of the kubernetes dns service
kube_dns_server: 10.233.0.10 dns_server: 10.233.0.10

10
environments/production/group_vars/k8s-cluster.yml
View file

@ -43,10 +43,10 @@
# upstream_dns_servers: # upstream_dns_servers:
# - 8.8.8.8 # - 8.8.8.8
# - 4.4.8.8 # - 4.4.8.8
#
# Turn this varable to 'false' to disable whole DNS configuration. # # Use dns server : https://github.com/ansibl8s/k8s-skydns/blob/master/skydns-README.md
# dns_setup: true # dns_setup: true
# dns_domain: "{{ cluster_name }}" # dns_domain: "{{ cluster_name }}"
#
# Ip address of the kubernetes dns service # # Ip address of the kubernetes dns service
# kube_dns_server: 10.233.0.10 # dns_server: 10.233.0.10

2
roles/apps/k8s-skydns

@ -1 +1 @@
Subproject commit 19dd13c6da2f54bd44dd865eec8782b7a781907a Subproject commit b00d0ce5c952a9c0364f48babf95ad6357e82ccd

2
roles/dnsmasq/templates/01-kube-dns.conf.j2
View file

@ -16,4 +16,4 @@ server={{ srv }}
{% endif %} {% endif %}
# Forward k8s domain to kube-dns # Forward k8s domain to kube-dns
server=/{{ dns_domain }}/{{ kube_dns_server }} server=/{{ dns_domain }}/{{ dns_server }}

2
roles/kubernetes/node/templates/kubelet.j2
View file

@ -12,7 +12,7 @@ Environment="KUBELET_HOSTNAME=--hostname_override={{ inventory_hostname }}"
# location of the api-server # location of the api-server
Environment="KUBELET_API_SERVER=--api_servers=https://{{ groups['kube-master'][0]}}:{{ kube_master_port }}" Environment="KUBELET_API_SERVER=--api_servers=https://{{ groups['kube-master'][0]}}:{{ kube_master_port }}"
{% if dns_setup %} {% if dns_setup %}
Environment="KUBELET_ARGS=--cluster_dns={{ kube_dns_server }} --cluster_domain={{ dns_domain }} --kubeconfig={{ kube_config_dir}}/kubelet.kubeconfig --config={{ kube_manifest_dir }}" Environment="KUBELET_ARGS=--cluster_dns={{ dns_server }} --cluster_domain={{ dns_domain }} --kubeconfig={{ kube_config_dir}}/kubelet.kubeconfig --config={{ kube_manifest_dir }}"
{% else %} {% else %}
Environment="KUBELET_ARGS=--kubeconfig={{ kube_config_dir}}/kubelet.kubeconfig --config={{ kube_manifest_dir }}" Environment="KUBELET_ARGS=--kubeconfig={{ kube_config_dir}}/kubelet.kubeconfig --config={{ kube_manifest_dir }}"
{% endif %} {% endif %}