You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by la...@apache.org on 2015/08/17 05:20:21 UTC
stratos git commit: Revert "STRATOS-1499 - setting auto increment
cluster-id as kubernetes serviceLabel"
Repository: stratos
Updated Branches:
refs/heads/master 5515a5c58 -> d45bd6e85
Revert "STRATOS-1499 - setting auto increment cluster-id as kubernetes serviceLabel"
This reverts commit 5515a5c586c20fa5c73ec9cf7a198622434bf6bd.
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/d45bd6e8
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/d45bd6e8
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/d45bd6e8
Branch: refs/heads/master
Commit: d45bd6e853e2a7067080c23b5511736c93f76afa
Parents: 5515a5c
Author: lasinducharith <la...@gmail.com>
Authored: Mon Aug 17 08:49:18 2015 +0530
Committer: lasinducharith <la...@gmail.com>
Committed: Mon Aug 17 08:49:18 2015 +0530
----------------------------------------------------------------------
.../controller/domain/kubernetes/KubernetesClusterContext.java | 6 ------
.../cloud/controller/iaases/kubernetes/KubernetesIaas.java | 3 +--
2 files changed, 1 insertion(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/d45bd6e8/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 8e1bdd9..38c49a0 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,7 +48,6 @@ 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>();
@@ -62,7 +61,6 @@ public class KubernetesClusterContext implements Serializable {
this.setKubApi(new KubernetesApiClient(getEndpoint(masterIp, masterPort)));
this.serviceSeqNo = new AtomicLong();
this.podSeqNo = new AtomicLong();
- this.clusterSeqNo = new AtomicLong();
}
@@ -149,10 +147,6 @@ 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/d45bd6e8/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 fe1d49f..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
@@ -510,8 +510,7 @@ public class KubernetesIaas extends Iaas {
// Find next service sequence no
long serviceSeqNo = kubernetesClusterContext.getServiceSeqNo().incrementAndGet();
String serviceId = KubernetesIaasUtil.fixSpecialCharacters("service" + "-" + (serviceSeqNo));
- long clusterSeqNo = kubernetesClusterContext.getClusterSeqNo().incrementAndGet();
- String serviceLabel = KubernetesIaasUtil.fixSpecialCharacters("cluster" + "-" + (clusterSeqNo));
+ String serviceLabel = KubernetesIaasUtil.fixSpecialCharacters(clusterId);
if (log.isInfoEnabled()) {
log.info(String.format("Creating kubernetes service: [cluster] %s [service] %s " +