Repository: stratos Updated Branches: refs/heads/stratos-4.1.x 5822d5145 -> 51d66d0cb
Remove kubernetes services from kubernetes cluster context Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/7645bc53 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/7645bc53 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/7645bc53 Branch: refs/heads/stratos-4.1.x Commit: 7645bc5317ff82a9065487734f1cbc0646cafd6f Parents: 1255b4a Author: gayangunarathne <[email protected]> Authored: Mon Sep 21 12:00:02 2015 +0530 Committer: gayangunarathne <[email protected]> Committed: Mon Sep 21 12:00:02 2015 +0530 ---------------------------------------------------------------------- .../kubernetes/KubernetesClusterContext.java | 20 ++++---------------- .../iaases/kubernetes/KubernetesIaas.java | 5 +---- 2 files changed, 5 insertions(+), 20 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/7645bc53/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/kubernetes/KubernetesClusterContext.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/kubernetes/KubernetesClusterContext.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/kubernetes/KubernetesClusterContext.java index 2c54aa0..d22f977 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/kubernetes/KubernetesClusterContext.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/kubernetes/KubernetesClusterContext.java @@ -21,10 +21,11 @@ package org.apache.stratos.cloud.controller.domain.kubernetes; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.stratos.kubernetes.client.KubernetesApiClient; -import org.apache.stratos.messaging.domain.topology.KubernetesService; import java.io.Serializable; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; import java.util.concurrent.atomic.AtomicLong; /** @@ -42,7 +43,7 @@ public class KubernetesClusterContext implements Serializable { private String masterIp; private String masterPort; private List<Integer> servicePortSequence; - private Map<String, KubernetesService> kubernetesServices; + private AtomicLong serviceSeqNo; private AtomicLong podSeqNo; private transient KubernetesApiClient kubApi; @@ -51,7 +52,6 @@ public class KubernetesClusterContext implements Serializable { public KubernetesClusterContext(String id, String masterIp, String masterPort, int lowerPort, int upperPort) { this.servicePortSequence = new ArrayList<>(); - this.kubernetesServices = new HashMap<>(); serviceSeqNo = new AtomicLong(0); podSeqNo = new AtomicLong(0); @@ -121,18 +121,6 @@ public class KubernetesClusterContext implements Serializable { } } - public void addKubernetesService(KubernetesService service) { - kubernetesServices.put(service.getId(), service); - } - - public void removeKubernetesService(String serviceName) { - kubernetesServices.remove(serviceName); - } - - public Collection<KubernetesService> getKubernetesServices() { - return kubernetesServices.values(); - } - public String getMasterIp() { return masterIp; } http://git-wip-us.apache.org/repos/asf/stratos/blob/7645bc53/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 65f8184..cd009fc 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 @@ -519,7 +519,7 @@ public class KubernetesIaas extends Iaas { if (clusterPortMappings != null) { String serviceName = DigestUtils.md5Hex(clusterId); - Collection<KubernetesService> kubernetesServices = kubernetesClusterContext.getKubernetesServices(); + Collection<KubernetesService> kubernetesServices = clusterContext.getKubernetesServices(); for (ClusterPortMapping clusterPortMapping : clusterPortMappings) { // Skip if already created @@ -620,7 +620,6 @@ public class KubernetesIaas extends Iaas { kubernetesService.setContainerPort(containerPort); - kubernetesClusterContext.addKubernetesService(kubernetesService); clusterContext.addKubernetesService(kubernetesService); CloudControllerContext.getInstance().persist(); @@ -877,7 +876,6 @@ public class KubernetesIaas extends Iaas { kubApi.deleteService(serviceId); kubClusterContext.deallocatePort(kubernetesService.getPort()); - kubClusterContext.removeKubernetesService(serviceId); clusterContext.removeKubernetesService(serviceId); } catch (KubernetesClientException e) { @@ -1092,7 +1090,6 @@ public class KubernetesIaas extends Iaas { try { kubernetesApiClient.deleteService(serviceId); kubernetesClusterContext.deallocatePort(kubernetesService.getPort()); - kubernetesClusterContext.removeKubernetesService(serviceId); clusterContext.removeKubernetesService(serviceId); } catch (KubernetesClientException e) {
