Skip to content

Commit

Permalink
chore(kubernetes): stop specifying the version of io.kubernetes:clien…
Browse files Browse the repository at this point in the history
…t-java (#5797)

since spring 2.4.13 brings it in (transitively).  The version from spring boot takes
precedence, so the value we specify here is ignored.

Another approach would be to make the version here match what spring boot brings in
(currently 11.0.3), but then future changes could again invalidate what's here.  If some
future version of spring boot stops bringing in io.kubernetes:client-java, builds will
fail with unspecified version, at which point we can restore kubernetesClientVersion.

Snippets of ./gradlew clouddriver-web:dependencies

before:

+--- project :clouddriver-kubernetes
|    +--- io.kubernetes:client-java:11.0.1 -> 11.0.3

after:

+--- project :clouddriver-kubernetes
|    +--- io.kubernetes:client-java -> 11.0.3
  • Loading branch information
dbyron-sf committed Oct 13, 2022
1 parent 25bed1f commit 419d7fd
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 4 deletions.
2 changes: 1 addition & 1 deletion clouddriver-kubernetes/clouddriver-kubernetes.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ dependencies {
implementation "io.spinnaker.kork:kork-moniker"
implementation "io.spinnaker.kork:kork-secrets"
implementation "io.spinnaker.kork:kork-security"
implementation "io.kubernetes:client-java:$kubernetesClientVersion"
implementation "io.kubernetes:client-java"
implementation "org.apache.commons:commons-lang3"
implementation "org.springframework.boot:spring-boot-actuator"
implementation "org.springframework.boot:spring-boot-starter-web"
Expand Down
2 changes: 1 addition & 1 deletion clouddriver-web/clouddriver-web.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ dependencies {
testImplementation "io.spinnaker.kork:kork-test"
testImplementation "org.springframework.boot:spring-boot-starter-test"
testImplementation "org.spockframework:spock-core"
testImplementation "io.kubernetes:client-java:$kubernetesClientVersion"
testImplementation "io.kubernetes:client-java"

// Add each included cloud provider project as a runtime dependency
gradle.includedCloudProviderProjects.each {
Expand Down
2 changes: 0 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@ spinnakerGradleVersion=8.23.0
targetJava11=true
kotlinVersion=1.4.10

kubernetesClientVersion=11.0.1

# To enable a composite reference to a project, set the
# project property `'<projectName>Composite=true'`.
#
Expand Down

0 comments on commit 419d7fd

Please sign in to comment.