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

Disable creation of cbr0, the kubelet does it now.

Browse Source 
Conditionalize the docker bridge.
This commit is contained in:
Brendan Burns 2015-06-19 22:46:50 -07:00 committed by Dawn Chen
parent c5e504a0c8
commit a29ade2f33
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cluster/saltbase/salt/docker/docker-defaults
View File

@ -2,5 +2,10 @@ DOCKER_OPTS=""
{% if grains.docker_opts is defined and grains.docker_opts %} {% if grains.docker_opts is defined and grains.docker_opts %}
DOCKER_OPTS="${DOCKER_OPTS} {{grains.docker_opts}}" DOCKER_OPTS="${DOCKER_OPTS} {{grains.docker_opts}}"
{% endif %} {% endif %}
DOCKER_OPTS="${DOCKER_OPTS} --bridge cbr0 --iptables=false --ip-masq=false"
{% set docker_bridge = "" %}
{% if grains['roles'][0] == 'kubernetes-pool' %}
{% set docker_bridge = "--bridge cbr0" %}
{% endif %}
DOCKER_OPTS="${DOCKER_OPTS} {{docker_bridge}} --iptables=false --ip-masq=false"
DOCKER_NOFILE=1000000 DOCKER_NOFILE=1000000

6
cluster/saltbase/salt/docker/init.sls
View File

@ -48,11 +48,6 @@ net.ipv4.ip_forward:
sysctl.present: sysctl.present:
- value: 1 - value: 1
cbr0:
container_bridge.ensure:
- cidr: {{ grains['cbr-cidr'] }}
- mtu: 1460
{{ environment_file }}: {{ environment_file }}:
file.managed: file.managed:
- source: salt://docker/docker-defaults - source: salt://docker/docker-defaults
@ -124,7 +119,6 @@ docker:
- enable: True - enable: True
- watch: - watch:
- file: {{ environment_file }} - file: {{ environment_file }}
- container_bridge: cbr0
{% if override_docker_ver != '' %} {% if override_docker_ver != '' %}
- require: - require:
- pkg: lxc-docker-{{ override_docker_ver }} - pkg: lxc-docker-{{ override_docker_ver }}