Merge "k8s: Clear cni configuration"

openstack · Jul 11, 2019 · aeecdc7 · aeecdc7
2 parents 1963fce + afd2403
commit aeecdc7
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/magnum/drivers/common/templates/kubernetes/fragments/configure-kubernetes-master.sh b/magnum/drivers/common/templates/kubernetes/fragments/configure-kubernetes-master.sh
@@ -20,7 +20,11 @@ fi
 
 _prefix=${CONTAINER_INFRA_PREFIX:-docker.io/openstackmagnum/}
 
+$ssh_cmd rm -rf /etc/cni/net.d/*
+$ssh_cmd rm -rf /var/lib/cni/*
+$ssh_cmd rm -rf /opt/cni/*
 $ssh_cmd mkdir -p /opt/cni
+$ssh_cmd mkdir -p /etc/cni/net.d/
 _addtl_mounts=',{"type":"bind","source":"/opt/cni","destination":"/opt/cni","options":["bind","rw","slave","mode=777"]},{"type":"bind","source":"/var/lib/docker","destination":"/var/lib/docker","options":["bind","rw","slave","mode=755"]}'
 
 if [ "$NETWORK_DRIVER" = "calico" ]; then

diff --git a/magnum/drivers/common/templates/kubernetes/fragments/configure-kubernetes-minion.sh b/magnum/drivers/common/templates/kubernetes/fragments/configure-kubernetes-minion.sh
@@ -22,7 +22,11 @@ fi
 
 _prefix=${CONTAINER_INFRA_PREFIX:-docker.io/openstackmagnum/}
 
+$ssh_cmd rm -rf /etc/cni/net.d/*
+$ssh_cmd rm -rf /var/lib/cni/*
+$ssh_cmd rm -rf /opt/cni/*
 $ssh_cmd mkdir -p /opt/cni
+$ssh_cmd mkdir -p /etc/cni/net.d/
 _addtl_mounts=',{"type":"bind","source":"/opt/cni","destination":"/opt/cni","options":["bind","rw","slave","mode=777"]},{"type":"bind","source":"/var/lib/docker","destination":"/var/lib/docker","options":["bind","rw","slave","mode=755"]}'
 
 if [ "$NETWORK_DRIVER" = "calico" ]; then