Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Only enable contentgrid configuration discovery in kubernetes when in runtime-platform mode #274

Merged
merged 1 commit into from
Aug 22, 2024
Merged

Only enable contentgrid configuration discovery in kubernetes when in runtime-platform mode #274

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 6 additions & 3 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'

Expand Down Expand Up @@ -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')
Expand Down
3 changes: 0 additions & 3 deletions src/main/resources/application-runtime.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,3 @@ spring:
servicediscovery:
namespace: default
enabled: true

contentgrid.configuration.discovery.kubernetes:
namespace: default
4 changes: 3 additions & 1 deletion src/main/resources/application.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,6 @@ contentgrid:
gateway:
user-info:
enabled: false
path: /me
path: /me
configuration.discovery.kubernetes:
enabled: "${contentgrid.gateway.runtime-platform.enabled:false}"