fix(deploy): Non-public service Load Balancer (#274)

spinnaker · Mar 22, 2017 · ffcfb8f · ffcfb8f
1 parent 0bb9052
commit ffcfb8f
Showing 1 changed file with 13 additions and 3 deletions.
diff --git a/...m/netflix/spinnaker/halyard/deploy/provider/v1/kubernetes/KubernetesOperationFactory.java b/...m/netflix/spinnaker/halyard/deploy/provider/v1/kubernetes/KubernetesOperationFactory.java
@@ -26,16 +26,19 @@
 import com.netflix.spinnaker.clouddriver.kubernetes.deploy.description.servergroup.*;
 import com.netflix.spinnaker.halyard.config.model.v1.node.DeploymentEnvironment.Size;
 import com.netflix.spinnaker.halyard.config.model.v1.node.Provider;
-import com.netflix.spinnaker.halyard.core.tasks.v1.DaemonTaskHandler;
+import com.netflix.spinnaker.halyard.core.error.v1.HalException;
+import com.netflix.spinnaker.halyard.core.problem.v1.Problem;
+import com.netflix.spinnaker.halyard.core.problem.v1.ProblemBuilder;
 import com.netflix.spinnaker.halyard.deploy.provider.v1.OperationFactory;
-import com.netflix.spinnaker.halyard.deploy.provider.v1.SizingTranslation;
 import com.netflix.spinnaker.halyard.deploy.spinnaker.v1.SpinnakerArtifact;
 import com.netflix.spinnaker.halyard.deploy.spinnaker.v1.service.SpinnakerMonitoringDaemonService;
 import com.netflix.spinnaker.halyard.deploy.spinnaker.v1.service.SpinnakerPublicService;
 import com.netflix.spinnaker.halyard.deploy.spinnaker.v1.service.SpinnakerService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
+import java.net.InetAddress;
+import java.net.UnknownHostException;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -76,7 +79,14 @@ private KubernetesLoadBalancerDescription baseLoadBalancerDescription(String acc
     if (service instanceof SpinnakerPublicService) {
       SpinnakerPublicService publicService = (SpinnakerPublicService) service;
       String publicAddress = publicService.getPublicAddress();
-      if (publicAddress != "localhost" && !publicAddress.startsWith("127.")) {
+      InetAddress addr;
+      try {
+        addr = InetAddress.getByName(publicAddress);
+      } catch (UnknownHostException e) {
+        throw new HalException(new ProblemBuilder(Problem.Severity.FATAL, "Failed to parse supplied public address: " + e.getMessage()).build());
+      }
+
+      if (!(addr.isAnyLocalAddress() || addr.isLoopbackAddress())) {
         description.setLoadBalancerIp(publicService.getPublicAddress());
         description.setServiceType("LoadBalancer");
       }