github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 03:41:45 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #4120 from justinsb/fix_4118

Browse Source 
Fix enable_cluster_dns test
This commit is contained in:
Tim Hockin 2015-02-05 16:28:46 -08:00
commit 7c5625b2dd
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/saltbase/salt/kubelet/default
View File

@ -29,7 +29,7 @@
{% set cluster_dns = "" %} {% set cluster_dns = "" %}
{% set cluster_domain = "" %} {% set cluster_domain = "" %}
{% if pillar['enable_cluster_dns'] is defined and pillar['enable_cluster_dns'] %} {% if pillar.get('enable_cluster_dns', '').lower() == 'true' %}
{% set cluster_dns = "--cluster_dns=" + pillar['dns_server'] %} {% set cluster_dns = "--cluster_dns=" + pillar['dns_server'] %}
{% set cluster_domain = "--cluster_domain=" + pillar['dns_domain'] %} {% set cluster_domain = "--cluster_domain=" + pillar['dns_domain'] %}
{% endif %} {% endif %}

4
cluster/saltbase/salt/top.sls
View File

@ -8,10 +8,10 @@ base:
- docker - docker
- kubelet - kubelet
- kube-proxy - kube-proxy
{% if pillar['enable_node_monitoring'] is defined and pillar['enable_node_monitoring'] %} {% if pillar.get('enable_node_monitoring', '').lower() == 'true' %}
- cadvisor - cadvisor
{% endif %} {% endif %}
{% if pillar['enable_node_logging'] is defined and pillar['enable_node_logging'] %} {% if pillar.get('enable_node_logging', '').lower() == 'true' %}
{% if pillar['logging_destination'] is defined and pillar['logging_destination'] == 'elasticsearch' %} {% if pillar['logging_destination'] is defined and pillar['logging_destination'] == 'elasticsearch' %}
- fluentd-es - fluentd-es
{% endif %} {% endif %}