Adding kubernetes services to member initialized event
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/0b803a42 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/0b803a42 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/0b803a42 Branch: refs/heads/master Commit: 0b803a42dbc64e2c3491aaaab7c8aae442d664bf Parents: 41b2b9c Author: Pubudu Gunatilaka <[email protected]> Authored: Wed Aug 12 19:40:10 2015 +0530 Committer: Imesh Gunaratne <[email protected]> Committed: Thu Aug 13 17:30:50 2015 +0530 ---------------------------------------------------------------------- .../messaging/topology/TopologyBuilder.java | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/0b803a42/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 a11c5bf..ecd2728 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 @@ -451,6 +451,16 @@ public class TopologyBuilder { MemberStatus.Initialized); return; } else { + + Cluster cluster = service.getCluster(memberContext.getClusterId()); + String clusterId = cluster.getClusterId(); + ClusterContext clusterContext = CloudControllerContext.getInstance().getClusterContext(clusterId); + List<KubernetesService> kubernetesServices = clusterContext.getKubernetesServices(); + + if (kubernetesServices != null) { + cluster.setKubernetesServices(kubernetesServices); + } + member.setStatus(MemberStatus.Initialized); log.info("Member status updated to initialized"); @@ -844,11 +854,9 @@ public class TopologyBuilder { try { TopologyManager.acquireWriteLock(); List<KubernetesService> kubernetesServices = clusterContext.getKubernetesServices(); - cluster.setKubernetesServices(kubernetesServices); if (kubernetesServices != null) { - // Set kubernetes services - cluster.setKubernetesServices(kubernetesServices); + try { // Generate access URLs for kubernetes services for (KubernetesService kubernetesService : kubernetesServices) {
