Kubernetes API change introduced in a newer version of Kubernetes. They're now returning 200OK but earlier was returning 202. Fixing that.
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/ae538a50 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/ae538a50 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/ae538a50 Branch: refs/heads/docker-integration Commit: ae538a504e7a700b258c4e27e60ee33ac5f9cba6 Parents: f5adcce Author: Nirmal Fernando <[email protected]> Authored: Thu Sep 25 17:40:44 2014 +0530 Committer: Nirmal Fernando <[email protected]> Committed: Thu Sep 25 18:00:18 2014 +0530 ---------------------------------------------------------------------- .../stratos/kubernetes/client/KubernetesApiClient.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/ae538a50/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/KubernetesApiClient.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/KubernetesApiClient.java b/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/KubernetesApiClient.java index d3137ee..f78d7d3 100644 --- a/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/KubernetesApiClient.java +++ b/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/KubernetesApiClient.java @@ -149,7 +149,8 @@ public class KubernetesApiClient implements KubernetesAPIClientInterface { throw new KubernetesClientException(msg); } - if (res.getStatusLine().getStatusCode() != HttpStatus.SC_ACCEPTED) { + if (res.getStatusLine().getStatusCode() != HttpStatus.SC_ACCEPTED && + res.getStatusLine().getStatusCode() != HttpStatus.SC_OK) { String msg = "Pod ["+podId+"] deletion failed. Error: "+ res.getStatusLine().getReasonPhrase(); log.error(msg); @@ -307,7 +308,8 @@ public class KubernetesApiClient implements KubernetesAPIClientInterface { throw new KubernetesClientException(msg); } - if (res.getStatusLine().getStatusCode() != HttpStatus.SC_ACCEPTED) { + if (res.getStatusLine().getStatusCode() != HttpStatus.SC_ACCEPTED && + res.getStatusLine().getStatusCode() != HttpStatus.SC_OK) { String msg = "Replication Controller ["+controllerId+"] deletion failed. Error: "+ res.getStatusLine().getReasonPhrase(); log.error(msg); @@ -414,7 +416,8 @@ public class KubernetesApiClient implements KubernetesAPIClientInterface { throw new KubernetesClientException(msg); } - if (res.getStatusLine().getStatusCode() != HttpStatus.SC_ACCEPTED) { + if (res.getStatusLine().getStatusCode() != HttpStatus.SC_ACCEPTED && + res.getStatusLine().getStatusCode() != HttpStatus.SC_OK) { String msg = "Service ["+serviceId+"] deletion failed. Error: "+ res.getStatusLine().getReasonPhrase(); log.error(msg);
