chore(kubernetes): upgrade k8s client to 5.0.0 version (#3784)

spinnaker · Jun 19, 2019 · 6364762 · 6364762
1 parent 98beae0
commit 6364762
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/clouddriver-kubernetes/clouddriver-kubernetes.gradle b/clouddriver-kubernetes/clouddriver-kubernetes.gradle
@@ -18,7 +18,7 @@ dependencies {
   implementation "com.netflix.spinnaker.kork:kork-artifacts"
   implementation "com.netflix.spinnaker.moniker:moniker"
   implementation "io.fabric8:kubernetes-client:4.1.1"
-  implementation "io.kubernetes:client-java:1.0.0-beta1"
+  implementation "io.kubernetes:client-java:5.0.0"
   implementation "org.springframework.boot:spring-boot-actuator"
   implementation "org.springframework.boot:spring-boot-starter-web"
   implementation 'com.jayway.jsonpath:json-path:2.3.0'

diff --git a/...lix/spinnaker/clouddriver/kubernetes/v2/caching/view/model/KubernetesV2SecurityGroup.java b/...lix/spinnaker/clouddriver/kubernetes/v2/caching/view/model/KubernetesV2SecurityGroup.java
@@ -124,7 +124,7 @@ private static Set<Rule> outboundRules(V1NetworkPolicy policy) {
   }
 
   private static Rule fromPolicyPort(V1NetworkPolicyPort policyPort) {
-    String port = policyPort.getPort();
+    String port = policyPort.getPort().getStrValue();
     return new PortRule()
         .setProtocol(policyPort.getProtocol())
         .setPortRanges(new TreeSet<>(Collections.singletonList(new StringPortRange(port))));

diff --git a/...louddriver/kubernetes/v2/security/KubernetesNamedAccountCredentialsInitializerSpec.groovy b/...louddriver/kubernetes/v2/security/KubernetesNamedAccountCredentialsInitializerSpec.groovy
@@ -115,6 +115,10 @@ contexts:
     cluster: test
     user: test
 current-context: default
+clusters:
+- name: test
+  cluster:
+    server: "https://foo:6443"
 """,
         namespaces: ["default"],
         dockerRegistries: [new LinkedDockerRegistryConfiguration(accountName: "docker-account")]