Merge pull request kubernetes#4976 from dchen1107/docker

Removed staled docker artifacts on GCE minions.
duda · Mar 4, 2015 · abbd171 · abbd171
2 parents eea1e88 + 2a6b5a2
commit abbd171
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/cluster/gce/util.sh b/cluster/gce/util.sh
@@ -511,6 +511,12 @@ function kube-up {
       echo "    echo 'Waiting for metadata MINION_IP_RANGE...'"
       echo "    sleep 3"
       echo "done"
+      echo ""
+      echo "# Remove docker artifacts on minion nodes"
+      echo "iptables -t nat -F"
+      echo "ifconfig docker0 down"
+      echo "brctl delbr docker0"
+      echo ""
       echo "EXTRA_DOCKER_OPTS='${EXTRA_DOCKER_OPTS}'"
       echo "ENABLE_DOCKER_REGISTRY_CACHE='${ENABLE_DOCKER_REGISTRY_CACHE:-false}'"
       grep -v "^#" "${KUBE_ROOT}/cluster/gce/templates/common.sh"