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

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

Browse Source
This commit is contained in:
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/kubeadm/app/cmd/reset.go
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)) 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 // 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 // provided external etcd endpoints. In that case, it is his own responsibility to reset etcd