Optimize repo structure

.gitignore

@@ -19,7 +19,7 @@ terraform/account.json
 **/.terraform/*
 /.mvn/wrapper/maven-wrapper.jar
 # Is created on "helm dep update ." but not needed in repo
-/argocd/argocd/argocd/charts/
+/argocd/cluster-resources/apps/argocd/argocd/charts/
 
 gitops-playground.jar
 jenkins-plugins

README.md

@@ -648,7 +648,7 @@ features:
 In this Example we override the default `controller.replicaCount` (GOP's default is 2).
 
 This config file is merged with precedence over the defaults set by 
-* [the GOP](applications/cluster-resources/ingress-nginx-helm-values.ftl.yaml) and
+* [the GOP](argocd/cluster-resources/apps/ingress/templates/ingress-nginx-helm-values.ftl.yaml) and
 * [the charts itself](https://github.com/kubernetes/ingress-nginx/blob/main/charts/ingress-nginx/values.yaml).
 
 ##### Deploy Ingresses
@@ -1067,7 +1067,7 @@ From there, everything is managed via GitOps. This diagram shows how it works.
    ingresses) via the `templates` folder. The actual ArgoCD chart is declared in the `Chart.yaml`
 3. The `Chart.yaml` contains the Argo CD helm chart as `dependency`. It points to a deterministic version of the Chart
    (pinned via `Chart.lock`) that is pulled from the Chart repository on the internet.  
-   This mechanism can be used to upgrade Argo CD via GitOps. See the [Readme of the argocd repository](argocd/argocd/README.md)
+   This mechanism can be used to upgrade Argo CD via GitOps. See the [Readme of the argocd repository](argocd/cluster-resources/apps/argocd/README.md)
    for details.
 4. The `projects` application manages the `projects` folder, that contains the following `AppProjects`:
     * the `argocd` project, used for bootstrapping
@@ -1098,7 +1098,7 @@ From there, everything is managed via GitOps. This diagram shows how it works.
     * Two applications in the same YAML (implemented in the playground, see e.g. [`petclinic-plain.yaml`](argocd/example-apps/argocd/petclinic-plain.ftl.yaml))
     * Two application with the same name in different namespaces, when ArgoCD is enabled to search for applications
       within different namespaces (implemented in the playground, see
-      [Argo CD's values.yaml](argocd/argocd/argocd/values.ftl.yaml) - `application.namespaces` setting)
+      [Argo CD's values.yaml](argocd/cluster-resources/apps/argocd/argocd/values.ftl.yaml) - `application.namespaces` setting)
     * One `ApplicationSet`, using the [`git` generator for directories](https://github.com/argoproj/argo-cd/blob/v2.7.1/docs/operator-manual/applicationset/Generators-Git.md#git-generator-directories)
       (not used in GitOps playground, yet)
 
@@ -1348,15 +1348,15 @@ The `.petlinic.` part can be overridden using
 
 #### PetClinic with plain k8s resources
 
-[Jenkinsfile](applications/petclinic/argocd/plain-k8s/Jenkinsfile) for `plain` deployment
+[Jenkinsfile](examples/example-apps-via-content-loader/argocd/petclinic-plain/Jenkinsfile) for `plain` deployment
 
 * Staging: http://staging.petclinic-plain.petclinic.localhost/
 * Production: http://production.petclinic-plain.petclinic.localhost/  
   Note that you have to accept a [pull request](http://scmm.localhost/scm/repo/argocd/example-apps/pull-requests/) for deployment
 
 #### PetClinic with helm
 
-[Jenkinsfile](applications/petclinic/argocd/helm/Jenkinsfile) for `helm` deployment
+[Jenkinsfile](examples/example-apps-via-content-loader/argocd/petclinic-helm/Jenkinsfile) for `helm` deployment
 
 * Staging: http://staging.petclinic-helm.petclinic.localhost/
 * Production: http://production.petclinic-helm.petclinic.localhost/  

argocd/argocd/applications/argocd.ftl.yaml → argocd/cluster-resources/apps/argocd/applications/argocd.ftl.yaml

@@ -18,8 +18,8 @@ spec:
     namespace: ${config.application.namePrefix}argocd
   project: argocd
   source:
-    path: ${config.features.argocd.operator?string("operator/", "argocd/")}
-    repoURL: ${scm.repoUrl}argocd/argocd.git
+    path: apps/argocd/${config.features.argocd.operator?string("operator/", "argocd/")}
+    repoURL: ${scm.repoUrl}argocd/cluster-resources.git
     targetRevision: main
     # needed to sync the operator/rbac folder
     <#if config.features.argocd.operator>

argocd/argocd/applications/bootstrap.ftl.yaml → argocd/cluster-resources/apps/argocd/applications/bootstrap.ftl.yaml

@@ -13,8 +13,8 @@ spec:
     namespace: ${config.application.namePrefix}argocd
   project: argocd
   source:
-    path: applications/
-    repoURL: ${scm.repoUrl}argocd/argocd.git
+    path: apps/argocd/applications/
+    repoURL: ${scm.repoUrl}argocd/cluster-resources.git
     targetRevision: main
     directory:
       recurse: true

argocd/argocd/applications/cluster-resources.ftl.yaml → argocd/cluster-resources/apps/argocd/applications/projects.ftl.yaml

@@ -1,18 +1,18 @@
 apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
-  name: cluster-resources
+  name: projects
   namespace: ${config.application.namePrefix}argocd
 # finalizer disabled, because otherwise everything under this Application would be deleted as well, if this Application is deleted by accident
 #  finalizers:
 #    - resources-finalizer.argocd.argoproj.io
 spec:
   destination:
-    namespace: ${config.application.namePrefix}argocd
     server: https://kubernetes.default.svc
+    namespace: ${config.application.namePrefix}argocd
   project: argocd
   source:
-    path: argocd/
+    path: apps/argocd/projects/
     repoURL: ${scm.repoUrl}argocd/cluster-resources.git
     targetRevision: main
     directory:

argocd/argocd/multiTenant/central/applications/argocd.ftl.yaml → argocd/cluster-resources/apps/argocd/multiTenant/central/applications/argocd.ftl.yaml

@@ -18,8 +18,8 @@ spec:
     namespace: ${config.application.namePrefix}argocd
   project: ${tenantName}
   source:
-    path: ${config.features.argocd.operator?string("operator/", "argocd/")}
-    repoURL: ${scm.centralScmUrl}argocd/argocd.git
+    path: apps/argocd/${config.features.argocd.operator?string("operator/", "argocd/")}
+    repoURL: ${scm.centralScmUrl}argocd/cluster-resources.git
     targetRevision: main
     # needed to sync the operator/rbac folder
     <#if config.features.argocd.operator??>

argocd/argocd/multiTenant/central/applications/bootstrap.ftl.yaml → argocd/cluster-resources/apps/argocd/multiTenant/central/applications/bootstrap.ftl.yaml

@@ -13,8 +13,8 @@ spec:
     namespace: ${config.application.namePrefix}argocd
   project: ${tenantName}
   source:
-    path: multiTenant/central/applications/
-    repoURL: ${scm.centralScmUrl}argocd/argocd.git
+    path: apps/argocd/multiTenant/central/applications/
+    repoURL: ${scm.centralScmUrl}argocd/cluster-resources.git
     targetRevision: main
     directory:
       recurse: true

argocd/argocd/multiTenant/central/applications/cluster-resources.ftl.yaml → argocd/cluster-resources/apps/argocd/multiTenant/central/applications/projects.ftl.yaml

@@ -1,18 +1,18 @@
 apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
-  name: ${config.application.namePrefix}cluster-resources
+  name: ${config.application.namePrefix}projects
   namespace: ${config.multiTenant.centralArgocdNamespace}
 # finalizer disabled, because otherwise everything under this Application would be deleted as well, if this Application is deleted by accident
 #  finalizers:
 #    - resources-finalizer.argocd.argoproj.io
 spec:
   destination:
-    namespace: ${config.application.namePrefix}argocd
     server: https://kubernetes.default.svc
+    namespace: ${config.application.namePrefix}argocd
   project: ${tenantName}
   source:
-    path: argocd/
+    path: apps/argocd/multiTenant/central/projects/
     repoURL: ${scm.centralScmUrl}argocd/cluster-resources.git
     targetRevision: main
     directory:

argocd/argocd/multiTenant/central/projects/tenant.ftl.yaml → argocd/cluster-resources/apps/argocd/multiTenant/central/projects/tenant.ftl.yaml

@@ -9,7 +9,6 @@ spec:
     - namespace: '*'
       server: https://kubernetes.default.svc
   sourceRepos:
-    - ${scm.centralScmUrl}argocd/argocd.git
     - ${scm.centralScmUrl}argocd/cluster-resources.git
 <#if config.application.mirrorRepos>
     - ${scm.repoUrl}3rd-party-dependencies/kube-prometheus-stack.git

argocd/argocd/multiTenant/tenant/applications/bootstrap.ftl.yaml → argocd/cluster-resources/apps/argocd/multiTenant/tenant/argocd/applications/bootstrap.ftl.yaml

@@ -13,8 +13,8 @@ spec:
     namespace: ${config.application.namePrefix}argocd
   project: argocd
   source:
-    path: applications/
-    repoURL: ${scm.repoUrl}argocd/argocd.git
+    path: apps/argocd/applications/
+    repoURL: ${scm.repoUrl}argocd/cluster-resources.git
     targetRevision: main
     directory:
       recurse: true
@@ -38,8 +38,8 @@ spec:
     namespace: ${config.application.namePrefix}argocd
   project: argocd
   source:
-    path: projects/
-    repoURL: ${scm.repoUrl}argocd/argocd.git
+    path: argocd/projects/
+    repoURL: ${scm.repoUrl}argocd/cluster-resources.git
     targetRevision: main
     directory:
       recurse: true

argocd/argocd/operator/argocd.ftl.yaml → argocd/cluster-resources/apps/argocd/operator/argocd.ftl.yaml

@@ -129,7 +129,7 @@ spec:
   initialRepositories: |
 <#if !(scm.centralScmUrl?has_content)>
     - name: argocd
-      url: ${scm.repoUrl}argocd/argocd.git
+      url: ${scm.repoUrl}argocd/cluster-resources.git
     - name: cluster-resources
       url: ${scm.repoUrl}argocd/cluster-resources.git
     - name: prometheus-community

applications/cluster-resources/monitoring/prometheus-stack-helm-values.ftl.yaml → argocd/cluster-resources/apps/prometheusstack/templates/prometheus-stack-helm-values.ftl.yaml

@@ -160,8 +160,8 @@ grafana:
   adminPassword: ${config.application["password"]}
   service:
     type: <#if config.application.remote>LoadBalancer<#else>ClusterIP</#if>
-<#if monitoring.grafana.host?has_content>
-  ingress:
+<#if monitoring?? && monitoring?is_hash && monitoring.grafana?? && monitoring.grafana.host?has_content>
+    ingress:
     enabled: true
     hosts: [${monitoring.grafana.host}]
 </#if>
@@ -341,7 +341,10 @@ prometheus:
       - prometheus-metrics-creds-scmm
       - prometheus-metrics-creds-jenkins
     additionalScrapeConfigs:
-<#if config.scm.scmProviderType?lower_case == "scm_manager">
+<#if config.scm.scmProviderType?lower_case == "scm_manager"
+  && scm.host?has_content
+  && scm.protocol?has_content
+  && scm.path?has_content>
       - job_name: 'scm-manager'
         static_configs:
           - targets: [ '${scm.host}' ]
@@ -351,11 +354,13 @@ prometheus:
           username: '${config.application.namePrefix}metrics'
           password_file: '/etc/prometheus/secrets/prometheus-metrics-creds-scmm/password'
 </#if>
+<#if jenkins?? && jenkins?is_hash>
       - job_name: 'jenkins'
         static_configs:
           - targets: [ '${jenkins.host}' ]
         scheme: ${jenkins.protocol}
         metrics_path: '${jenkins.path}'
         basic_auth:
           username: '${jenkins.metricsUsername}'
-          password_file: '/etc/prometheus/secrets/prometheus-metrics-creds-jenkins/password'
+          password_file: '/etc/prometheus/secrets/prometheus-metrics-creds-jenkins/password'
+</#if>

applications/cluster-resources/monitoring/rbac/namespace-isolation-rbac.ftl.yaml → argocd/cluster-resources/apps/prometheusstack/templates/rbac/namespace-isolation-rbac.ftl.yaml

@@ -136,7 +136,7 @@ metadata:
 subjects:
   - kind: ServiceAccount
     name: kube-prometheus-stack-operator
-    namespace: ${namePrefix}monitoring
+    namespace: ${config.application.namePrefix}monitoring
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role
@@ -150,7 +150,7 @@ metadata:
 subjects:
   - kind: ServiceAccount
     name: kube-prometheus-stack-prometheus
-    namespace: ${namePrefix}monitoring
+    namespace: ${config.application.namePrefix}monitoring
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role
@@ -184,4 +184,4 @@ roleRef:
 subjects:
   - kind: ServiceAccount
     name: kube-prometheus-stack-grafana
-    namespace: ${namePrefix}monitoring
+    namespace: ${config.application.namePrefix}monitoring

scm-manager/values.ftl.yaml → argocd/cluster-resources/apps/scm-manager/templates/values.ftl.yaml

@@ -8,17 +8,17 @@ livenessProbe:
 fullnameOverride : ${releaseName}
 
 extraEnv: |
-    - name: SCM_WEBAPP_INITIALUSER
-      value: "${username}"
-    - name: SCM_WEBAPP_INITIALPASSWORD
-      value: "${password}"
+  - name: SCM_WEBAPP_INITIALUSER
+    value: "${username}"
+  - name: SCM_WEBAPP_INITIALPASSWORD
+    value: "${password}"
 
 <#if remote?? && !remote>
 service:
   type: NodePort
-</#if>
-
-<#if host?has_content>
+  </#if>
+  
+  <#if host?has_content>
 ingress:
   enabled: true
   path: /

examples/example-apps-via-content-loader/config.yaml

@@ -23,7 +23,7 @@ content:
       createJenkinsJob: true
     - url: https://github.com/cloudogu/gitops-playground
       path: examples/example-apps-via-content-loader/
-      ref: main
+      ref: feature/optimize-repo-structure
       templating: true
       type: FOLDER_BASED
       overwriteMode: UPGRADE

src/main/groovy/com/cloudogu/gitops/destroy/ArgoCDDestructionHandler.groovy

@@ -40,7 +40,7 @@ class ArgoCDDestructionHandler implements DestructionHandler {
     @Override
     void destroy() {
 
-        def repo = repoProvider.getRepo("argocd/argocd", gitHandler.resourcesScm)
+        def repo = repoProvider.getRepo("argocd/cloud-resources", gitHandler.resourcesScm)
         repo.cloneRepo()
 
         for (def app in k8sClient.getCustomResource("app")) {

src/main/groovy/com/cloudogu/gitops/features/CertManager.groovy

@@ -22,7 +22,7 @@ import java.nio.file.Path
 @Order(160)
 class CertManager extends Feature implements FeatureWithImage {
 
-    static final String HELM_VALUES_PATH = "applications/cluster-resources/certManager-helm-values.ftl.yaml"
+    static final String HELM_VALUES_PATH = "argocd/cluster-resources/apps/cert-manager/templates/certManager-helm-values.ftl.yaml"
 
     private FileSystemUtils fileSystemUtils
     private DeploymentStrategy deployer

src/main/groovy/com/cloudogu/gitops/features/ExternalSecretsOperator.groovy

@@ -22,7 +22,7 @@ import java.nio.file.Path
 @Order(400)
 class ExternalSecretsOperator extends Feature implements FeatureWithImage {
 
-    static final String HELM_VALUES_PATH = 'applications/cluster-resources/secrets/external-secrets/values.ftl.yaml'
+    static final String HELM_VALUES_PATH = "argocd/cluster-resources/apps/external-secrets/templates/values.ftl.yaml"
 
     String namespace = "${config.application.namePrefix}secrets"
     Config config

src/main/groovy/com/cloudogu/gitops/features/IngressNginx.groovy

@@ -22,7 +22,7 @@ import java.nio.file.Path
 @Order(150)
 class IngressNginx extends Feature implements FeatureWithImage {
 
-    static final String HELM_VALUES_PATH = "applications/cluster-resources/ingress-nginx-helm-values.ftl.yaml"
+    static final String HELM_VALUES_PATH = "argocd/cluster-resources/apps/ingress/templates/ingress-nginx-helm-values.ftl.yaml"
 
     String namespace = "${config.application.namePrefix}ingress-nginx"
     Config config