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

nodelocaldns: allow to set health port, switch to 9254 by default (#4902)

Browse source 
8080 is a pretty common port, using nodelocaldns_ip:8080 still
prevents node processes or hostNetwork=true processes to bind to *:8080
so switch to 9254 by default (prometheus port is 9253)

Signed-off-by: Etienne Champetier <champetier.etienne@gmail.com>
This commit is contained in:
champtar 2019-07-09 00:52:01 -07:00 committed by Kubernetes Prow Robot
parent 324bc41097
commit a67a50f9c0
4 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
inventory/sample/group_vars/k8s-cluster/k8s-cluster.yml
View file

@ -134,6 +134,7 @@ dns_mode: coredns
# Enable nodelocal dns cache # Enable nodelocal dns cache
enable_nodelocaldns: true enable_nodelocaldns: true
nodelocaldns_ip: 169.254.25.10 nodelocaldns_ip: 169.254.25.10
nodelocaldns_health_port: 9254
# Can be docker_dns, host_resolvconf or none # Can be docker_dns, host_resolvconf or none
resolvconf_mode: docker_dns resolvconf_mode: docker_dns

2
roles/kubernetes-apps/ansible/templates/nodelocaldns-config.yml.j2
View file

@ -21,7 +21,7 @@ data:
force_tcp force_tcp
} }
prometheus :9253 prometheus :9253
health {{ nodelocaldns_ip }}:8080 health {{ nodelocaldns_ip }}:{{ nodelocaldns_health_port }}
} }
in-addr.arpa:53 { in-addr.arpa:53 {
errors errors

4
roles/kubernetes-apps/ansible/templates/nodelocaldns-daemonset.yml.j2
View file

@ -58,7 +58,7 @@ spec:
httpGet: httpGet:
host: {{ nodelocaldns_ip }} host: {{ nodelocaldns_ip }}
path: /health path: /health
port: 8080 port: {{ nodelocaldns_health_port }}
scheme: HTTP scheme: HTTP
timeoutSeconds: 5 timeoutSeconds: 5
successThreshold: 1 successThreshold: 1
@ -67,7 +67,7 @@ spec:
httpGet: httpGet:
host: {{ nodelocaldns_ip }} host: {{ nodelocaldns_ip }}
path: /health path: /health
port: 8080 port: {{ nodelocaldns_health_port }}
scheme: HTTP scheme: HTTP
timeoutSeconds: 5 timeoutSeconds: 5
successThreshold: 1 successThreshold: 1

1
roles/kubespray-defaults/defaults/main.yaml
View file

@ -68,6 +68,7 @@ dns_mode: coredns
# Enable nodelocal dns cache # Enable nodelocal dns cache
enable_nodelocaldns: true enable_nodelocaldns: true
nodelocaldns_ip: 169.254.25.10 nodelocaldns_ip: 169.254.25.10
nodelocaldns_health_port: 9254
# Should be set to a cluster IP if using a custom cluster DNS # Should be set to a cluster IP if using a custom cluster DNS
manual_dns_server: "" manual_dns_server: ""