From 6d1e857e7df7c05183b003176403f76b9520d990 Mon Sep 17 00:00:00 2001 From: akhil nittala Date: Mon, 29 Sep 2025 18:58:01 +0530 Subject: [PATCH 1/2] [GITOPS-7844]: GitOpsService controller creates default ArgoCD with v1alpha1 api version Signed-off-by: akhil nittala --- controllers/argocd/argocd.go | 8 +++----- controllers/gitopsservice_controller.go | 4 ++-- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/controllers/argocd/argocd.go b/controllers/argocd/argocd.go index 5ec8d6cfd27..702d1fe88ee 100644 --- a/controllers/argocd/argocd.go +++ b/controllers/argocd/argocd.go @@ -17,6 +17,8 @@ limitations under the License. package argocd import ( + "fmt" + argoapp "github.com/argoproj-labs/argocd-operator/api/v1beta1" v1 "k8s.io/api/core/v1" resourcev1 "k8s.io/apimachinery/pkg/api/resource" @@ -191,12 +193,8 @@ func NewCR(name, ns string) (*argoapp.ArgoCD, error) { if err != nil { return nil, err } - + fmt.Printf("Hello creating ArgoCD CR\n") 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 4961a169549..1b38047e35e 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 { From 34cf4780f2b0a3e2205f3558692f70be62706c36 Mon Sep 17 00:00:00 2001 From: akhil nittala Date: Mon, 6 Oct 2025 12:04:47 +0530 Subject: [PATCH 2/2] [GITOPS-7844]: GitOpsService controller creates default ArgoCD with v1alpha1 api version Signed-off-by: akhil nittala --- controllers/argocd/argocd.go | 3 --- 1 file changed, 3 deletions(-) diff --git a/controllers/argocd/argocd.go b/controllers/argocd/argocd.go index 702d1fe88ee..233f9f6a8cd 100644 --- a/controllers/argocd/argocd.go +++ b/controllers/argocd/argocd.go @@ -17,8 +17,6 @@ limitations under the License. package argocd import ( - "fmt" - argoapp "github.com/argoproj-labs/argocd-operator/api/v1beta1" v1 "k8s.io/api/core/v1" resourcev1 "k8s.io/apimachinery/pkg/api/resource" @@ -193,7 +191,6 @@ func NewCR(name, ns string) (*argoapp.ArgoCD, error) { if err != nil { return nil, err } - fmt.Printf("Hello creating ArgoCD CR\n") return &argoapp.ArgoCD{ ObjectMeta: metav1.ObjectMeta{ Name: name,