Revert "Update the pod label to restrict its length" This reverts commit f7cdd9c58aaf97676b1ee5dfc326d032ee94b26b.
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/7bca8e25 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/7bca8e25 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/7bca8e25 Branch: refs/heads/master Commit: 7bca8e2528562cdab93bc26721ecb92e6867b604 Parents: 4fa36dd Author: gayangunarathne <[email protected]> Authored: Mon Nov 2 16:59:53 2015 +0530 Committer: gayangunarathne <[email protected]> Committed: Mon Nov 2 16:59:53 2015 +0530 ---------------------------------------------------------------------- .../cloud/controller/iaases/kubernetes/KubernetesIaas.java | 4 ++-- .../cloud/controller/iaases/kubernetes/KubernetesIaasUtil.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/7bca8e25/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 323bfd9..d07aa66 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 @@ -408,7 +408,7 @@ public class KubernetesIaas extends Iaas { // Create pod long podSeqNo = kubernetesClusterContext.getPodSeqNo().incrementAndGet(); String podId = "pod" + "-" + podSeqNo; - String podLabel = KubernetesIaasUtil.fixSpecialCharactersAndLength(clusterId); + String podLabel = KubernetesIaasUtil.fixSpecialCharacters(clusterId); String dockerImage = iaasProvider.getImage(); List<EnvVar> environmentVariables = KubernetesIaasUtil.prepareEnvironmentVariables( clusterContext, memberContext); @@ -510,7 +510,7 @@ public class KubernetesIaas extends Iaas { // Find next service sequence no long serviceSeqNo = kubernetesClusterContext.getServiceSeqNo().incrementAndGet(); - String serviceId = KubernetesIaasUtil.fixSpecialCharactersAndLength("service" + "-" + (serviceSeqNo)); + String serviceId = KubernetesIaasUtil.fixSpecialCharacters("service" + "-" + (serviceSeqNo)); String serviceLabel = DigestUtils.md5Hex(clusterId); if (log.isInfoEnabled()) { http://git-wip-us.apache.org/repos/asf/stratos/blob/7bca8e25/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/kubernetes/KubernetesIaasUtil.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/kubernetes/KubernetesIaasUtil.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/kubernetes/KubernetesIaasUtil.java index 76b73da..cbf28ae 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/kubernetes/KubernetesIaasUtil.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/kubernetes/KubernetesIaasUtil.java @@ -139,9 +139,9 @@ public class KubernetesIaasUtil { * @param id * @return */ - public static String fixSpecialCharactersAndLength(String id) { + public static String fixSpecialCharacters(String id) { id = id.replace(".", "-"); id = id.replace("_", "-"); - return id.substring(0,40); + return id; } }
