Setting a service compatible name.
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/39663aef Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/39663aef Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/39663aef Branch: refs/heads/docker-integration Commit: 39663aefca408de03ea8b573ad58b300af18f949 Parents: 10f9bee Author: Nirmal Fernando <[email protected]> Authored: Fri Sep 19 12:59:00 2014 +0530 Committer: Nirmal Fernando <[email protected]> Committed: Fri Sep 19 16:03:19 2014 +0530 ---------------------------------------------------------------------- .../functions/MemberContextToKubernetesService.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/39663aef/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/functions/MemberContextToKubernetesService.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/functions/MemberContextToKubernetesService.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/functions/MemberContextToKubernetesService.java index 79326ce..7621d89 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/functions/MemberContextToKubernetesService.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/functions/MemberContextToKubernetesService.java @@ -26,6 +26,7 @@ import org.apache.stratos.cloud.controller.util.CloudControllerUtil; import org.apache.stratos.common.constants.StratosConstants; import org.apache.stratos.kubernetes.client.model.Selector; import org.apache.stratos.kubernetes.client.model.Service; + import com.google.common.base.Function; /** @@ -48,7 +49,7 @@ public class MemberContextToKubernetesService implements Function<MemberContext, Service service = new Service(); service.setApiVersion("v1beta1"); - service.setId(clusterId); + service.setId(getCompatibleId(clusterId)); service.setKind("Service"); service.setPort(kubClusterContext.getAnAvailableHostPort()); Selector selector = new Selector(); @@ -58,4 +59,11 @@ public class MemberContextToKubernetesService implements Function<MemberContext, return service; } + private String getCompatibleId(String clusterId) { + if (clusterId.indexOf('.') != -1) { + clusterId = clusterId.replace('.', '-'); + } + return clusterId; + } + }
