fixing ArgocdApplication

Author: nihussmann

src/main/groovy/com/cloudogu/gitops/config/Config.groovy

@@ -484,6 +484,11 @@ class Config {
                 return new LinkedHashSet<>(dedicatedNamespaces + tenantNamespaces)
             }
         }
+
+        @JsonIgnore
+        String getTenantName(){
+            return namePrefix.replaceAll(/-$/, "")
+        }
     }
 
     static class ImagesSchema {

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

@@ -246,7 +246,9 @@ class ArgoCD extends Feature {
                         'example-apps',
                         ScmmRepo.createSCMBaseUrl(config)+'argocd/example-apps',
                         namespace,
-                        'argocd/')
+                        namespace,
+                        'argocd/',
+                        config.application.getTenantName())
                         .generate(tenantBootstrapInitializationAction.repo, 'applications')
             }
         }
@@ -446,19 +448,18 @@ class ArgoCD extends Feature {
         k8sClient.label('secret', repoTemplateSecretName, namespace,
                 new Tuple2(' argocd.argoproj.io/secret-type', 'repo-creds'))
 
-
         if (config.multiTenant.useDedicatedInstance) {
             log.debug('Creating central repo credential secret that is used by argocd to access repos in SCM-Manager')
             // Create secret imperatively here instead of values.yaml, because we don't want it to show in git repo
             def centralRepoTemplateSecretName = 'argocd-repo-creds-central-scmm'
 
-            k8sClient.createSecret('generic', centralRepoTemplateSecretName, "argocd",
+            k8sClient.createSecret('generic', centralRepoTemplateSecretName, config.multiTenant.centralArgocdNamespace,
                     new Tuple2('url', config.multiTenant.centralScmUrl),
                     new Tuple2('username', config.multiTenant.username),
                     new Tuple2('password', config.multiTenant.password)
             )
 
-            k8sClient.label('secret', centralRepoTemplateSecretName, "argocd",
+            k8sClient.label('secret', centralRepoTemplateSecretName, config.multiTenant.centralArgocdNamespace,
                     new Tuple2(' argocd.argoproj.io/secret-type', 'repo-creds'))
         }
     }

src/test/groovy/com/cloudogu/gitops/config/schema/ConfigTest.groovy

@@ -52,4 +52,10 @@ registry:
         assertThat(actualValues.application.namePrefix).isEqualTo(expectedValues.application.namePrefix)
         assertThat(actualValues.registry.internalPort).isEqualTo(expectedValues.registry.internalPort)
     }
-}
+
+    @Test
+    void 'getting Tenantname from Config'(){
+        testConfig.application.namePrefix='testprefix-'
+        assertThat(testConfig.application.getTenantName()).isEqualTo("testprefix")
+    }
+}

templates/kubernetes/argocd/application.ftl.yaml

@@ -10,7 +10,7 @@ spec:
   destination:
     server: https://kubernetes.default.svc
     namespace: ${destinationNamespace}
-  project: default
+  project: ${project}
   source:
     path: ${path}
     repoURL: ${repoUrl}