fixincorrect icp fields after reconciling. (istio#580)

houshengbo · Nov 11, 2019 · 2485ec8 · 2485ec8
1 parent b57e9b0
commit 2485ec8
Showing 1 changed file with 9 additions and 8 deletions.
diff --git a/pkg/controller/istiocontrolplane/istiocontrolplane_controller.go b/pkg/controller/istiocontrolplane/istiocontrolplane_controller.go
@@ -114,6 +114,7 @@ func (r *ReconcileIstioControlPlane) Reconcile(request reconcile.Request) (recon
 	finalizers := u.GetFinalizers()
 	finalizerIndex := indexOf(finalizers, finalizer)
 
+	// declare read-only icp instance to create the reconciler
 	icp := &v1alpha2.IstioControlPlane{}
 	icp.SetGroupVersionKind(util.IstioOperatorGVK)
 	if err := r.client.Get(context.TODO(), request.NamespacedName, icp); err != nil {
@@ -145,18 +146,18 @@ func (r *ReconcileIstioControlPlane) Reconcile(request reconcile.Request) (recon
 		}
 		// TODO: for now, nuke the resources, regardless of errors
 		finalizers = append(finalizers[:finalizerIndex], finalizers[finalizerIndex+1:]...)
-		icp.SetFinalizers(finalizers)
-		finalizerError := r.client.Update(context.TODO(), icp)
+		u.SetFinalizers(finalizers)
+		finalizerError := r.client.Update(context.TODO(), u)
 		for retryCount := 0; errors.IsConflict(finalizerError) && retryCount < finalizerMaxRetries; retryCount++ {
 			// workaround for https://github.com/kubernetes/kubernetes/issues/73098 for k8s < 1.14
 			// TODO: make this error message more meaningful.
 			log.Info("conflict during finalizer removal, retrying")
-			_ = r.client.Get(context.TODO(), request.NamespacedName, icp)
-			finalizers = icp.GetFinalizers()
+			_ = r.client.Get(context.TODO(), request.NamespacedName, u)
+			finalizers = u.GetFinalizers()
 			finalizerIndex = indexOf(finalizers, finalizer)
 			finalizers = append(finalizers[:finalizerIndex], finalizers[finalizerIndex+1:]...)
-			icp.SetFinalizers(finalizers)
-			finalizerError = r.client.Update(context.TODO(), icp)
+			u.SetFinalizers(finalizers)
+			finalizerError = r.client.Update(context.TODO(), u)
 		}
 		if finalizerError != nil {
 			log.Errorf("error removing finalizer: %s", finalizerError)
@@ -167,8 +168,8 @@ func (r *ReconcileIstioControlPlane) Reconcile(request reconcile.Request) (recon
 		// TODO: make this error message more meaningful.
 		log.Infof("Adding finalizer %v", finalizer)
 		finalizers = append(finalizers, finalizer)
-		icp.SetFinalizers(finalizers)
-		err = r.client.Update(context.TODO(), icp)
+		u.SetFinalizers(finalizers)
+		err = r.client.Update(context.TODO(), u)
 		if err != nil {
 			log.Errorf("Failed to update IstioControlPlane with finalizer, %v", err)
 			return reconcile.Result{}, err