File tree 3 files changed +8
-7
lines changed
argocd/cluster-resources/misc/monitoring
src/main/groovy/com/cloudogu/gitops/features 3 files changed +8
-7
lines changed Original file line number Diff line number Diff line change @@ -5,7 +5,6 @@ metadata:
5
5
namespace : ${namePrefix}monitoring
6
6
labels :
7
7
grafana_dashboard : " 1"
8
- <#noparse>
9
8
data :
10
9
scmm-dashboard.json : |-
11
10
{
@@ -3357,8 +3356,8 @@ data:
3357
3356
"allFormat": "glob",
3358
3357
"current": {
3359
3358
"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"
3362
3361
},
3363
3362
"datasource": {
3364
3363
"type": "prometheus",
Original file line number Diff line number Diff line change @@ -5,6 +5,7 @@ persistence:
5
5
livenessProbe :
6
6
initialDelaySeconds : 120
7
7
8
+ fullnameOverride : ${releaseName}
8
9
9
10
extraEnv : |
10
11
- name: SCM_WEBAPP_INITIALUSER
@@ -23,5 +24,4 @@ ingress:
23
24
path : /
24
25
hosts :
25
26
- ${host}
26
- </#if>
27
-
27
+ </#if>
Original file line number Diff line number Diff line change @@ -65,6 +65,8 @@ class ScmManager extends Feature {
65
65
66
66
if (config. scmm. internal) {
67
67
68
+ String releaseName = ' scmm'
69
+
68
70
k8sClient. createNamespace(namespace)
69
71
70
72
def helmConfig = config. scmm. helm
@@ -74,13 +76,13 @@ class ScmManager extends Feature {
74
76
remote : config. application. remote,
75
77
username : config. scmm. username,
76
78
password : config. scmm. password,
77
- helm : config. scmm. helm
79
+ helm : config. scmm. helm,
80
+ releaseName : releaseName
78
81
])
79
82
80
83
def mergedMap = MapUtils . deepMerge(helmConfig. values, templatedMap)
81
84
def tempValuesPath = fileSystemUtils. writeTempFile(mergedMap)
82
85
83
- String releaseName = ' scmm'
84
86
deployer. deployFeature(
85
87
helmConfig. repoURL,
86
88
' scm-manager' ,
You can’t perform that action at this time.
0 commit comments