You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ni...@apache.org on 2014/09/25 15:13:50 UTC
[2/2] git commit: Pass correct service id for termination.
Pass correct service id for termination.
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/a64bbb96
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/a64bbb96
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/a64bbb96
Branch: refs/heads/docker-integration
Commit: a64bbb966623733dfb4a5c84497942ee4f40706a
Parents: f6e3a2a
Author: Nirmal Fernando <ni...@gmail.com>
Authored: Thu Sep 25 18:43:33 2014 +0530
Committer: Nirmal Fernando <ni...@gmail.com>
Committed: Thu Sep 25 18:43:33 2014 +0530
----------------------------------------------------------------------
.../functions/MemberContextToKubernetesService.java | 9 +--------
.../cloud/controller/impl/CloudControllerServiceImpl.java | 2 +-
.../stratos/cloud/controller/util/CloudControllerUtil.java | 7 +++++++
3 files changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/a64bbb96/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 00e562d..6aa4050 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
@@ -49,7 +49,7 @@ public class MemberContextToKubernetesService implements Function<MemberContext,
Service service = new Service();
service.setApiVersion("v1beta1");
- service.setId(getCompatibleId(clusterId));
+ service.setId(CloudControllerUtil.getCompatibleId(clusterId));
service.setKind("Service");
int hostPort = kubClusterContext.getAnAvailableHostPort();
clusterContext.addProperty(StratosConstants.ALLOCATED_SERVICE_HOST_PORT, hostPort);
@@ -61,11 +61,4 @@ public class MemberContextToKubernetesService implements Function<MemberContext,
return service;
}
- private String getCompatibleId(String clusterId) {
- if (clusterId.indexOf('.') != -1) {
- clusterId = clusterId.replace('.', '-');
- }
- return clusterId;
- }
-
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/a64bbb96/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/impl/CloudControllerServiceImpl.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/impl/CloudControllerServiceImpl.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/impl/CloudControllerServiceImpl.java
index 3386231..c6d4049 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/impl/CloudControllerServiceImpl.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/impl/CloudControllerServiceImpl.java
@@ -1523,7 +1523,7 @@ public class CloudControllerServiceImpl implements CloudControllerService {
KubernetesApiClient kubApi = kubClusterContext.getKubApi();
// delete the service
try {
- kubApi.deleteService(clusterId);
+ kubApi.deleteService(CloudControllerUtil.getCompatibleId(clusterId));
} catch (KubernetesClientException e) {
// we're not going to throw this error, but proceed with other deletions
log.error("Failed to delete Kubernetes service with id: "+clusterId, e);
http://git-wip-us.apache.org/repos/asf/stratos/blob/a64bbb96/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerUtil.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerUtil.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerUtil.java
index 213fedb..019dbdb 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerUtil.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerUtil.java
@@ -381,4 +381,11 @@ public class CloudControllerUtil {
String partitionStr = str.length() == 0 ? str.toString() : str.substring(0, str.length()-2);
return "[" +partitionStr+ "]";
}
+
+ public static String getCompatibleId(String clusterId) {
+ if (clusterId.indexOf('.') != -1) {
+ clusterId = clusterId.replace('.', '-');
+ }
+ return clusterId;
+ }
}