Refactor ArgoCD: move GitOps repository logic into ArgoCDRepoSetup#366
Merged
nihussmann merged 22 commits intomainfrom Feb 24, 2026
Merged
Refactor ArgoCD: move GitOps repository logic into ArgoCDRepoSetup#366nihussmann merged 22 commits intomainfrom
nihussmann merged 22 commits intomainfrom
Conversation
…rgocd # Conflicts: # src/main/groovy/com/cloudogu/gitops/features/PrometheusStack.groovy # src/main/groovy/com/cloudogu/gitops/features/argocd/ArgoCD.groovy # src/main/groovy/com/cloudogu/gitops/features/deployment/ArgoCdApplicationStrategy.groovy # src/test/groovy/com/cloudogu/gitops/features/argocd/ArgoCDTest.groovy
…rgocd # Conflicts: # src/main/groovy/com/cloudogu/gitops/features/Monitoring.groovy # src/main/groovy/com/cloudogu/gitops/features/argocd/RepoLayout.groovy
…rgocd # Conflicts: # src/test/groovy/com/cloudogu/gitops/features/MonitoringTest.groovy # src/test/groovy/com/cloudogu/gitops/features/argocd/ArgoCDTest.groovy
nihussmann
reviewed
Feb 24, 2026
| private static final String APPS_MAILHOG_REL = 'apps/mail' | ||
| private static final String APPS_SCMMANAGER_REL = 'apps/scm-manager' | ||
| private static final String APPS_ARGOCD_REL = 'apps/argocd' | ||
| class RepoLayout { |
Contributor
There was a problem hiding this comment.
Maybe we should rename it to ClusterResourceRepoLayout, since it’s a rather specific repository layout and not intended for general use.
nihussmann
reviewed
Feb 24, 2026
| deployHelmChart('prometheusstack', 'kube-prometheus-stack', namespace, config.features.monitoring.helm, HELM_VALUES_PATH, config) | ||
| } | ||
| // Remove dashboards for features that are not enabled | ||
| cleanupUnusedDashboards(clusterResourcesRepo) |
Contributor
There was a problem hiding this comment.
cleanup -> remove? more explicit?
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
ArgoCD previously combined ArgoCD feature setup with GitOps repository management. This change extracts repository-related logic into ArgoCDRepoSetup, making the codebase easier to maintain and extend.
ArgoCD focuses on ArgoCD configuration/setup
ArgoCDRepoSetup owns GitOps repository initialization and preparation steps
Reduced complexity and improved unit test coverage potential