fix: update the existing plugin deployment resource (#711)

* fix: update the existing plugin deployment resource

Signed-off-by: Chetan Banavikalmutt <[email protected]>

* reconcile the deployment spec template

Signed-off-by: Chetan Banavikalmutt <[email protected]>

---------

Signed-off-by: Chetan Banavikalmutt <[email protected]>

Author: chetan-rns

controllers/consoleplugin.go

@@ -279,7 +279,7 @@ func (r *ReconcileGitopsService) reconcileDeployment(cr *pipelinesv1alpha1.Gitop
 			return reconcile.Result{}, err
 		}
 	} else {
-		existingSpecTemplate := existingPluginDeployment.Spec.Template
+		existingSpecTemplate := &existingPluginDeployment.Spec.Template
 		newSpecTemplate := newPluginDeployment.Spec.Template
 		changed := !reflect.DeepEqual(existingPluginDeployment.ObjectMeta.Labels, newPluginDeployment.ObjectMeta.Labels) ||
 			!reflect.DeepEqual(existingPluginDeployment.Spec.Replicas, newPluginDeployment.Spec.Replicas) ||
@@ -304,7 +304,7 @@ func (r *ReconcileGitopsService) reconcileDeployment(cr *pipelinesv1alpha1.Gitop
 			existingSpecTemplate.Spec.DNSPolicy = newSpecTemplate.Spec.DNSPolicy
 			existingPluginDeployment.Spec.Template.Spec.NodeSelector = newPluginDeployment.Spec.Template.Spec.NodeSelector
 			existingPluginDeployment.Spec.Template.Spec.Tolerations = newPluginDeployment.Spec.Template.Spec.Tolerations
-			return reconcile.Result{}, r.Client.Update(context.TODO(), newPluginDeployment)
+			return reconcile.Result{}, r.Client.Update(context.TODO(), existingPluginDeployment)
 		}
 	}
 	return reconcile.Result{}, nil

controllers/consoleplugin_test.go

@@ -483,8 +483,6 @@ func TestPlugin_reconcileDeployment_changedTemplateLabels(t *testing.T) {
 	s := scheme.Scheme
 	addKnownTypesToScheme(s)
 
-	fakeClient := fake.NewClientBuilder().WithScheme(s).WithRuntimeObjects(newGitopsService()).Build()
-	reconciler := newReconcileGitOpsService(fakeClient, s)
 	instance := &pipelinesv1alpha1.GitopsService{}
 	var replicas int32 = 1
 
@@ -586,9 +584,11 @@ func TestPlugin_reconcileDeployment_changedTemplateLabels(t *testing.T) {
 					},
 				},
 			}
-			reconciler.Client.Create(context.TODO(), d)
 
-			_, err := reconciler.reconcileConsolePlugin(instance, newRequest(serviceNamespace, gitopsPluginName))
+			fakeClient := fake.NewClientBuilder().WithScheme(s).WithRuntimeObjects(newGitopsService(), d).Build()
+			reconciler := newReconcileGitOpsService(fakeClient, s)
+
+			_, err := reconciler.reconcileDeployment(instance, newRequest(serviceNamespace, gitopsPluginName))
 			assertNoError(t, err)
 
 			deployment := &appsv1.Deployment{}