From 892094613eb95b8321e115dcc269a6f03ce442d9 Mon Sep 17 00:00:00 2001 From: Lars Vierbergen Date: Wed, 21 Aug 2024 11:39:25 +0200 Subject: [PATCH] Only enable contentgrid configuration discovery in kubernetes when in runtime-platform mode When running for the management platform, we don't want to have kubernetes configuration discovery active, as the gateway would not have permissions to connect to the kubernetes api anyways --- build.gradle | 9 ++++++--- src/main/resources/application-runtime.yml | 3 --- src/main/resources/application.yml | 4 +++- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/build.gradle b/build.gradle index 90b20d4f..b1576a97 100644 --- 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 index 5bd15cb9..203c14f3 100644 --- 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 \ No newline at end of file diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index dd2234fe..41fcc466 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -26,4 +26,6 @@ contentgrid: gateway: user-info: enabled: false - path: /me \ No newline at end of file + path: /me + configuration.discovery.kubernetes: + enabled: "${contentgrid.gateway.runtime-platform.enabled:false}"