Fix kubeone reset

Signed-off-by: Artiom Diomin <artiom@loodse.com>
kubermatic · Oct 31, 2019 · ca9f94c · ca9f94c
1 parent b194152
commit ca9f94c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/pkg/installer/installation/reset.go b/pkg/installer/installation/reset.go
@@ -197,7 +197,7 @@ sudo rm -rf /opt/cni /opt/bin/kubeadm /opt/bin/kubectl /opt/bin/kubelet
 sudo rm /etc/systemd/system/kubelet.service /etc/systemd/system/kubelet.service.d/10-kubeadm.conf
 `
 	resetScript = `
-sudo kubeadm {{ .VERBOSE }} reset --force || true
+sudo kubeadm {{ .VERBOSE }} reset --skip-phases update-cluster-status --force || true
 sudo rm -f /etc/kubernetes/cloud-config
 sudo rm -rf /var/lib/etcd/
 rm -rf "{{ .WORK_DIR }}"

diff --git a/pkg/templates/externalccm/ccm.go b/pkg/templates/externalccm/ccm.go
@@ -69,7 +69,7 @@ func waitForInitializedNodes(s *state.State) error {
 
 	s.Logger.Info("Waiting for nodes to initialize by CCM…")
 
-	return wait.Poll(5*time.Second, 60*time.Second, func() (bool, error) {
+	return wait.Poll(5*time.Second, 10*time.Minute, func() (bool, error) {
 		nodes := corev1.NodeList{}
 
 		if err := s.DynamicClient.List(ctx, &nodes); err != nil {