Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
nmaas Platform
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Terraform modules
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
nmaas
nmaas Platform
Merge requests
!146
Resolve "[fedUC] K8s clusters management"
Code
Review changes
Check out branch
Download
Patches
Plain diff
Merged
Resolve "[fedUC] K8s clusters management"
270-feduc-k8s-clusters-management
into
develop
Overview
0
Commits
5
Pipelines
1
Changes
17
Merged
Karol Beyrowski
requested to merge
270-feduc-k8s-clusters-management
into
develop
2 months ago
Overview
0
Commits
5
Pipelines
1
Changes
17
Expand
Related to
#270
0
0
Merge request reports
Compare
develop
develop (base)
and
latest version
latest version
a36da0e5
5 commits,
2 months ago
17 files
+
821
−
6
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
Files
17
Search (e.g. *.vue) (Ctrl+P)
src/integrationTest/java/net/geant/nmaas/externalservices/kubernetes/KubernetesClusterControllerIntTest.java
+
2
−
2
Options
@@ -22,7 +22,7 @@ public class KubernetesClusterControllerIntTest {
private
static
final
String
KUBERNETES_CLUSTER_JSON
=
"{"
+
"\"ingress\":{"
+
"\"ingress\":{
\"id\":null
"
+
"\"controllerConfigOption\":\"USE_EXISTING\","
+
"\"supportedIngressClass\":\"ingress-class\","
+
"\"publicIngressClass\":\"public\","
+
@@ -36,7 +36,7 @@ public class KubernetesClusterControllerIntTest {
"\"issuerOrWildcardName\":\"test-issuer\","
+
"\"ingressPerDomain\":true"
+
"},"
+
"\"deployment\":{"
+
"\"deployment\":{
\"id\":null
"
+
"\"namespaceConfigOption\":\"USE_DOMAIN_NAMESPACE\","
+
"\"defaultNamespace\":\"test-namespace\","
+
"\"defaultStorageClass\":\"storageClass\","
+
Loading