From d9bedbfb01a729170f937dcfbec29cfd8169e276 Mon Sep 17 00:00:00 2001 From: spinnakerbot Date: Mon, 25 Nov 2019 10:00:01 -0500 Subject: [PATCH] fix(kubernetes): do not throw NPE on NetworkPolicies with null ingress and egress (#4172) (#4173) --- .../v2/caching/view/model/KubernetesV2SecurityGroup.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/view/model/KubernetesV2SecurityGroup.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/view/model/KubernetesV2SecurityGroup.java index 77ae5969e11..eaf5f78c633 100644 --- a/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/view/model/KubernetesV2SecurityGroup.java +++ b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/view/model/KubernetesV2SecurityGroup.java @@ -115,6 +115,9 @@ public static KubernetesV2SecurityGroup fromCacheData(CacheData cd) { } private static Set inboundRules(V1NetworkPolicy policy) { + if (policy.getSpec().getIngress() == null) { + return Collections.emptySet(); + } return policy.getSpec().getIngress().stream() .map(i -> i.getPorts().stream().map(KubernetesV2SecurityGroup::fromPolicyPort)) .flatMap(s -> s) @@ -122,6 +125,9 @@ private static Set inboundRules(V1NetworkPolicy policy) { } private static Set outboundRules(V1NetworkPolicy policy) { + if (policy.getSpec().getEgress() == null) { + return Collections.emptySet(); + } return policy.getSpec().getEgress().stream() .map(i -> i.getPorts().stream().map(KubernetesV2SecurityGroup::fromPolicyPort)) .flatMap(s -> s)