Skip to content

Commit 34c8b88

Browse files
nihussmannThomas Michaelavetgit
authored
Git abstraction (#310)
adding git abstraction for gitlab and scm manager. --------- Co-authored-by: Thomas Michael <thomas.michael@cloudogu.com> Co-authored-by: Anna Vetcininova <anna.vetcininova@cloudogu.com>
1 parent da9a9ba commit 34c8b88

File tree

145 files changed

+4647
-3798
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

145 files changed

+4647
-3798
lines changed

README.md

Lines changed: 117 additions & 54 deletions
Large diffs are not rendered by default.

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -341,14 +341,16 @@ prometheus:
341341
- prometheus-metrics-creds-scmm
342342
- prometheus-metrics-creds-jenkins
343343
additionalScrapeConfigs:
344+
<#if config.scm.scmProviderType?lower_case == "scm_manager">
344345
- job_name: 'scm-manager'
345346
static_configs:
346-
- targets: [ '${scmm.host}' ]
347-
scheme: ${scmm.protocol}
348-
metrics_path: '${scmm.path}'
347+
- targets: [ '${scm.host}' ]
348+
scheme: ${scm.protocol}
349+
metrics_path: '${scm.path}'
349350
basic_auth:
350351
username: '${config.application.namePrefix}metrics'
351352
password_file: '/etc/prometheus/secrets/prometheus-metrics-creds-scmm/password'
353+
</#if>
352354
- job_name: 'jenkins'
353355
static_configs:
354356
- targets: [ '${jenkins.host}' ]

argocd/argocd/applications/argocd.ftl.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ spec:
1919
project: argocd
2020
source:
2121
path: ${config.features.argocd.operator?string("operator/", "argocd/")}
22-
repoURL: ${scmm.repoUrl}argocd/argocd<#if config.scmm.provider == "gitlab">.git</#if>
22+
repoURL: ${scm.repoUrl}argocd/argocd.git
2323
targetRevision: main
2424
# needed to sync the operator/rbac folder
2525
<#if config.features.argocd.operator>

argocd/argocd/applications/bootstrap.ftl.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ spec:
1414
project: argocd
1515
source:
1616
path: applications/
17-
repoURL: ${scmm.repoUrl}argocd/argocd<#if config.scmm.provider == "gitlab">.git</#if>
17+
repoURL: ${scm.repoUrl}argocd/argocd.git
1818
targetRevision: main
1919
directory:
2020
recurse: true

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ spec:
1313
project: argocd
1414
source:
1515
path: argocd/
16-
repoURL: ${scmm.repoUrl}argocd/cluster-resources<#if config.scmm.provider == "gitlab">.git</#if>
16+
repoURL: ${scm.repoUrl}argocd/cluster-resources.git
1717
targetRevision: main
1818
directory:
1919
recurse: true

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

Lines changed: 0 additions & 23 deletions
This file was deleted.

argocd/argocd/applications/projects.ftl.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ spec:
1313
project: argocd
1414
source:
1515
path: projects/
16-
repoURL: ${scmm.repoUrl}argocd/argocd<#if config.scmm.provider == "gitlab">.git</#if>
16+
repoURL: ${scm.repoUrl}argocd/argocd.git
1717
targetRevision: main
1818
directory:
1919
recurse: true

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ spec:
1919
project: ${tenantName}
2020
source:
2121
path: ${config.features.argocd.operator?string("operator/", "argocd/")}
22-
repoURL: ${scmm.centralScmmUrl}/repo/${config.application.namePrefix}argocd/argocd
22+
repoURL: ${scm.centralScmUrl}argocd/argocd.git
2323
targetRevision: main
2424
# needed to sync the operator/rbac folder
2525
<#if config.features.argocd.operator??>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ spec:
1414
project: ${tenantName}
1515
source:
1616
path: multiTenant/central/applications/
17-
repoURL: ${scmm.centralScmmUrl}/repo/${config.application.namePrefix}argocd/argocd
17+
repoURL: ${scm.centralScmUrl}argocd/argocd.git
1818
targetRevision: main
1919
directory:
2020
recurse: true

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ spec:
1313
project: ${tenantName}
1414
source:
1515
path: argocd/
16-
repoURL: ${scmm.centralScmmUrl}/repo/${config.application.namePrefix}argocd/cluster-resources
16+
repoURL: ${scm.centralScmUrl}argocd/cluster-resources.git
1717
targetRevision: main
1818
directory:
1919
recurse: true

0 commit comments

Comments
 (0)