Revert "Update the pod label to restrict its length" This reverts commit 409e53d89b9333c738876883ca6bf15753fecf19.
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/f8b692c6 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/f8b692c6 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/f8b692c6 Branch: refs/heads/master Commit: f8b692c6e156a9a3f6b023421fcc1f6468a03912 Parents: 4affcef Author: gayangunarathne <[email protected]> Authored: Mon Nov 2 16:54:55 2015 +0530 Committer: gayangunarathne <[email protected]> Committed: Mon Nov 2 16:54:55 2015 +0530 ---------------------------------------------------------------------- .../cloud/controller/iaases/kubernetes/KubernetesIaas.java | 2 +- .../cloud/controller/iaases/kubernetes/KubernetesIaasUtil.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/f8b692c6/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 26afc4c..29520ce 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,7 @@ public class KubernetesIaas extends Iaas { // Find next service sequence no long serviceSeqNo = kubernetesClusterContext.getServiceSeqNo().incrementAndGet(); - String serviceId = KubernetesIaasUtil.fixSpecialCharacters("service" + "-" + (serviceSeqNo)); + String serviceId = KubernetesIaasUtil.fixSpecialCharactersAndLength("service" + "-" + (serviceSeqNo)); String serviceLabel = DigestUtils.md5Hex(clusterId); if (log.isInfoEnabled()) { http://git-wip-us.apache.org/repos/asf/stratos/blob/f8b692c6/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 cbf28ae..76b73da 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 fixSpecialCharacters(String id) { + public static String fixSpecialCharactersAndLength(String id) { id = id.replace(".", "-"); id = id.replace("_", "-"); - return id; + return id.substring(0,40); } }
