scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-12-16 21:07:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add a network plugin that duplicates "configureCBR0" functionality

Browse Source
This commit is contained in:
Dan Williams
2015-12-16 17:31:10 -06:00
parent 67414afd11
commit fabb65c13f
18 changed files with 502 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/saltbase/salt/kube-controller-manager/kube-controller-manager.manifest
View File

@@ -14,6 +14,8 @@
# This is expected to be a short-term compromise.
{% if pillar.get('network_provider', '').lower() == 'flannel' %}
{% set allocate_node_cidrs = "--allocate-node-cidrs=false" -%}
{% elif pillar.get('network_provider', '').lower() == 'kubenet' %}
{% set allocate_node_cidrs = "--allocate-node-cidrs=true" -%}
{% elif pillar['allocate_node_cidrs'] is defined -%}
{% set allocate_node_cidrs = "--allocate-node-cidrs=" + pillar['allocate_node_cidrs'] -%}
{% endif -%}