fix bug in 95.clean.yml: cannot remove‘/var/run/docker/netns/default’…

…: Device or resource busy
javacspring · Nov 12, 2017 · 0685f87 · 0685f87
1 parent 253f109
commit 0685f87
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/95.clean.yml b/95.clean.yml
@@ -5,6 +5,14 @@
     shell: "systemctl stop calico-node docker"
     ignore_errors: true
 
+  # 因为calico-kube-controller使用了host网络，相当于使用了docker -net=host，需要
+  # 卸载 /var/run/docker/netns/default
+  - name: 卸载docker 相关fs1
+    mount: path=/var/run/docker/netns/default state=unmounted
+
+  - name: 卸载docker 相关fs2
+    mount: path=/var/lib/docker/overlay state=unmounted
+
   - name: 清理目录和文件
     file: name={{ item }} state=absent
     with_items:

diff --git a/roles/kube-node/templates/kubelet.service.j2 b/roles/kube-node/templates/kubelet.service.j2
@@ -22,8 +22,6 @@ ExecStart={{ bin_dir }}/kubelet \
   --cluster-domain={{ CLUSTER_DNS_DOMAIN }} \
   --hairpin-mode promiscuous-bridge \
   --allow-privileged=true \
-  --fail-swap-on=false
-  --serialize-image-pulls=false \
   --logtostderr=true \
   --v=2
 #kubelet cAdvisor 默认在所有接口监听 4194 端口的请求, 以下iptables限制内网访问