[v1.18] [GITOPS-7844]: GitOpsService controller creates default ArgoCD with v1alpha1 api version (#985)

* GitOpsService controller creates default ArgoCD with v1alpha1 api version

Signed-off-by: akhil nittala <[email protected]>

* GitOpsService controller creates default ArgoCD with v1alpha1 api version

Signed-off-by: akhil nittala <[email protected]>

---------

Signed-off-by: akhil nittala <[email protected]>
Co-authored-by: akhil nittala <[email protected]>

Author: openshift-cherrypick-robot

controllers/argocd/argocd.go

@@ -231,12 +231,7 @@ func NewCR(name, ns string) (*argoapp.ArgoCD, error) {
 	if err != nil {
 		return nil, err
 	}
-
 	return &argoapp.ArgoCD{
-		TypeMeta: metav1.TypeMeta{
-			Kind:       "ArgoCD",
-			APIVersion: "argoproj.io/v1alpha1",
-		},
 		ObjectMeta: metav1.ObjectMeta{
 			Name:      name,
 			Namespace: ns,

controllers/gitopsservice_controller.go

@@ -261,7 +261,7 @@ func (r *ReconcileGitopsService) Reconcile(ctx context.Context, request reconcil
 	} else {
 		// If installation of default Argo CD instance is disabled, make sure it doesn't exist,
 		// deleting it if necessary
-		if err := r.ensureDefaultArgoCDInstanceDoesntExist(instance, reqLogger); err != nil {
+		if err := r.ensureDefaultArgoCDInstanceDoesntExist(); err != nil {
 			return reconcile.Result{}, fmt.Errorf("unable to ensure non-existence of default Argo CD instance: %v", err)
 		}
 	}
@@ -306,7 +306,7 @@ func (r *ReconcileGitopsService) Reconcile(ctx context.Context, request reconcil
 	}
 }
 
-func (r *ReconcileGitopsService) ensureDefaultArgoCDInstanceDoesntExist(instance *pipelinesv1alpha1.GitopsService, reqLogger logr.Logger) error {
+func (r *ReconcileGitopsService) ensureDefaultArgoCDInstanceDoesntExist() error {
 
 	defaultArgoCDInstance, err := argocd.NewCR(common.ArgoCDInstanceName, serviceNamespace)
 	if err != nil {