You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by re...@apache.org on 2015/05/22 11:41:26 UTC
stratos git commit: fixing kubernetes update issue
Repository: stratos
Updated Branches:
refs/heads/master 58f90bc55 -> ed4715e1f
fixing kubernetes update issue
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/ed4715e1
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/ed4715e1
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/ed4715e1
Branch: refs/heads/master
Commit: ed4715e1f2e907120637ff5ebb829b8598bbdd54
Parents: 58f90bc
Author: reka <rt...@gmail.com>
Authored: Fri May 22 15:09:31 2015 +0530
Committer: reka <rt...@gmail.com>
Committed: Fri May 22 15:11:05 2015 +0530
----------------------------------------------------------------------
.../cloud/controller/util/CloudControllerUtil.java | 11 +----------
1 file changed, 1 insertion(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/ed4715e1/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 d6974d8..ddd55587 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
@@ -273,10 +273,7 @@ public class CloudControllerUtil {
if (StringUtils.isEmpty(kubernetesCluster.getClusterId())) {
throw new InvalidKubernetesClusterException("Kubernetes cluster groupId can not be empty");
}
- if (context.kubernetesClusterExists(kubernetesCluster)) {
- throw new InvalidKubernetesClusterException(String.format("Kubernetes cluster already exists " +
- "[id] %s", kubernetesCluster.getClusterId()));
- }
+
if (kubernetesCluster.getKubernetesMaster() == null) {
throw new InvalidKubernetesClusterException("Mandatory field master has not been set " +
"for the Kubernetes cluster [id] " + kubernetesCluster.getClusterId());
@@ -312,12 +309,6 @@ public class CloudControllerUtil {
String.format("Kubernetes host [id] %s already defined in the request", kubernetesHost.getHostId()));
}
- // check whether host already exists
- if (context.kubernetesHostExists(kubernetesHost.getHostId())) {
- throw new InvalidKubernetesClusterException("Kubernetes host already exists [id] " +
- kubernetesHost.getHostId());
- }
-
hostIds.add(kubernetesHost.getHostId());
}
}