Repository: stratos Updated Branches: refs/heads/master 881ec0c9b -> 5515a5c58
STRATOS-1499 - setting auto increment cluster-id as kubernetes serviceLabel Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/5515a5c5 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/5515a5c5 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/5515a5c5 Branch: refs/heads/master Commit: 5515a5c586c20fa5c73ec9cf7a198622434bf6bd Parents: 881ec0c Author: lasinducharith <[email protected]> Authored: Mon Aug 17 08:27:14 2015 +0530 Committer: lasinducharith <[email protected]> Committed: Mon Aug 17 08:27:14 2015 +0530 ---------------------------------------------------------------------- .../controller/domain/kubernetes/KubernetesClusterContext.java | 6 ++++++ .../cloud/controller/iaases/kubernetes/KubernetesIaas.java | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/5515a5c5/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/kubernetes/KubernetesClusterContext.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/kubernetes/KubernetesClusterContext.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/kubernetes/KubernetesClusterContext.java index 38c49a0..8e1bdd9 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/kubernetes/KubernetesClusterContext.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/kubernetes/KubernetesClusterContext.java @@ -48,6 +48,7 @@ public class KubernetesClusterContext implements Serializable { private transient KubernetesApiClient kubApi; private AtomicLong serviceSeqNo; private AtomicLong podSeqNo; + private AtomicLong clusterSeqNo; public KubernetesClusterContext(String id, String masterIp, String masterPort, int lowerPort, int upperPort) { servicePorts = new ArrayList<Integer>(); @@ -61,6 +62,7 @@ public class KubernetesClusterContext implements Serializable { this.setKubApi(new KubernetesApiClient(getEndpoint(masterIp, masterPort))); this.serviceSeqNo = new AtomicLong(); this.podSeqNo = new AtomicLong(); + this.clusterSeqNo = new AtomicLong(); } @@ -147,6 +149,10 @@ public class KubernetesClusterContext implements Serializable { return podSeqNo; } + public AtomicLong getClusterSeqNo(){ + return clusterSeqNo; + } + @Override public int hashCode() { final int prime = 31; http://git-wip-us.apache.org/repos/asf/stratos/blob/5515a5c5/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 22f3c9b..fe1d49f 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 @@ -510,7 +510,8 @@ public class KubernetesIaas extends Iaas { // Find next service sequence no long serviceSeqNo = kubernetesClusterContext.getServiceSeqNo().incrementAndGet(); String serviceId = KubernetesIaasUtil.fixSpecialCharacters("service" + "-" + (serviceSeqNo)); - String serviceLabel = KubernetesIaasUtil.fixSpecialCharacters(clusterId); + long clusterSeqNo = kubernetesClusterContext.getClusterSeqNo().incrementAndGet(); + String serviceLabel = KubernetesIaasUtil.fixSpecialCharacters("cluster" + "-" + (clusterSeqNo)); if (log.isInfoEnabled()) { log.info(String.format("Creating kubernetes service: [cluster] %s [service] %s " +
