Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
77904359
Commit
77904359
authored
Feb 04, 2015
by
Justin Santa Barbara
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix for bool vs string comparisons in salt templates
Fixes #4118
parent
926f46bf
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
default
cluster/saltbase/salt/kubelet/default
+1
-1
top.sls
cluster/saltbase/salt/top.sls
+2
-2
No files found.
cluster/saltbase/salt/kubelet/default
View file @
77904359
...
...
@@ -29,7 +29,7 @@
{% set cluster_dns = "" %}
{% 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_domain = "--cluster_domain=" + pillar['dns_domain'] %}
{% endif %}
...
...
cluster/saltbase/salt/top.sls
View file @
77904359
...
...
@@ -8,10 +8,10 @@ base:
- docker
- kubelet
- kube-proxy
{% if pillar
['enable_node_monitoring'] is defined and pillar['enable_node_monitoring']
%}
{% if pillar
.get('enable_node_monitoring', '').lower() == 'true'
%}
- cadvisor
{% 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' %}
- fluentd-es
{% endif %}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment