Skip to content

Commit 18f3982

Browse files
authored
fix: avoid namespace creation for active external components (#296)
1 parent 0533996 commit 18f3982

File tree

3 files changed

+15
-6
lines changed

3 files changed

+15
-6
lines changed

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,7 @@ class Jenkins extends Feature {
2727

2828
static final String HELM_VALUES_PATH = "jenkins/values.ftl.yaml"
2929

30-
String namespace = "${config.application.namePrefix}jenkins"
31-
30+
String namespace
3231
private Config config
3332
private CommandExecutor commandExecutor
3433
private FileSystemUtils fileSystemUtils
@@ -62,6 +61,10 @@ class Jenkins extends Feature {
6261
this.deployer = deployer
6362
this.k8sClient = k8sClient
6463
this.networkingUtils = networkingUtils
64+
65+
if(config.jenkins.internal) {
66+
this.namespace = "${config.application.namePrefix}jenkins"
67+
}
6568
}
6669

6770
@Override

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,7 @@ class Registry extends Feature {
2323
*/
2424
public static final String CONTAINER_PORT = '5000'
2525

26-
String namespace = "${config.application.namePrefix}registry"
27-
26+
String namespace
2827
private Config config
2928
private DeploymentStrategy deployer
3029
private FileSystemUtils fileSystemUtils
@@ -42,6 +41,10 @@ class Registry extends Feature {
4241
this.config = config
4342
this.fileSystemUtils = fileSystemUtils
4443
this.k8sClient = k8sClient
44+
45+
if(config.registry.internal) {
46+
this.namespace = "${config.application.namePrefix}registry"
47+
}
4548
}
4649

4750
@Override

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,7 @@ class ScmManager extends Feature {
2222

2323
static final String HELM_VALUES_PATH = "scm-manager/values.ftl.yaml"
2424

25-
String namespace = "${config.application.namePrefix}scm-manager"
26-
25+
String namespace
2726
private Config config
2827
private CommandExecutor commandExecutor
2928
private FileSystemUtils fileSystemUtils
@@ -51,6 +50,10 @@ class ScmManager extends Feature {
5150
this.k8sClient = k8sClient
5251
this.networkingUtils = networkingUtils
5352
this.centralSCMUrl = config.multiTenant.centralScmUrl
53+
54+
if(config.scmm.internal) {
55+
this.namespace = "${config.application.namePrefix}scm-manager"
56+
}
5457
}
5558

5659
@Override

0 commit comments

Comments
 (0)