Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions src/main/groovy/com/cloudogu/gitops/features/Jenkins.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -296,4 +296,8 @@ class Jenkins extends Feature {
]
]
}
@Override
String getActiveNamespaceFromFeature() {
return isEnabled() && config?.jenkins?.internal ? getNamespace() : null
}
}
32 changes: 32 additions & 0 deletions src/test/groovy/com/cloudogu/gitops/ApplicationTest.groovy
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package com.cloudogu.gitops

import com.cloudogu.gitops.config.Config
import com.cloudogu.gitops.features.git.config.ScmTenantSchema
import io.micronaut.context.ApplicationContext
import org.junit.jupiter.api.Test

Expand Down Expand Up @@ -103,4 +104,35 @@ class ApplicationTest {
application.setNamespaceListToConfig(config)
// No exception == happy
}
@Test
void 'get active namespaces correctly in Openshift if jenkins and scm are external'() {
config.registry.active = true
config.jenkins.active = true
config.jenkins.internal = false
config.scm.scmManager = new ScmTenantSchema.ScmManagerTenantConfig()
config.scm.scmManager.internal = false
config.features.monitoring.active = true
config.features.argocd.active = true
config.content.examples = true
config.features.ingressNginx.active = true
config.application.namePrefix = 'test1-'
config.application.openshift = true
config.content.namespaces = [
'${config.application.namePrefix}example-apps-staging',
'${config.application.namePrefix}example-apps-production'
]
List<String> namespaceList = new ArrayList<>(Arrays.asList(
"test1-argocd",
"test1-example-apps-staging",
"test1-example-apps-production",
"test1-ingress-nginx",
"test1-monitoring",
"test1-registry",
))
def application = ApplicationContext.run()
.registerSingleton(config)
.getBean(Application)
application.setNamespaceListToConfig(config)
assertThat(config.application.namespaces.getActiveNamespaces()).containsExactlyInAnyOrderElementsOf(namespaceList)
}
}