fix(kubernetes): properly set isDisabled on server groups (#4494)

spinnaker · Apr 7, 2020 · 8c0ea6c · 8c0ea6c
1 parent 044ed8a
commit 8c0ea6c
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/...flix/spinnaker/clouddriver/kubernetes/v2/caching/view/model/KubernetesV2LoadBalancer.java b/...flix/spinnaker/clouddriver/kubernetes/v2/caching/view/model/KubernetesV2LoadBalancer.java
@@ -17,6 +17,7 @@
 
 package com.netflix.spinnaker.clouddriver.kubernetes.v2.caching.view.model;
 
+import com.google.common.collect.ImmutableList;
 import com.netflix.spinnaker.cats.cache.CacheData;
 import com.netflix.spinnaker.clouddriver.kubernetes.v2.caching.Keys;
 import com.netflix.spinnaker.clouddriver.kubernetes.v2.caching.agent.KubernetesCacheDataConverter;
@@ -25,7 +26,6 @@
 import com.netflix.spinnaker.clouddriver.model.LoadBalancer;
 import com.netflix.spinnaker.clouddriver.model.LoadBalancerProvider;
 import com.netflix.spinnaker.clouddriver.model.LoadBalancerServerGroup;
-import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
@@ -69,14 +69,13 @@ public static KubernetesV2LoadBalancer fromCacheData(
 
     Set<LoadBalancerServerGroup> serverGroups =
         serverGroupData.stream()
-            // ignoring load balancers here since they are discarded by ::toLoadBalancerServerGroup
             .map(
                 d ->
                     KubernetesV2ServerGroup.fromCacheData(
                         KubernetesV2ServerGroupCacheData.builder()
                             .serverGroupData(d)
                             .instanceData(serverGroupToInstanceData.get(d.getId()))
-                            .loadBalancerData(new ArrayList<>())
+                            .loadBalancerData(ImmutableList.of(cd))
                             .build()))
             .filter(Objects::nonNull)
             .map(KubernetesV2ServerGroup::toLoadBalancerServerGroup)