fixing hardcoded central Argocd namespace

Author: nihussmann

argocd/cluster-resources/argocd/misc.ftl.yaml

@@ -4,7 +4,7 @@ apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
   name: <#if config.multiTenant.useDedicatedInstance>${namePrefix}misc<#else>misc</#if>
-  namespace: <#if config.multiTenant.useDedicatedInstance>argocd<#else>${namePrefix}argocd</#if>
+  namespace: <#if config.multiTenant.useDedicatedInstance>${config.multiTenant.centralArgocdNamespace}<#else>${namePrefix}argocd</#if>
 spec:
   project: <#if config.multiTenant.useDedicatedInstance>${tenantName}<#else>cluster-resources</#if>
   destination:

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

@@ -345,14 +345,14 @@ class ArgoCD extends Feature {
             // Append new namespaces to existing ones from the secret.
             // `kubectl patch` can't merge list subfields, so we read, decode, merge, and update the secret.
             // This ensures all centrally managed namespaces are preserved.
-            String base64Namespaces = k8sClient.getArgoCDNamespacesSecret('argocd-default-cluster-config', 'argocd')
+            String base64Namespaces = k8sClient.getArgoCDNamespacesSecret('argocd-default-cluster-config', config.multiTenant.centralArgocdNamespace)
             byte[] decodedBytes = Base64.decoder.decode(base64Namespaces)
             String decoded = new String(decodedBytes, "UTF-8")
             def decodedList = decoded?.split(',') as List ?: []
             def activeList = config.application.namespaces.activeNamespaces?.flatten() as List ?: []
             def merged = (decodedList + activeList).unique().join(',')
             log.debug("Updating Central Argocd 'argocd-default-cluster-config' secret")
-            k8sClient.patch('secret', 'argocd-default-cluster-config', 'argocd',
+            k8sClient.patch('secret', 'argocd-default-cluster-config', config.multiTenant.centralArgocdNamespace,
                     [stringData: ['namespaces': merged]])
         }
     }

src/main/groovy/com/cloudogu/gitops/kubernetes/argocd/ArgoApplication.groovy

@@ -1,6 +1,6 @@
 package com.cloudogu.gitops.kubernetes.argocd
 
-import com.cloudogu.gitops.config.Config
+
 import com.cloudogu.gitops.scmm.ScmmRepo
 import com.cloudogu.gitops.utils.TemplatingEngine
 import groovy.util.logging.Slf4j
@@ -14,28 +14,30 @@ class ArgoApplication {
 
     String name
     String namespace
+    String destinationNamespace
     String path
     String repoUrl
     String project
 
     private final TemplatingEngine templater = new TemplatingEngine()
 
-    ArgoApplication(String name, String repoUrl, String namespace, String path, String project = 'default') {
+    ArgoApplication(String name, String repoUrl, String namespace, String destinationNamespace, String path, String project = 'default') {
         this.name = name
+        this.namespace = namespace
+        this.destinationNamespace = destinationNamespace
         this.project = project
         this.repoUrl = repoUrl
-        this.namespace = namespace
         this.path = path
     }
 
     Map<String, Object> toTemplateParams() {
         return [
-                name      : name,
-                namespace : namespace,
-                project   : project,
-                path      : path,
-                namePrefix: new Config().application.namePrefix,
-                repoUrl   : repoUrl
+                name                : this.name,
+                namespace           : this.namespace,
+                project             : this.project,
+                path                : this.path,
+                destinationNamespace: this.destinationNamespace,
+                repoUrl             : this.repoUrl
         ]
     }
 

src/test/groovy/com/cloudogu/gitops/kubernetes/rbac/ArgocdApplicationTest.groovy

@@ -0,0 +1,58 @@
+package com.cloudogu.gitops.kubernetes.rbac
+
+import com.cloudogu.gitops.config.Config
+import com.cloudogu.gitops.kubernetes.argocd.ArgoApplication
+import com.cloudogu.gitops.scmm.ScmmRepo
+import com.cloudogu.gitops.utils.FileSystemUtils
+import groovy.yaml.YamlSlurper
+import org.junit.jupiter.api.Test
+
+import static org.assertj.core.api.Assertions.assertThat
+
+class ArgocdApplicationTest {
+
+
+    Config config = Config.fromMap([
+            scmm       : [
+                    username: 'user',
+                    password: 'pass',
+                    protocol: 'http',
+                    host    : 'localhost',
+                    provider: 'scm-manager',
+                    rootPath: 'scm'
+            ],
+            application: [
+                    namePrefix: '',
+                    insecure  : false,
+                    gitName   : 'Test User',
+                    gitEmail  : 'test@example.com'
+            ]
+    ])
+
+
+    @Test
+    void 'simple ArgoCD Application with common values'() {
+
+        ScmmRepo repo = new ScmmRepo(config, "my-repo", new FileSystemUtils())
+
+        new ArgoApplication(
+                'example-apps',
+                'testurl.com/argocd/example-apps',
+                'testprefix-argocd',
+                'testnamespace',
+                'argocd/')
+                .generate(repo, 'testsubfolder/test')
+
+
+        File file = new File(repo.getAbsoluteLocalRepoTmpDir(), "testsubfolder/test/argocd-application-example-apps-testprefix-argocd.yaml")
+        assertThat(file).exists()
+        Map yaml = new YamlSlurper().parse(file) as Map
+
+        assertThat(yaml["metadata"]["name"]).isEqualTo('example-apps')
+        assertThat(yaml["metadata"]["namespace"]).isEqualTo('testprefix-argocd')
+        assertThat(yaml["spec"]["destination"]["namespace"]).isEqualTo('testnamespace')
+
+        assertThat(yaml["spec"]["source"]["path"]).isEqualTo('argocd/')
+        assertThat(yaml["spec"]["source"]["repoURL"]).isEqualTo('testurl.com/argocd/example-apps')
+    }
+}

templates/kubernetes/argocd/application.ftl.yaml

@@ -9,7 +9,7 @@ metadata:
 spec:
   destination:
     server: https://kubernetes.default.svc
-    namespace: ${namePrefix}argocd
+    namespace: ${destinationNamespace}
   project: default
   source:
     path: ${path}