fix stop deployment bug

xchao263 · Jun 23, 2017 · e102f64 · e102f64
1 parent b99c457
commit e102f64
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/src/main/java/org/domeos/framework/engine/k8s/K8sDriver.java b/src/main/java/org/domeos/framework/engine/k8s/K8sDriver.java
@@ -222,9 +222,14 @@ public void stopDeploy(Deployment deployment, User user)
         //loadBalancer
         try {
             if (deployment.getNetworkMode() != NetworkMode.HOST  && deployment.getUsedLoadBalancer() == 0) {
-                LoadBalancer lb = loadBalancerBiz.getInnerLoadBalancerByDeployId(deployment.getId());
-                if (lb != null) {
-                    kubeUtils.deleteService(GlobalConstant.RC_NAME_PREFIX + deployment.getName());
+                List<LoadBalancer> lbs = loadBalancerBiz.getInnerAndExternalLoadBalancerByDeployId(deployment.getId());
+                if (lbs != null) {
+                    for (LoadBalancer lb  : lbs) {
+                        if (lb.getName().equals(deployment.getName())) {
+                            kubeUtils.deleteService(GlobalConstant.RC_NAME_PREFIX + deployment.getName());
+                            break;
+                        }
+                    }
                 }
             }
             deployResourceHandler.delete();