You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ra...@apache.org on 2015/08/30 20:17:20 UTC

[27/50] [abbrv] stratos git commit: Fixes STRATOS-1532: Kub cluster update

Fixes STRATOS-1532: Kub cluster update


Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/8a36db5f
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/8a36db5f
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/8a36db5f

Branch: refs/heads/master
Commit: 8a36db5fdbc25113b4ac2d4b67f0dbb0a2c6dadc
Parents: dee118b
Author: Akila Perera <ra...@gmail.com>
Authored: Sat Aug 29 01:20:37 2015 +0530
Committer: Akila Perera <ra...@gmail.com>
Committed: Sat Aug 29 01:20:37 2015 +0530

----------------------------------------------------------------------
 .../stratos/cloud/controller/context/CloudControllerContext.java | 4 ++++
 .../controller/services/impl/CloudControllerServiceImpl.java     | 1 +
 2 files changed, 5 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/stratos/blob/8a36db5f/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/context/CloudControllerContext.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/context/CloudControllerContext.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/context/CloudControllerContext.java
index 708a24b..964dd73 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/context/CloudControllerContext.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/context/CloudControllerContext.java
@@ -512,6 +512,10 @@ public class CloudControllerContext implements Serializable {
                 kubernetesClusterContext.getKubernetesClusterId(), kubernetesClusterContext);
     }
 
+    public void removeKubernetesClusterContext(String kubernetesClusterId){
+        kubClusterIdToKubClusterContextMap.remove(kubernetesClusterId);
+    }
+
     /**
      * Remove a registered Kubernetes cluster from registry
      */

http://git-wip-us.apache.org/repos/asf/stratos/blob/8a36db5f/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceImpl.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceImpl.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceImpl.java
index 55e70db..f1615c5 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceImpl.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceImpl.java
@@ -1305,6 +1305,7 @@ public class CloudControllerServiceImpl implements CloudControllerService {
             }
             // Remove entry from information model
             CloudControllerContext.getInstance().removeKubernetesCluster(kubernetesClusterId);
+            CloudControllerContext.getInstance().removeKubernetesClusterContext(kubernetesClusterId);
 
             if (log.isInfoEnabled()) {
                 log.info(String.format("Kubernetes cluster removed successfully: [id] %s", kubernetesClusterId));