Merge pull request #2066 from dlipovetsky/fix-apierrors-bug

k8s-ci-robot · web-flow · commit 7884484b621f · 2020-01-14T12:41:21.000-08:00
🐛 Kubeadm-based Control Plane: Fix error handling during cleanup
diff --git a/controlplane/kubeadm/controllers/kubeadm_control_plane_controller.go b/controlplane/kubeadm/controllers/kubeadm_control_plane_controller.go
@@ -394,7 +394,7 @@ func (r *KubeadmControlPlaneReconciler) cleanupFromGeneration(ctx context.Contex
 			config.SetNamespace(ref.Namespace)
 			config.SetName(ref.Name)
 
-			if err := r.Client.Delete(ctx, config); !apierrors.IsNotFound(err) {
+			if err := r.Client.Delete(ctx, config); err != nil && !apierrors.IsNotFound(err) {
 				errs = append(errs, errors.Wrap(err, "failed to cleanup generated resources after error"))
 			}
 		}

Original file line number	Diff line number	Diff line change
`@@ -394,7 +394,7 @@ func (r *KubeadmControlPlaneReconciler) cleanupFromGeneration(ctx context.Contex`
`394`	`394`	`config.SetNamespace(ref.Namespace)`
`395`	`395`	`config.SetName(ref.Name)`
`396`	`396`
`397`		`- if err := r.Client.Delete(ctx, config); !apierrors.IsNotFound(err) {`
	`397`	`+ if err := r.Client.Delete(ctx, config); err != nil && !apierrors.IsNotFound(err) {`
`398`	`398`	`errs = append(errs, errors.Wrap(err, "failed to cleanup generated resources after error"))`
`399`	`399`	`}`
`400`	`400`	`}`