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

Merge pull request #10347 from justinsb/vagrant_no_cidr_on_master

Browse Source 
Salt: don't assume that master => cbr-cidr
This commit is contained in:
Maxwell Forbes
2015-06-25 10:23:59 -07:00
parent 1904d4e1ce a0ae1d90ba
commit bc1930927d
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -77,7 +77,7 @@
{% endif -%}
{% set pod_cidr = "" %}
{% if grains['roles'][0] == 'kubernetes-master' %}
{% if grains['roles'][0] == 'kubernetes-master' and grains.get('cbr-cidr') %}
{% set pod_cidr = "--pod-cidr=" + grains['cbr-cidr'] %}
{% endif %}