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/19 20:42:28 UTC
stratos git commit: STRATOS-1499 - Replacing cluster_id with md5 hash
value
Repository: stratos
Updated Branches:
refs/heads/master acdafd103 -> 94446b5bf
STRATOS-1499 - Replacing cluster_id with md5 hash value
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/94446b5b
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/94446b5b
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/94446b5b
Branch: refs/heads/master
Commit: 94446b5bfcc26f8a4fe4c042bd0a29ba3c3a7273
Parents: acdafd1
Author: lasinducharith <la...@gmail.com>
Authored: Thu Aug 20 00:11:48 2015 +0530
Committer: lasinducharith <la...@gmail.com>
Committed: Thu Aug 20 00:11:48 2015 +0530
----------------------------------------------------------------------
.../controller/iaases/kubernetes/KubernetesIaas.java | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/94446b5b/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..fa1a9b3 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
@@ -23,6 +23,7 @@ import io.fabric8.kubernetes.api.model.ContainerPort;
import io.fabric8.kubernetes.api.model.EnvVar;
import io.fabric8.kubernetes.api.model.Pod;
import io.fabric8.kubernetes.api.model.Service;
+import org.apache.commons.codec.digest.DigestUtils;
import org.apache.commons.lang.NotImplementedException;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
@@ -407,7 +408,7 @@ public class KubernetesIaas extends Iaas {
// Create pod
long podSeqNo = kubernetesClusterContext.getPodSeqNo().incrementAndGet();
String podId = "pod" + "-" + podSeqNo;
- String podLabel = KubernetesIaasUtil.fixSpecialCharacters(clusterId);
+ String podLabel = DigestUtils.md5Hex(clusterId);
String dockerImage = iaasProvider.getImage();
List<EnvVar> environmentVariables = KubernetesIaasUtil.prepareEnvironmentVariables(
clusterContext, memberContext);
@@ -422,9 +423,9 @@ public class KubernetesIaas extends Iaas {
kubernetesApi.createPod(podId, podLabel, dockerImage, cpu, memory, ports, environmentVariables);
log.info(String.format("Pod started successfully: [application] %s [cartridge] %s [member] %s " +
- "[pod] %s [cpu] %d [memory] %d MB",
+ "[pod] %s [pod-label] %s [cpu] %d [memory] %d MB",
memberContext.getApplicationId(), memberContext.getCartridgeType(),
- memberContext.getMemberId(), podId, cpu, memory));
+ memberContext.getMemberId(), podId, podLabel, cpu, memory));
// Add pod id to member context
memberContext.setKubernetesPodId(podId);
@@ -510,12 +511,12 @@ 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);
+ String serviceLabel = DigestUtils.md5Hex(clusterId);
if (log.isInfoEnabled()) {
- log.info(String.format("Creating kubernetes service: [cluster] %s [service] %s " +
+ log.info(String.format("Creating kubernetes service: [cluster] %s [service] %s [service-label] %s " +
"[protocol] %s [service-port] %d [container-port] %s", clusterId,
- serviceId, clusterPortMapping.getProtocol(),
+ serviceId, serviceLabel, clusterPortMapping.getProtocol(),
clusterPortMapping.getKubernetesServicePort(), containerPort));
}