Merge pull request #295 from cloudogu/feature/central-argo-namespace-merged

pmarkiewka · web-flow · commit 0533996e413b · 2025-08-01T10:32:05.000+02:00
Feature/central argo namespace merged
diff --git a/argocd/argocd/multiTenant/central/applications/argocd.ftl.yaml b/argocd/argocd/multiTenant/central/applications/argocd.ftl.yaml
@@ -2,7 +2,7 @@ apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
   name: ${namePrefix}argocd
-  namespace: argocd
+  namespace: ${config.multiTenant.centralArgocdNamespace}
   annotations:
     # Only app with the sync-status-unknown alert, so that we only get one alert when SCM is not reachable.
     # Otherwise, there would be a spam wave by every application everytime the SCM is not reachable.
diff --git a/argocd/argocd/multiTenant/central/applications/bootstrap.ftl.yaml b/argocd/argocd/multiTenant/central/applications/bootstrap.ftl.yaml
@@ -3,7 +3,7 @@ apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
   name: ${namePrefix}bootstrap
-  namespace: argocd
+  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
diff --git a/argocd/argocd/multiTenant/central/applications/cluster-resources.ftl.yaml b/argocd/argocd/multiTenant/central/applications/cluster-resources.ftl.yaml
@@ -2,7 +2,7 @@ apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
   name: ${namePrefix}cluster-resources
-  namespace: argocd
+  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
diff --git a/argocd/argocd/multiTenant/central/applications/projects.ftl.yaml b/argocd/argocd/multiTenant/central/applications/projects.ftl.yaml
@@ -2,7 +2,7 @@ apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
   name: ${namePrefix}projects
-  namespace: argocd
+  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
diff --git a/argocd/argocd/multiTenant/central/projects/tenant.ftl.yaml b/argocd/argocd/multiTenant/central/projects/tenant.ftl.yaml
@@ -2,7 +2,7 @@ apiVersion: argoproj.io/v1alpha1
 kind: AppProject
 metadata:
   name: ${tenantName}
-  namespace: argocd
+  namespace: ${config.multiTenant.centralArgocdNamespace}
 spec:
   description: Contains Cluster Ressources for MultiTentant Mode
   destinations:
diff --git a/argocd/argocd/multiTenant/tenant/applications/bootstrap.ftl.yaml b/argocd/argocd/multiTenant/tenant/applications/bootstrap.ftl.yaml
@@ -11,7 +11,7 @@ spec:
   destination:
     server: https://kubernetes.default.svc
     namespace: ${namePrefix}argocd
-  project: default
+  project: argocd
   source:
     path: applications/
     repoURL: ${scmm.repoUrl}argocd/argocd
@@ -36,7 +36,7 @@ spec:
   destination:
     server: https://kubernetes.default.svc
     namespace: ${namePrefix}argocd
-  project: default
+  project: argocd
   source:
     path: projects/
     repoURL: ${scmm.repoUrl}argocd/argocd
@@ -49,7 +49,7 @@ spec:
       selfHeal: true
 ---
 #duplicate from argocd/projects/
-<#if config.multiTenant.useDedicatedInstance>
+<#if config.multiTenant.useDedicatedInstance && config.content.examples>
 apiVersion: argoproj.io/v1alpha1
 kind: AppProject
 metadata:
diff --git a/argocd/argocd/multiTenant/tenant/projects/.gitkeep b/argocd/argocd/multiTenant/tenant/projects/.gitkeep
diff --git a/argocd/argocd/multiTenant/tenant/projects/argocd.ftl.yaml b/argocd/argocd/multiTenant/tenant/projects/argocd.ftl.yaml
@@ -0,0 +1,23 @@
+apiVersion: argoproj.io/v1alpha1
+kind: AppProject
+metadata:
+  name: argocd
+  namespace: ${namePrefix}argocd
+  annotations:
+<#if mail.active?? && mail.active>
+    notifications.argoproj.io/subscribe.email: ${argocd.emailToAdmin}
+</#if>
+spec:
+  description: AppProject for ArgoCD-specific applications.
+  destinations:
+    - namespace: '*'
+      server: https://kubernetes.default.svc
+  clusterResourceWhitelist:
+    - group: '*'
+      kind: '*'
+  # must be able to get all git repos because of the Applications pointing to other repos
+  sourceRepos:
+    - '*'
+  # Allow applications from all namespaces to use this project for now.
+  sourceNamespaces:
+    - '*'
diff --git a/argocd/argocd/multiTenant/tenant/projects/default.ftl.yaml b/argocd/argocd/multiTenant/tenant/projects/default.ftl.yaml
@@ -0,0 +1,15 @@
+apiVersion: argoproj.io/v1alpha1
+kind: AppProject
+metadata:
+  name: default
+  namespace: ${namePrefix}argocd
+  annotations:
+<#if mail.active?? && mail.active>
+    notifications.argoproj.io/subscribe.email: ${argocd.emailToAdmin}
+</#if>
+spec:
+  description: Default fallback AppProject if none other is specified. Is not allowed to do anything.
+  clusterResourceWhitelist:
+  destinations:
+  sourceRepos:
+  sourceNamespaces:
diff --git a/docs/configuration.schema.json b/docs/configuration.schema.json
@@ -262,6 +262,10 @@
                 }
               }
             },
+            "namespace" : {
+              "type" : [ "string", "null" ],
+              "description" : "Defines the kubernetes namespace for ArgoCD"
+            },
             "operator" : {
               "type" : [ "boolean", "null" ],
               "description" : "Install ArgoCD via an already running ArgoCD Operator"
@@ -709,6 +713,14 @@
     "multiTenant" : {
       "type" : [ "object", "null" ],
       "properties" : {
+        "centralArgocdNamespace" : {
+          "type" : [ "string", "null" ],
+          "description" : "CENTRAL Argocd Repo Namespace"
+        },
+        "centralSCMamespace" : {
+          "type" : [ "string", "null" ],
+          "description" : "CENTRAL Argocd Repo Namespace"
+        },
         "centralScmUrl" : {
           "type" : [ "string", "null" ],
           "description" : "URL for the centralized Management Repo"
diff --git a/scripts/scm-manager/init-scmm.sh b/scripts/scm-manager/init-scmm.sh
@@ -180,6 +180,7 @@ function configureScmmManager() {
   setPermissionForUser "${METRICS_USERNAME}" "metrics:read"
 
  USE_CENTRAL_SCM=$([[ -n "${CENTRAL_SCM_URL// /}" ]] && echo true || echo false)
+ echo "Using central SCM: ${USE_CENTRAL_SCM}, URL: '${CENTRAL_SCM_URL}'"
 
   ### ArgoCD Repos
   if [[ $INSTALL_ARGOCD == true ]]; then
diff --git a/src/main/groovy/com/cloudogu/gitops/cli/GitopsPlaygroundCli.groovy b/src/main/groovy/com/cloudogu/gitops/cli/GitopsPlaygroundCli.groovy
@@ -213,7 +213,7 @@ class GitopsPlaygroundCli {
         return mergedConfig
     }
 
-    private static Map validateConfig(String configValues) {
+    static Map validateConfig(String configValues) {
         def map = new YamlSlurper().parseText(configValues)
         if (!(map instanceof Map)) {
             throw new RuntimeException("Could not parse YAML as map: $map")
@@ -240,4 +240,4 @@ class GitopsPlaygroundCli {
   |----------------------------------------------------------------------------------------------|
 '''
     }
-}
+}
diff --git a/src/main/groovy/com/cloudogu/gitops/config/Config.groovy b/src/main/groovy/com/cloudogu/gitops/config/Config.groovy
@@ -304,12 +304,8 @@ class Config {
 
            See ApplicationConfigurator.addScmmConfig() and the comment at jenkins.urlForScmm */
         String urlForJenkins = ''
-
-        @JsonIgnore
-        String getHost() { return NetworkingUtils.getHost(url) }
-
-        @JsonIgnore
-        String getProtocol() { return NetworkingUtils.getProtocol(url) }
+        @JsonIgnore String getHost() { return NetworkingUtils.getHost(url)}
+        @JsonIgnore String getProtocol() { return NetworkingUtils.getProtocol(url)}
         String ingress = ''
 
         @Option(names = ['--scmm-skip-restart'], description = SCMM_SKIP_RESTART_DESCRIPTION)
@@ -336,7 +332,7 @@ class Config {
         HelmConfigWithValues helm = new HelmConfigWithValues(
                 chart: 'scm-manager',
                 repoURL: 'https://packages.scm-manager.org/repository/helm-v2-releases/',
-                version: '3.2.1',
+                version: '3.8.0',
                 values: [:]
         )
 
@@ -368,9 +364,17 @@ class Config {
         @JsonPropertyDescription(CENTRAL_SCMM_USERNAME_DESCRIPTION)
         String username = ''
 
-        @Option(names = ['--central-scm-password'], description = SCMM_PASSWORD_DESCRIPTION)
+        @Option(names = ['--central-scm-password'], description = CENTRAL_SCMM_PASSWORD_DESCRIPTION)
         @JsonPropertyDescription(CENTRAL_SCMM_PASSWORD_DESCRIPTION)
         String password = ''
+
+        @Option(names = ['--central-argocd-namespace'], description = CENTRAL_ARGOCD_NAMESPACE_DESCRIPTION)
+        @JsonPropertyDescription(CENTRAL_ARGOCD_NAMESPACE_DESCRIPTION)
+        String centralArgocdNamespace = 'argocd'
+
+        @Option(names = ['--central-scm-namespace'], description = CENTRAL_ARGOCD_NAMESPACE_DESCRIPTION)
+        @JsonPropertyDescription(CENTRAL_ARGOCD_NAMESPACE_DESCRIPTION)
+        String centralSCMamespace = 'scm-manager'
     }
 
     static class ApplicationSchema {
@@ -613,6 +617,9 @@ class Config {
         @JsonPropertyDescription(ARGOCD_RESOURCE_INCLUSIONS_CLUSTER)
         String resourceInclusionsCluster = ''
 
+        @Option(names = ['--argocd-namespace'], description = ARGOCD_CUSTOM_NAMESPACE_DESCRIPTION)
+        @JsonPropertyDescription(ARGOCD_CUSTOM_NAMESPACE_DESCRIPTION)
+        String namespace = 'argocd'
     }
 
     static class MailSchema {
diff --git a/src/main/groovy/com/cloudogu/gitops/config/ConfigConstants.groovy b/src/main/groovy/com/cloudogu/gitops/config/ConfigConstants.groovy
@@ -76,6 +76,7 @@ interface ConfigConstants {
     String CENTRAL_MGMT_REPO_DESCRIPTION = 'URL for the centralized Management Repo'
     String CENTRAL_SCMM_USERNAME_DESCRIPTION = 'CENTRAL SCMM USERNAME'
     String CENTRAL_SCMM_PASSWORD_DESCRIPTION = 'CENTRAL SCMM Password'
+    String CENTRAL_ARGOCD_NAMESPACE_DESCRIPTION = 'CENTRAL Argocd Repo Namespace'
 
     // group remote
     String REMOTE_DESCRIPTION = 'Expose services as LoadBalancers'
@@ -166,7 +167,7 @@ interface ConfigConstants {
     String ARGOCD_OPERATOR_DESCRIPTION = 'Install ArgoCD via an already running ArgoCD Operator'
     String ARGOCD_ENV_DESCRIPTION = 'Pass a list of env vars to Argo CD components. Currently only works with operator'
     String ARGOCD_RESOURCE_INCLUSIONS_CLUSTER = 'Internal Kubernetes API Server URL https://IP:PORT (kubernetes.default.svc). Needed in argocd-operator resourceInclusions. Use this parameter if argocd.operator=true and NOT running inside a Pod (remote mode). Full URL needed, for example: https://100.125.0.1:443'
-
+    String ARGOCD_CUSTOM_NAMESPACE_DESCRIPTION= 'Defines the kubernetes namespace for ArgoCD'
     // group example apps
     String EXAMPLE_APPS_DESCRIPTION = 'Config parameters for the example apps and exercises'
     String BASE_DOMAIN_DESCRIPTION = 'The domain under which a subdomain these applications will be made available'
diff --git a/src/main/groovy/com/cloudogu/gitops/features/Jenkins.groovy b/src/main/groovy/com/cloudogu/gitops/features/Jenkins.groovy
@@ -142,7 +142,6 @@ class Jenkins extends Feature {
                 INSECURE                  : config.application.insecure,
                 SKIP_RESTART              : config.jenkins.skipRestart,
                 SKIP_PLUGINS              : config.jenkins.skipPlugins
-
         ])
 
         globalPropertyManager.setGlobalProperty("${config.application.namePrefixForEnvVars}SCMM_URL", config.scmm.urlForJenkins)
diff --git a/src/main/groovy/com/cloudogu/gitops/features/ScmManager.groovy b/src/main/groovy/com/cloudogu/gitops/features/ScmManager.groovy
@@ -4,11 +4,7 @@ import com.cloudogu.gitops.Feature
 import com.cloudogu.gitops.config.Config
 import com.cloudogu.gitops.features.deployment.DeploymentStrategy
 import com.cloudogu.gitops.features.deployment.HelmStrategy
-import com.cloudogu.gitops.utils.CommandExecutor
-import com.cloudogu.gitops.utils.FileSystemUtils
-import com.cloudogu.gitops.utils.K8sClient
-import com.cloudogu.gitops.utils.MapUtils
-import com.cloudogu.gitops.utils.NetworkingUtils
+import com.cloudogu.gitops.utils.*
 import groovy.util.logging.Slf4j
 import io.micronaut.core.annotation.Order
 import jakarta.inject.Singleton
@@ -35,6 +31,7 @@ class ScmManager extends Feature {
     private GitLabApi gitlabApi
     private K8sClient k8sClient
     private NetworkingUtils networkingUtils
+    String centralSCMUrl
 
     ScmManager(
             Config config,
@@ -53,6 +50,7 @@ class ScmManager extends Feature {
         this.gitlabApi.enableRequestResponseLogging(Level.ALL)
         this.k8sClient = k8sClient
         this.networkingUtils = networkingUtils
+        this.centralSCMUrl = config.multiTenant.centralScmUrl
     }
 
     @Override
@@ -62,22 +60,23 @@ class ScmManager extends Feature {
 
     @Override
     void enable() {
-        String centralSCMUrl = config.multiTenant.centralScmUrl
+        if (config.multiTenant.useDedicatedInstance) {
+            this.centralSCMUrl = !config.multiTenant.internal ? config.multiTenant.centralScmUrl : "http://scmm.scm-manager.svc.cluster.local/scm"
+        }
 
         if (config.scmm.internal) {
-
             String releaseName = 'scmm'
 
             k8sClient.createNamespace(namespace)
 
             def helmConfig = config.scmm.helm
 
             def templatedMap = templateToMap(HELM_VALUES_PATH, [
-                    host    : config.scmm.ingress,
-                    remote  : config.application.remote,
-                    username: config.scmm.username,
-                    password: config.scmm.password,
-                    helm    : config.scmm.helm,
+                    host       : config.scmm.ingress,
+                    remote     : config.application.remote,
+                    username   : config.scmm.username,
+                    password   : config.scmm.password,
+                    helm       : config.scmm.helm,
                     releaseName: releaseName
             ])
 
@@ -93,11 +92,11 @@ class ScmManager extends Feature {
                     'scmm',
                     tempValuesPath
             )
-            
+
             // Update scmm.url after it is deployed (and ports are known)
             // Defined here: https://github.com/scm-manager/scm-manager/blob/3.2.1/scm-packaging/helm/src/main/chart/templates/_helpers.tpl#L14-L25
             String contentPath = "/scm"
-            
+
             if (config.application.runningInsideK8s) {
                 log.debug("Setting scmm url to k8s service, since installation is running inside k8s")
                 config.scmm.url = networkingUtils.createUrl("${releaseName}.${namespace}.svc.cluster.local", "80", contentPath)
@@ -107,8 +106,8 @@ class ScmManager extends Feature {
                 String clusterBindAddress = networkingUtils.findClusterBindAddress()
                 config.scmm.url = networkingUtils.createUrl(clusterBindAddress, port, contentPath)
 
-                if(config.multiTenant.useDedicatedInstance && config.multiTenant.internal){
-                    log.debug("Setting internal configs for local single node cluster with internal scmm. Waiting for NodePort...")
+                if (config.multiTenant.useDedicatedInstance && config.multiTenant.internal) {
+                    log.debug("Setting internal configs for local single node cluster with internal central scmm. Waiting for NodePort...")
                     def portCentralScm = k8sClient.waitForNodePort(releaseName, "scm-manager")
                     centralSCMUrl = networkingUtils.createUrl(clusterBindAddress, portCentralScm, contentPath)
                 }
diff --git a/src/main/groovy/com/cloudogu/gitops/features/argocd/ArgoCD.groovy b/src/main/groovy/com/cloudogu/gitops/features/argocd/ArgoCD.groovy
diff --git a/src/main/groovy/com/cloudogu/gitops/scmm/ScmmRepo.groovy b/src/main/groovy/com/cloudogu/gitops/scmm/ScmmRepo.groovy
diff --git a/src/test/groovy/com/cloudogu/gitops/cli/GitopsPlaygroundCliTest.groovy b/src/test/groovy/com/cloudogu/gitops/cli/GitopsPlaygroundCliTest.groovy
diff --git a/src/test/groovy/com/cloudogu/gitops/features/argocd/ArgoCDTest.groovy b/src/test/groovy/com/cloudogu/gitops/features/argocd/ArgoCDTest.groovy
