Skip to content

Commit 070aae4

Browse files
nihussmannThomasMichael1811
authored andcommitted
removing namePrefix from subdomain
1 parent 8a138b6 commit 070aae4

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

src/main/groovy/com/cloudogu/gitops/config/ApplicationConfigurator.groovy

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ class ApplicationConfigurator {
139139

140140
// We probably could get rid of some of the complexity by refactoring url, host and ingress into a single var
141141
if (newConfig.application.baseUrl) {
142-
newConfig.scmm.ingress = new URL(injectSubdomain("${newConfig.application.namePrefix}scmm",
142+
newConfig.scmm.ingress = new URL(injectSubdomain("scmm",
143143
newConfig.application.baseUrl as String, newConfig.application.urlSeparatorHyphen as Boolean)).host
144144
}
145145
// When specific user/pw are not set, set them to global values
@@ -174,7 +174,7 @@ class ApplicationConfigurator {
174174
}
175175

176176
if (newConfig.application.baseUrl) {
177-
newConfig.jenkins.ingress = new URL(injectSubdomain("${newConfig.application.namePrefix}jenkins",
177+
newConfig.jenkins.ingress = new URL(injectSubdomain("jenkins",
178178
newConfig.application.baseUrl, newConfig.application.urlSeparatorHyphen)).host
179179
}
180180
// When specific user/pw are not set, set them to global values
@@ -199,7 +199,7 @@ class ApplicationConfigurator {
199199
boolean urlSeparatorHyphen = newConfig.application.urlSeparatorHyphen
200200

201201
if (argocd.active && !argocd.url) {
202-
argocd.url = injectSubdomain("${newConfig.application.namePrefix}argocd", baseUrl, urlSeparatorHyphen)
202+
argocd.url = injectSubdomain("argocd", baseUrl, urlSeparatorHyphen)
203203
log.debug("Setting ArgoCD URL ${argocd.url}")
204204
}
205205
if (mail.mailhog && !mail.mailhogUrl) {

0 commit comments

Comments
 (0)