Git abstraction

applications/cluster-resources/monitoring/prometheus-stack-helm-values.ftl.yaml

@@ -341,14 +341,16 @@ prometheus:
       - prometheus-metrics-creds-scmm
       - prometheus-metrics-creds-jenkins
     additionalScrapeConfigs:
+<#if config.scm.scmProviderType?lower_case == "scm_manager">
       - job_name: 'scm-manager'
         static_configs:
-          - targets: [ '${scmm.host}' ]
-        scheme: ${scmm.protocol}
-        metrics_path: '${scmm.path}'
+          - targets: [ '${scm.host}' ]
+        scheme: ${scm.protocol}
+        metrics_path: '${scm.path}'
         basic_auth:
           username: '${config.application.namePrefix}metrics'
           password_file: '/etc/prometheus/secrets/prometheus-metrics-creds-scmm/password'
+</#if>
       - job_name: 'jenkins'
         static_configs:
           - targets: [ '${jenkins.host}' ]

argocd/argocd/applications/argocd.ftl.yaml

@@ -19,7 +19,7 @@ spec:
   project: argocd
   source:
     path: ${config.features.argocd.operator?string("operator/", "argocd/")}
-    repoURL: ${scmm.repoUrl}argocd/argocd<#if config.scmm.provider == "gitlab">.git</#if>
+    repoURL: ${scm.repoUrl}argocd/argocd.git
     targetRevision: main
     # needed to sync the operator/rbac folder
     <#if config.features.argocd.operator>

argocd/argocd/applications/bootstrap.ftl.yaml

@@ -14,7 +14,7 @@ spec:
   project: argocd
   source:
     path: applications/
-    repoURL: ${scmm.repoUrl}argocd/argocd<#if config.scmm.provider == "gitlab">.git</#if>
+    repoURL: ${scm.repoUrl}argocd/argocd.git
     targetRevision: main
     directory:
       recurse: true

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

@@ -13,7 +13,7 @@ spec:
   project: argocd
   source:
     path: argocd/
-    repoURL: ${scmm.repoUrl}argocd/cluster-resources<#if config.scmm.provider == "gitlab">.git</#if>
+    repoURL: ${scm.repoUrl}argocd/cluster-resources.git
     targetRevision: main
     directory:
       recurse: true

argocd/argocd/applications/projects.ftl.yaml

@@ -13,7 +13,7 @@ spec:
   project: argocd
   source:
     path: projects/
-    repoURL: ${scmm.repoUrl}argocd/argocd<#if config.scmm.provider == "gitlab">.git</#if>
+    repoURL: ${scm.repoUrl}argocd/argocd.git
     targetRevision: main
     directory:
       recurse: true

argocd/argocd/multiTenant/central/applications/argocd.ftl.yaml

@@ -19,7 +19,7 @@ spec:
   project: ${tenantName}
   source:
     path: ${config.features.argocd.operator?string("operator/", "argocd/")}
-    repoURL: ${scmm.centralScmmUrl}/repo/${config.application.namePrefix}argocd/argocd
+    repoURL: ${scm.centralScmUrl}argocd/argocd.git
     targetRevision: main
     # needed to sync the operator/rbac folder
     <#if config.features.argocd.operator??>

argocd/argocd/multiTenant/central/applications/bootstrap.ftl.yaml

@@ -14,7 +14,7 @@ spec:
   project: ${tenantName}
   source:
     path: multiTenant/central/applications/
-    repoURL: ${scmm.centralScmmUrl}/repo/${config.application.namePrefix}argocd/argocd
+    repoURL: ${scm.centralScmUrl}argocd/argocd.git
     targetRevision: main
     directory:
       recurse: true

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

@@ -13,7 +13,7 @@ spec:
   project: ${tenantName}
   source:
     path: argocd/
-    repoURL: ${scmm.centralScmmUrl}/repo/${config.application.namePrefix}argocd/cluster-resources
+    repoURL: ${scm.centralScmUrl}argocd/cluster-resources.git
     targetRevision: main
     directory:
       recurse: true

argocd/argocd/multiTenant/central/applications/projects.ftl.yaml

@@ -13,7 +13,7 @@ spec:
   project: ${tenantName}
   source:
     path: multiTenant/central/projects/
-    repoURL: ${scmm.centralScmmUrl}/repo/${config.application.namePrefix}argocd/argocd
+    repoURL: ${scm.centralScmUrl}argocd/argocd.git
     targetRevision: main
     directory:
       recurse: true

argocd/argocd/multiTenant/central/projects/tenant.ftl.yaml

@@ -9,15 +9,15 @@ spec:
     - namespace: '*'
       server: https://kubernetes.default.svc
   sourceRepos:
-    - ${scmm.centralScmmUrl}/repo/${config.application.namePrefix}argocd/argocd
-    - ${scmm.centralScmmUrl}/repo/${config.application.namePrefix}argocd/cluster-resources
+    - ${scm.centralScmUrl}argocd/argocd.git
+    - ${scm.centralScmUrl}argocd/cluster-resources.git
 <#if config.application.mirrorRepos>
-    - ${scmm.repoUrl}3rd-party-dependencies/kube-prometheus-stack<#if config.scmm.provider == "gitlab">.git</#if>
-    - ${scmm.repoUrl}3rd-party-dependencies/mailhog<#if config.scmm.provider == "gitlab">.git</#if>
-    - ${scmm.repoUrl}3rd-party-dependencies/ingress-nginx<#if config.scmm.provider == "gitlab">.git</#if>
-    - ${scmm.repoUrl}3rd-party-dependencies/external-secrets<#if config.scmm.provider == "gitlab">.git</#if>
-    - ${scmm.repoUrl}3rd-party-dependencies/vault<#if config.scmm.provider == "gitlab">.git</#if>
-    - ${scmm.repoUrl}3rd-party-dependencies/cert-manager<#if config.scmm.provider == "gitlab">.git</#if>
+    - ${scm.repoUrl}3rd-party-dependencies/kube-prometheus-stack.git
+    - ${scm.repoUrl}3rd-party-dependencies/mailhog.git
+    - ${scm.repoUrl}3rd-party-dependencies/ingress-nginx.git
+    - ${scm.repoUrl}3rd-party-dependencies/external-secrets.git
+    - ${scm.repoUrl}3rd-party-dependencies/vault.git
+    - ${scm.repoUrl}3rd-party-dependencies/cert-manager.git
 <#else>
     - https://prometheus-community.github.io/helm-charts
     - https://codecentric.github.io/helm-charts

argocd/argocd/multiTenant/tenant/applications/bootstrap.ftl.yaml

@@ -14,7 +14,7 @@ spec:
   project: argocd
   source:
     path: applications/
-    repoURL: ${scmm.repoUrl}argocd/argocd
+    repoURL: ${scm.repoUrl}argocd/argocd.git
     targetRevision: main
     directory:
       recurse: true
@@ -39,7 +39,7 @@ spec:
   project: argocd
   source:
     path: projects/
-    repoURL: ${scmm.repoUrl}argocd/argocd
+    repoURL: ${scm.repoUrl}argocd/argocd.git
     targetRevision: main
     directory:
       recurse: true
@@ -67,8 +67,8 @@ spec:
     - namespace: ${config.application.namePrefix}example-apps-staging
       server: https://kubernetes.default.svc
   sourceRepos:
-    - ${scmm.repoUrl}argocd/example-apps<#if config.scmm.provider == "gitlab">.git</#if>
-    - ${scmm.repoUrl}argocd/nginx-helm-umbrella<#if config.scmm.provider == "gitlab">.git</#if>
+    - ${scm.repoUrl}argocd/example-apps.git
+    - ${scm.repoUrl}argocd/nginx-helm-umbrella.git
 
   # allow to only see application resources from the specified namespace
   sourceNamespaces:

argocd/argocd/operator/argocd.ftl.yaml

@@ -127,11 +127,11 @@ spec:
     ingress:
       enabled: ${((!config.application.openshift) && (!config.application.insecure))?c}
   initialRepositories: |
-<#if !(scmm.centralScmmUrl?has_content)>
+<#if !(scm.centralScmUrl?has_content)>
     - name: argocd
-      url: ${scmm.repoUrl}argocd/argocd<#if config.scmm.provider == "gitlab">.git</#if>
+      url: ${scm.repoUrl}argocd/argocd.git
     - name: cluster-resources
-      url: ${scmm.repoUrl}argocd/cluster-resources<#if config.scmm.provider == "gitlab">.git</#if>
+      url: ${scm.repoUrl}argocd/cluster-resources.git
     - name: prometheus-community
       type: helm
       url: https://prometheus-community.github.io/helm-charts
@@ -143,11 +143,11 @@ spec:
       url: https://kubernetes.github.io/ingress-nginx
 </#if>
     - name: example-apps
-      url: ${scmm.repoUrl}argocd/example-apps<#if config.scmm.provider == "gitlab">.git</#if>
+      url: ${scm.repoUrl}argocd/example-apps.git
     - name: nginx-helm-jenkins
-      url: ${scmm.repoUrl}argocd/nginx-helm-jenkins<#if config.scmm.provider == "gitlab">.git</#if>
+      url: ${scm.repoUrl}argocd/nginx-helm-jenkins.git
     - name: nginx-helm-umbrella
-      url: ${scmm.repoUrl}argocd/nginx-helm-umbrella<#if config.scmm.provider == "gitlab">.git</#if>
+      url: ${scm.repoUrl}argocd/nginx-helm-umbrella.git
     - name: bitnami
       type: helm
       url: https://raw.githubusercontent.com/bitnami/charts/archive-full-index/bitnami

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

@@ -14,14 +14,14 @@ spec:
     - namespace: '*'
       server: https://kubernetes.default.svc
   sourceRepos:
-  - ${scmm.repoUrl}argocd/cluster-resources<#if config.scmm.provider == "gitlab">.git</#if>
+  - ${scm.repoUrl}argocd/cluster-resources.git
 <#if config.application.mirrorRepos>
-  - ${scmm.baseUrl}<#if config.scmm.provider == "gitlab">/3rd-party-dependencies/kube-prometheus-stack.git<#else>/repo/3rd-party-dependencies/kube-prometheus-stack</#if>
-  - ${scmm.baseUrl}<#if config.scmm.provider == "gitlab">/3rd-party-dependencies/mailhog.git<#else>/repo/3rd-party-dependencies/mailhog</#if>
-  - ${scmm.baseUrl}<#if config.scmm.provider == "gitlab">/3rd-party-dependencies/ingress-nginx.git<#else>/repo/3rd-party-dependencies/ingress-nginx</#if>
-  - ${scmm.baseUrl}<#if config.scmm.provider == "gitlab">/3rd-party-dependencies/external-secrets.git<#else>/repo/3rd-party-dependencies/external-secrets</#if>
-  - ${scmm.baseUrl}<#if config.scmm.provider == "gitlab">/3rd-party-dependencies/vault.git<#else>/repo/3rd-party-dependencies/vault</#if>
-  - ${scmm.baseUrl}<#if config.scmm.provider == "gitlab">/3rd-party-dependencies/cert-manager.git<#else>/repo/3rd-party-dependencies/cert-manager</#if>
+  - ${scm.baseUrl}<#if config.scm.scmProviderType == "GITLAB">/3rd-party-dependencies/kube-prometheus-stack.git<#else>/repo/3rd-party-dependencies/kube-prometheus-stack</#if>
+  - ${scm.baseUrl}<#if config.scm.scmProviderType == "GITLAB">/3rd-party-dependencies/mailhog.git<#else>/repo/3rd-party-dependencies/mailhog</#if>
+  - ${scm.baseUrl}<#if config.scm.scmProviderType == "GITLAB">/3rd-party-dependencies/ingress-nginx.git<#else>/repo/3rd-party-dependencies/ingress-nginx</#if>
+  - ${scm.baseUrl}<#if config.scm.scmProviderType == "GITLAB">/3rd-party-dependencies/external-secrets.git<#else>/repo/3rd-party-dependencies/external-secrets</#if>
+  - ${scm.baseUrl}<#if config.scm.scmProviderType == "GITLAB">/3rd-party-dependencies/vault.git<#else>/repo/3rd-party-dependencies/vault</#if>
+  - ${scm.baseUrl}<#if config.scm.scmProviderType == "GITLAB">/3rd-party-dependencies/cert-manager.git<#else>/repo/3rd-party-dependencies/cert-manager</#if>
 <#else>
   - https://prometheus-community.github.io/helm-charts
   - https://codecentric.github.io/helm-charts

argocd/argocd/projects/example-apps.ftl.yaml

@@ -15,8 +15,8 @@ spec:
   - namespace: ${config.application.namePrefix}example-apps-staging
     server: https://kubernetes.default.svc
   sourceRepos:
-  - ${scmm.repoUrl}argocd/example-apps<#if config.scmm.provider == "gitlab">.git</#if>
-  - ${scmm.repoUrl}argocd/nginx-helm-umbrella<#if config.scmm.provider == "gitlab">.git</#if>
+  - ${scm.repoUrl}argocd/example-apps.git
+  - ${scm.repoUrl}argocd/nginx-helm-umbrella.git
 
 
   # allow to only see application resources from the specified namespace

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

@@ -13,9 +13,9 @@ spec:
   source:
     path: misc/
 <#if config.multiTenant.useDedicatedInstance>
-    repoURL: ${scmm.centralScmmUrl}/repo/${config.application.namePrefix}argocd/cluster-resources
+    repoURL: ${scm.centralScmUrl}argocd/cluster-resources.git
 <#else>
-    repoURL: ${scmm.repoUrl}argocd/cluster-resources<#if config.scmm.provider == "gitlab">.git</#if>
+    repoURL: ${scm.repoUrl}argocd/cluster-resources.git
 </#if>
     targetRevision: main
     directory: