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/08/13 14:00:56 UTC
[1/3] stratos git commit: This closes #431 on GitHub
Repository: stratos
Updated Branches:
refs/heads/master 41b2b9cf2 -> 6ff03c4b9
This closes #431 on GitHub
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/6ff03c4b
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/6ff03c4b
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/6ff03c4b
Branch: refs/heads/master
Commit: 6ff03c4b928f019d82e5e082ab41afd34cca4628
Parents: bf7136a
Author: Imesh Gunaratne <im...@apache.org>
Authored: Thu Aug 13 17:30:50 2015 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Thu Aug 13 17:30:50 2015 +0530
----------------------------------------------------------------------
----------------------------------------------------------------------
[3/3] stratos git commit: Adding kubernetes services to member
initialized event
Posted by im...@apache.org.
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 <pu...@gmail.com>
Authored: Wed Aug 12 19:40:10 2015 +0530
Committer: Imesh Gunaratne <im...@apache.org>
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) {
[2/3] stratos git commit: Adding portName property to kubernetes
service
Posted by im...@apache.org.
Adding portName property to kubernetes service
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/bf7136ab
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/bf7136ab
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/bf7136ab
Branch: refs/heads/master
Commit: bf7136ab23a777e4ee44453d034d26a7483425b4
Parents: 0b803a4
Author: Pubudu Gunatilaka <pu...@gmail.com>
Authored: Thu Aug 13 12:03:08 2015 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Thu Aug 13 17:30:50 2015 +0530
----------------------------------------------------------------------
.../cloud/controller/iaases/kubernetes/KubernetesIaas.java | 1 +
.../stratos/messaging/domain/topology/KubernetesService.java | 8 ++++++++
2 files changed, 9 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/bf7136ab/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/kubernetes/KubernetesIaas.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/kubernetes/KubernetesIaas.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/kubernetes/KubernetesIaas.java
index 149ac42..22f3c9b 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/kubernetes/KubernetesIaas.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/kubernetes/KubernetesIaas.java
@@ -556,6 +556,7 @@ public class KubernetesIaas extends Iaas {
String[] minionPublicIPArray = minionPublicIPList.toArray(new String[minionPublicIPList.size()]);
kubernetesService.setPublicIPs(minionPublicIPArray);
kubernetesService.setProtocol(clusterPortMapping.getProtocol());
+ kubernetesService.setPortName(clusterPortMapping.getName());
String kubernetesServiceType = service.getSpec().getType();
kubernetesService.setServiceType(kubernetesServiceType);
http://git-wip-us.apache.org/repos/asf/stratos/blob/bf7136ab/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/KubernetesService.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/KubernetesService.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/KubernetesService.java
index 9cee9d7..a00809b 100644
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/KubernetesService.java
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/KubernetesService.java
@@ -35,7 +35,15 @@ public class KubernetesService implements Serializable {
private int port;
private int containerPort;
private String serviceType;
+ private String portName;
+ public String getPortName() {
+ return portName;
+ }
+
+ public void setPortName(String portName) {
+ this.portName = portName;
+ }
public String getServiceType() {
return serviceType;
}