chore(dependencies): Upgrade io-kubernetes java client to resolve CVEs (

#4155) CVE-2020-8570 CVE-2019-12402 Co-authored-by: j-sandy <jsandy>
spinnaker · Jul 30, 2021 · 6fd16c3 · 6fd16c3
1 parent bcf1186
commit 6fd16c3
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/orca-clouddriver/orca-clouddriver.gradle b/orca-clouddriver/orca-clouddriver.gradle
@@ -33,7 +33,7 @@ dependencies {
   implementation(project(":orca-deploymentmonitor"))
   implementation("io.spinnaker.kork:kork-moniker")
   implementation("com.fasterxml.jackson.dataformat:jackson-dataformat-yaml")
-  implementation("io.kubernetes:client-java:5.0.0")
+  implementation("io.kubernetes:client-java:11.0.2")
   implementation("javax.validation:validation-api")
   implementation("org.jetbrains:annotations")
   implementation("com.fasterxml.jackson.datatype:jackson-datatype-guava")

diff --git a/...ouddriver/src/main/java/com/netflix/spinnaker/orca/clouddriver/DelegatingOortService.java b/...ouddriver/src/main/java/com/netflix/spinnaker/orca/clouddriver/DelegatingOortService.java
@@ -23,7 +23,7 @@
 import com.netflix.spinnaker.orca.clouddriver.model.ManifestCoordinates;
 import java.util.List;
 import java.util.Map;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import retrofit.client.Response;
 
 public class DelegatingOortService extends DelegatingClouddriverService<OortService>

diff --git a/...a/com/netflix/spinnaker/orca/clouddriver/config/KubernetesPreconfiguredJobProperties.java b/...a/com/netflix/spinnaker/orca/clouddriver/config/KubernetesPreconfiguredJobProperties.java
@@ -17,7 +17,7 @@
 package com.netflix.spinnaker.orca.clouddriver.config;
 
 import com.netflix.spinnaker.orca.api.preconfigured.jobs.PreconfiguredJobStageProperties;
-import io.kubernetes.client.models.V1Job;
+import io.kubernetes.client.openapi.models.V1Job;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;

diff --git a/...java/com/netflix/spinnaker/orca/clouddriver/tasks/manifest/ResolveTargetManifestTask.java b/...java/com/netflix/spinnaker/orca/clouddriver/tasks/manifest/ResolveTargetManifestTask.java
@@ -31,7 +31,7 @@
 import java.util.Map;
 import javax.annotation.Nonnull;
 import lombok.Data;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 

diff --git a/...oovy/com/netflix/spinnaker/orca/clouddriver/pipeline/job/PreconfiguredJobStageSpec.groovy b/...oovy/com/netflix/spinnaker/orca/clouddriver/pipeline/job/PreconfiguredJobStageSpec.groovy
@@ -20,9 +20,9 @@ import com.netflix.spinnaker.orca.api.preconfigured.jobs.PreconfiguredJobStagePa
 import com.netflix.spinnaker.orca.clouddriver.service.JobService
 import com.netflix.spinnaker.orca.clouddriver.config.KubernetesPreconfiguredJobProperties
 import com.netflix.spinnaker.orca.clouddriver.tasks.job.DestroyJobTask
-import io.kubernetes.client.models.V1Container
-import io.kubernetes.client.models.V1EnvVar
-import io.kubernetes.client.models.V1Job
+import io.kubernetes.client.openapi.models.V1Container
+import io.kubernetes.client.openapi.models.V1EnvVar
+import io.kubernetes.client.openapi.models.V1Job
 import spock.lang.Specification
 
 import static com.netflix.spinnaker.orca.test.model.ExecutionBuilder.stage