removing unused folders from argocd repo

Author: nihussmann

src/main/groovy/com/cloudogu/gitops/features/argocd/ArgoCD.groovy

@@ -479,6 +479,15 @@ class ArgoCD extends Feature {
             FileSystemUtils.deleteDir argocdRepoInitializationAction.repo.getAbsoluteLocalRepoTmpDir() + '/operator'
         }
 
+        if (config.multiTenant.useDedicatedInstance) {
+            log.debug("Deleting unnecessary non dedicated instances folders from argocd repo: ${argocdRepoInitializationAction.repo.getAbsoluteLocalRepoTmpDir()}")
+            FileSystemUtils.deleteDir argocdRepoInitializationAction.repo.getAbsoluteLocalRepoTmpDir() + '/applications'
+            FileSystemUtils.deleteDir argocdRepoInitializationAction.repo.getAbsoluteLocalRepoTmpDir() + '/projects'
+        } else {
+            log.debug("Deleting unnecessary multiTenant folder from argocd repo: ${argocdRepoInitializationAction.repo.getAbsoluteLocalRepoTmpDir()}")
+            FileSystemUtils.deleteDir argocdRepoInitializationAction.repo.getAbsoluteLocalRepoTmpDir() + '/multiTenant'
+        }
+
         if (!config.scmm.internal) {
             String externalScmmUrl = ScmUrlResolver.externalHost(config)
             log.debug("Configuring all yaml files in argocd repo to use the external scmm url: ${externalScmmUrl}")

src/test/groovy/com/cloudogu/gitops/features/argocd/ArgoCDTest.groovy

@@ -1205,7 +1205,7 @@ class ArgoCDTest {
                 "testPrefix-example-apps-production"
         ]
         // have to prepare activeNamespaces for unit-test, Application.groovy is setting this in integration way
-        config.application.namespaces.dedicatedNamespaces =new LinkedHashSet<String>([
+        config.application.namespaces.dedicatedNamespaces = new LinkedHashSet<String>([
                 "monitoring",
                 "secrets",
                 "ingress-nginx",
@@ -1586,6 +1586,30 @@ class ArgoCDTest {
         k8sCommands.assertExecuted('kubectl patch secret argocd-default-cluster-config -n argocd --patch-file=/tmp/gitops-playground-patch-')
     }
 
+
+    @Test
+    void 'multiTenant folder gets deleted correctly if not in dedicated mode'() {
+        config.multiTenant.useDedicatedInstance = false
+
+        def argocd = createArgoCD()
+        argocd.install()
+
+        assertThat(Path.of(argocdRepo.getAbsoluteLocalRepoTmpDir(), 'multiTenant/')).doesNotExist()
+        assertThat(Path.of(argocdRepo.getAbsoluteLocalRepoTmpDir(), 'applications/')).exists()
+        assertThat(Path.of(argocdRepo.getAbsoluteLocalRepoTmpDir(), 'projects/')).exists()
+    }
+
+    @Test
+    void 'deleting unused folder in dedicated mode'() {
+        config.multiTenant.useDedicatedInstance = true
+
+        def argocd = createArgoCD()
+        argocd.install()
+        assertThat(Path.of(argocdRepo.getAbsoluteLocalRepoTmpDir(), 'multiTenant/')).exists()
+        assertThat(Path.of(argocdRepo.getAbsoluteLocalRepoTmpDir(), 'applications/')).doesNotExist()
+        assertThat(Path.of(argocdRepo.getAbsoluteLocalRepoTmpDir(), 'projects/')).doesNotExist()
+    }
+
     @Test
     void 'RBACs generated correctly'() {
         config.application.namespaces.tenantNamespaces = new LinkedHashSet(['testprefix-tenant-test1', 'testprefix-tenant-test2', 'testprefix-tenant-test3'])
@@ -1728,6 +1752,7 @@ class ArgoCDTest {
                 'http://scmm.scm-manager.svc.cluster.local/scm/3rd-party-dependencies/cert-manager.git'
         )
     }
+
     @Test
     void 'If using mirror with GitLab, ensure source repos in cluster-resources got right URL'() {
         config.application.mirrorRepos = true
@@ -1786,6 +1811,7 @@ class ArgoCDTest {
                 'http://scmm.test1-scm-manager.svc.cluster.local/scm/repo/3rd-party-dependencies/cert-manager'
         )
     }
+
     @Test
     void 'If using mirror with name-prefix, ensure source repos in cluster-resources got right URL'() {
         config.application.mirrorRepos = true