diff --git a/controllers/argocd/argocd.go b/controllers/argocd/argocd.go index 6dd09e053..e7928dd79 100644 --- a/controllers/argocd/argocd.go +++ b/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, diff --git a/controllers/gitopsservice_controller.go b/controllers/gitopsservice_controller.go index 4961a1695..1b38047e3 100644 --- a/controllers/gitopsservice_controller.go +++ b/controllers/gitopsservice_controller.go @@ -265,7 +265,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) } } @@ -310,7 +310,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 {