From 6364762005fef6000000fa33b735321b91c1990f Mon Sep 17 00:00:00 2001
From: Min Kim <291271447@qq.com>
Date: Thu, 20 Jun 2019 06:46:01 +0800
Subject: [PATCH] chore(kubernetes): upgrade k8s client to 5.0.0 version
 (#3784)

---
 clouddriver-kubernetes/clouddriver-kubernetes.gradle          | 2 +-
 .../v2/caching/view/model/KubernetesV2SecurityGroup.java      | 2 +-
 .../KubernetesNamedAccountCredentialsInitializerSpec.groovy   | 4 ++++
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/clouddriver-kubernetes/clouddriver-kubernetes.gradle b/clouddriver-kubernetes/clouddriver-kubernetes.gradle
index 59ce7801f3d..27739ce5be4 100644
--- 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/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/view/model/KubernetesV2SecurityGroup.java b/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/view/model/KubernetesV2SecurityGroup.java
index 5039d199706..e366b6919ec 100644
--- a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/view/model/KubernetesV2SecurityGroup.java
+++ b/clouddriver-kubernetes/src/main/groovy/com/netflix/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/clouddriver-kubernetes/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/security/KubernetesNamedAccountCredentialsInitializerSpec.groovy b/clouddriver-kubernetes/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/security/KubernetesNamedAccountCredentialsInitializerSpec.groovy
index 23abeb12770..55e8775bc56 100644
--- a/clouddriver-kubernetes/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/security/KubernetesNamedAccountCredentialsInitializerSpec.groovy
+++ b/clouddriver-kubernetes/src/test/groovy/com/netflix/spinnaker/clouddriver/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")]