Merge pull request #274 from xenit-eu/ACC-1547

Only enable contentgrid configuration discovery in kubernetes when in runtime-platform mode
xenit-eu · Aug 22, 2024 · d6f1200 · d6f1200
2 parents 682aee2 + 8920946
commit d6f1200
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/build.gradle b/build.gradle
@@ -69,9 +69,12 @@ dependencies {
 	implementation 'com.contentgrid.thunx:thunx-gateway-spring-boot-starter'
 	implementation 'com.contentgrid.thunx:thunx-encoding-json'
 
-	implementation platform('com.contentgrid.configuration:contentgrid-configuration-bom:0.1.1')
+	implementation platform('com.contentgrid.configuration:contentgrid-configuration-bom:0.1.2')
 	implementation 'com.contentgrid.configuration:contentgrid-configuration-contentgrid-apps'
-	runtimeOnly 'com.contentgrid.configuration:contentgrid-configuration-kubernetes-fabric8'
+	runtimeOnly('com.contentgrid.configuration:contentgrid-configuration-kubernetes-fabric8') {
+		// We need an older kubernetes client than provided by contentgrid configuration to be compatible with Spring Boot
+		exclude group: 'io.fabric8'
+	}
 	runtimeOnly 'com.contentgrid.configuration:contentgrid-configuration-properties-spring'
 	runtimeOnly 'com.contentgrid.configuration:contentgrid-configuration-autoconfigure'
 
@@ -109,7 +112,7 @@ dependencies {
 	testFixturesApi 'org.springframework:spring-webflux'
 	testFixturesApi 'org.springframework.security:spring-security-crypto'
 	testFixturesApi 'org.springframework.cloud:spring-cloud-commons'
-	testFixturesApi platform('com.contentgrid.configuration:contentgrid-configuration-bom:0.1.1')
+	testFixturesApi platform('com.contentgrid.configuration:contentgrid-configuration-bom:0.1.2')
 	testFixturesApi 'com.contentgrid.configuration:contentgrid-configuration-contentgrid-apps'
 
 	testFixturesImplementation platform('org.springframework.cloud:spring-cloud-dependencies:2023.0.3')

diff --git a/src/main/resources/application-runtime.yml b/src/main/resources/application-runtime.yml
@@ -14,6 +14,3 @@ spring:
 servicediscovery:
   namespace: default
   enabled: true
-
-contentgrid.configuration.discovery.kubernetes:
-  namespace: default
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
@@ -26,4 +26,6 @@ contentgrid:
   gateway:
     user-info:
       enabled: false
-      path: /me
+      path: /me
+  configuration.discovery.kubernetes:
+    enabled: "${contentgrid.gateway.runtime-platform.enabled:false}"