Fix for Issue 3173

Title: inbound/outbound rules only detected in apiVersion=network.k8s.io/v1
spinnaker · May 17, 2019 · 4f838bc · 4f838bc
1 parent c440970
commit 4f838bc
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/...lix/spinnaker/clouddriver/kubernetes/v2/caching/view/model/KubernetesV2SecurityGroup.java b/...lix/spinnaker/clouddriver/kubernetes/v2/caching/view/model/KubernetesV2SecurityGroup.java
@@ -91,7 +91,8 @@ public static KubernetesV2SecurityGroup fromCacheData(CacheData cd) {
     if (manifest.getKind() != KubernetesKind.NETWORK_POLICY) {
       log.warn("Unknown security group kind " + manifest.getKind());
     } else {
-      if (manifest.getApiVersion().equals(NETWORKING_K8S_IO_V1) || (manifest.getApiVersion().equals(NETWORKING_K8S_IO_V1BETA1))) {
+      if (manifest.getApiVersion().equals(NETWORKING_K8S_IO_V1)
+          || (manifest.getApiVersion().equals(NETWORKING_K8S_IO_V1BETA1))) {
         V1NetworkPolicy v1beta1NetworkPolicy =
             KubernetesCacheDataConverter.getResource(manifest, V1NetworkPolicy.class);
         inboundRules = inboundRules(v1beta1NetworkPolicy);

diff --git a/...etflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/KubernetesApiVersion.java b/...etflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/KubernetesApiVersion.java
@@ -34,7 +34,7 @@ public class KubernetesApiVersion {
   public static KubernetesApiVersion NETWORKING_K8S_IO_V1 =
       new KubernetesApiVersion("network.k8s.io/v1");
   public static KubernetesApiVersion NETWORKING_K8S_IO_V1BETA1 =
-	      new KubernetesApiVersion("network.k8s.io/v1beta1");
+      new KubernetesApiVersion("network.k8s.io/v1beta1");
   public static KubernetesApiVersion APPS_V1BETA1 = new KubernetesApiVersion("apps/v1beta1");
   public static KubernetesApiVersion APPS_V1BETA2 = new KubernetesApiVersion("apps/v1beta2");
   public static KubernetesApiVersion BATCH_V1 = new KubernetesApiVersion("batch/v1");