Skip to content

Commit eff43af

Browse files
committed
Rename scmm-scm-manager to scmm for simplicity
The previous name included redundant information. Since "scmm" already implies "SCM Manager", the extra specificity was unnecessary. This change simplifies naming while preserving clarity.
1 parent 0336d32 commit eff43af

File tree

3 files changed

+8
-7
lines changed

3 files changed

+8
-7
lines changed

argocd/cluster-resources/misc/monitoring/scmm-dashboard.ftl.yaml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ metadata:
55
namespace: ${namePrefix}monitoring
66
labels:
77
grafana_dashboard: "1"
8-
<#noparse>
98
data:
109
scmm-dashboard.json: |-
1110
{
@@ -3357,8 +3356,8 @@ data:
33573356
"allFormat": "glob",
33583357
"current": {
33593358
"selected": false,
3360-
"text": "scmm.default.svc.cluster.local:80",
3361-
"value": "scmm.default.svc.cluster.local:80"
3359+
"text": "scmm-scm-manager.default.svc.cluster.local:80",
3360+
"value": "scmm-scm-manager.default.svc.cluster.local:80"
33623361
},
33633362
"datasource": {
33643363
"type": "prometheus",

scm-manager/values.ftl.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ persistence:
55
livenessProbe:
66
initialDelaySeconds: 120
77

8+
fullnameOverride : ${releaseName}
89

910
extraEnv: |
1011
- name: SCM_WEBAPP_INITIALUSER
@@ -23,5 +24,4 @@ ingress:
2324
path: /
2425
hosts:
2526
- ${host}
26-
</#if>
27-
27+
</#if>

src/main/groovy/com/cloudogu/gitops/features/ScmManager.groovy

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,8 @@ class ScmManager extends Feature {
6565

6666
if (config.scmm.internal) {
6767

68+
String releaseName = 'scmm'
69+
6870
k8sClient.createNamespace(namespace)
6971

7072
def helmConfig = config.scmm.helm
@@ -74,13 +76,13 @@ class ScmManager extends Feature {
7476
remote : config.application.remote,
7577
username: config.scmm.username,
7678
password: config.scmm.password,
77-
helm : config.scmm.helm
79+
helm : config.scmm.helm,
80+
releaseName: releaseName
7881
])
7982

8083
def mergedMap = MapUtils.deepMerge(helmConfig.values, templatedMap)
8184
def tempValuesPath = fileSystemUtils.writeTempFile(mergedMap)
8285

83-
String releaseName = 'scmm'
8486
deployer.deployFeature(
8587
helmConfig.repoURL,
8688
'scm-manager',

0 commit comments

Comments
 (0)