Optimize repo structure #335
Open
Conversation
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
…oovy and remove setup of argocd/argocd in GitHandler
…thin cluster-resources
-set variables to private final -use repoPath instead of clusterResourcesInitializationAction.repo.getAbsoluteLocalRepoTmpDir()
-set variables to private final -use repoPath instead of clusterResourcesInitializationAction.repo.getAbsoluteLocalRepoTmpDir()
…s ArgoCDRepoLayout
…rom RepoInitializationAction in order to copy only contents that are relevant for activated features
…e repoName the deployer get and based on this name ArgoCDStrategy deploy misc folder within this repo; Bug fix subdirs copy in repo initialization
…e>/, otherwise argocd will be templating these; Bug fix multiTenant
…d petclinic-plain
… into feature/optimize-repo-structure
…-structure # Conflicts: # src/main/groovy/com/cloudogu/gitops/cli/GitopsPlaygroundCliMainScripted.groovy # src/main/groovy/com/cloudogu/gitops/features/ScmManagerSetup.groovy # src/main/groovy/com/cloudogu/gitops/features/argocd/ArgoCD.groovy
nihussmann
reviewed
Dec 22, 2025
| username: '${config.application.namePrefix}metrics' | ||
| password_file: '/etc/prometheus/secrets/prometheus-metrics-creds-scmm/password' | ||
| </#if> | ||
| <#if jenkins?? && jenkins?is_hash> |
Contributor
There was a problem hiding this comment.
better check for config.jenkins.active
nihussmann
reviewed
Dec 22, 2025
| withOrgPrefix(namePrefix, "argocd/argocd"), | ||
| "GitOps repo for administration of ArgoCD" | ||
| ) | ||
| if (includeClusterResources) { |
Contributor
There was a problem hiding this comment.
Suggested change
| if (includeClusterResources) { | |
| gitProvider.createRepository( | |
| withOrgPrefix(namePrefix, "argocd/cluster-resources"), | |
| "GitOps repo for basic cluster-resources") |
nihussmann
reviewed
Dec 23, 2025
|
|
||
| Boolean internal = true | ||
|
|
||
| String releaseName = "scmm" |
Contributor
There was a problem hiding this comment.
The release name shouldn’t be configurable until all hardcoded bindings (such as URLs) are removed, e.g. in ApplicationConfigurator:128.
nihussmann
reviewed
Dec 23, 2025
| @Override | ||
| Path writeTempFile(Map mapValues) { | ||
| println "TOP-LEVEL KEYS: ${mapValues.keySet()}" | ||
| println "GRAFANA NODE: ${mapValues.grafana}" |
nihussmann
reviewed
Dec 23, 2025
Contributor
There was a problem hiding this comment.
helm values directly in the applications root folder. Other features->using template folder.
nihussmann
reviewed
Dec 23, 2025
| private Config config | ||
| private GitHandler gitHandler | ||
|
|
||
| Closure afterCopyHook |
nihussmann
reviewed
Dec 23, 2025
| // - ref: values → wird in valueFiles als $values verwendet | ||
| // - path: apps/<feature>/misc → zusätzliche Manifeste | ||
|
|
||
| def miscRepoUrl = "${clusterResourcesRepo.gitProvider.repoPrefix()}argocd/cluster-resources.git".toString() |
Contributor
There was a problem hiding this comment.
repoPrefix returns->/scm//[]
when prefix is set we have to make sure it get returned with / otherwise we will have /argocd/cluster-resources.git.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This PR refactors the ArgoCD feature to move the former argocd/argocd repository into argocd/cluster-resources/apps. All other applications have also been relocated under argocd/cluster-resources/apps to align with the new GitOps repository layout.
Introduced multi-source Applications for Helm + misc manifests