You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by im...@apache.org on 2015/10/14 14:11:25 UTC
stratos git commit: Making load balancer ips distinct for kubernetes
nodes
Repository: stratos
Updated Branches:
refs/heads/stratos-4.1.x 4df694d08 -> 848067c44
Making load balancer ips distinct for kubernetes nodes
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/848067c4
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/848067c4
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/848067c4
Branch: refs/heads/stratos-4.1.x
Commit: 848067c44ea88f1f19f1e23ef32fc55753e33521
Parents: 4df694d
Author: Imesh Gunaratne <im...@apache.org>
Authored: Wed Oct 14 17:41:14 2015 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Wed Oct 14 17:41:14 2015 +0530
----------------------------------------------------------------------
.../cloud/controller/messaging/topology/TopologyBuilder.java | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/848067c4/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/messaging/topology/TopologyBuilder.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/messaging/topology/TopologyBuilder.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/messaging/topology/TopologyBuilder.java
index aa06ba9..30a0167 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/messaging/topology/TopologyBuilder.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/messaging/topology/TopologyBuilder.java
@@ -866,7 +866,7 @@ public class TopologyBuilder {
if ((kubernetesServices != null) && (kubernetesServices.size() > 0)) {
try {
// Generate access URLs for kubernetes services
- List<String> nodePublicIps = new ArrayList<>();
+ Set<String> nodePublicIps = new HashSet<>();
for (KubernetesService kubernetesService : kubernetesServices) {
// Add node ips as load balancer ips
nodePublicIps.addAll(Arrays.asList(kubernetesService.getPublicIPs()));
@@ -891,7 +891,9 @@ public class TopologyBuilder {
}
if(cluster.getLoadBalancerIps().size() == 0) {
// Load balancer ips not given, use node public ips as load balancer ips
- clusterInstanceActivatedEvent.setLoadBalancerIps(nodePublicIps);
+ List<String> nodePublicIpsList = new ArrayList<>();
+ nodePublicIpsList.addAll(nodePublicIps);
+ clusterInstanceActivatedEvent.setLoadBalancerIps(nodePublicIpsList);
}
log.info(String.format("Access URLs generated for kubernetes services: [application] %s " +
"[cluster] %s [access-urls] %s",