Skip to content

[GITOPS-7844]: GitOpsService controller creates default ArgoCD with v1alpha1 api version #976

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Oct 8, 2025
+2 −7
Merged

[GITOPS-7844]: GitOpsService controller creates default ArgoCD with v1alpha1 api version #976

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
6d1e857
[GITOPS-7844]: GitOpsService controller creates default ArgoCD with v…
akhilnittala Sep 29, 2025
efec288
Merge branch 'master' into usr/akhil/GITOPS-7844
akhilnittala Oct 1, 2025
adcd4d7
Merge branch 'master' into usr/akhil/GITOPS-7844
akhilnittala Oct 6, 2025
34cf478
[GITOPS-7844]: GitOpsService controller creates default ArgoCD with v…
akhilnittala Oct 6, 2025
9705008
Merge branch 'master' into usr/akhil/GITOPS-7844
akhilnittala Oct 6, 2025
b90d1e3
Merge branch 'master' into usr/akhil/GITOPS-7844
akhilnittala Oct 6, 2025
42b6c8d
Merge branch 'master' into usr/akhil/GITOPS-7844
akhilnittala Oct 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions controllers/argocd/argocd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions controllers/gitopsservice_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
}
Expand Down Expand Up @@ -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 {
Expand Down