Repository: stratos Updated Branches: refs/heads/master 9f735d048 -> 409e53d89
Update the pod label to restrict its length Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/409e53d8 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/409e53d8 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/409e53d8 Branch: refs/heads/master Commit: 409e53d89b9333c738876883ca6bf15753fecf19 Parents: 9f735d0 Author: gayangunarathne <[email protected]> Authored: Sat Sep 5 20:39:01 2015 +0530 Committer: gayangunarathne <[email protected]> Committed: Sat Sep 5 20:39:01 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/409e53d8/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 29520ce..26afc4c 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.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/409e53d8/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; } }
