Remove the cni directory when resetting; otherwise kubelet can pick up the wrong config on the next kubeadm init run

pull/6/head
Lucas Käldström 2016-12-04 19:50:52 +02:00
parent cdb8c79415
commit 51d733f418
1 changed files with 1 additions and 1 deletions

View File

@ -136,7 +136,7 @@ func (r *Reset) Run(out io.Writer) error {
fmt.Printf("failed to unmount directories in /var/lib/kubelet, %s", string(umountOutputBytes))
}
dirsToClean := []string{"/var/lib/kubelet"}
dirsToClean := []string{"/var/lib/kubelet", "/etc/cni/net.d"}
// Only clear etcd data when the etcd manifest is found. In case it is not found, we must assume that the user
// provided external etcd endpoints. In that case, it is his own responsibility to reset etcd