diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/BaseOperation.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/BaseOperation.java index 35a8440b4c2..75eca20ca4d 100755 --- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/BaseOperation.java +++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/BaseOperation.java @@ -729,6 +729,10 @@ protected Status handleDeploymentRollback(DeploymentRollback deploymentRollback) return operation(Scope.RESOURCE, "POST", deploymentRollback, Status.class, "rollback"); } + protected T handleApproveOrDeny(T csr) { + return operation(Scope.RESOURCE, "PUT", csr, type, "approval"); + } + @Override public X operation(Scope scope, String method, Object payload, Class responseType, String... path) { String operationName = scope.name(); diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/OperationSupport.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/OperationSupport.java index c6f1eb588b3..8f7c2d67d88 100644 --- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/OperationSupport.java +++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/OperationSupport.java @@ -451,13 +451,6 @@ protected Map getParameters() { return Collections.emptyMap(); } - protected T handleApproveOrDeny(T csr, Class type) throws IOException, InterruptedException { - String uri = URLUtils.join(getResourceUrl(null, csr.getMetadata().getName(), false).toString(), "approval"); - HttpRequest.Builder requestBuilder = httpClient.newHttpRequestBuilder() - .put(JSON, JSON_MAPPER.writeValueAsString(csr)).uri(uri); - return handleResponse(requestBuilder, type); - } - /** * Send a raw get - where the type should be one of String, Reader, InputStream *
diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/certificates/v1/CertificateSigningRequestOperationsImpl.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/certificates/v1/CertificateSigningRequestOperationsImpl.java index d9a233a6cc3..25a29e67705 100644 --- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/certificates/v1/CertificateSigningRequestOperationsImpl.java +++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/certificates/v1/CertificateSigningRequestOperationsImpl.java @@ -22,14 +22,11 @@ import io.fabric8.kubernetes.api.model.certificates.v1.CertificateSigningRequestStatus; import io.fabric8.kubernetes.api.model.certificates.v1.CertificateSigningRequestStatusBuilder; import io.fabric8.kubernetes.client.Client; -import io.fabric8.kubernetes.client.KubernetesClientException; import io.fabric8.kubernetes.client.dsl.CertificateSigningRequestResource; import io.fabric8.kubernetes.client.dsl.internal.HasMetadataOperation; import io.fabric8.kubernetes.client.dsl.internal.HasMetadataOperationsImpl; import io.fabric8.kubernetes.client.dsl.internal.OperationContext; -import java.io.IOException; - public class CertificateSigningRequestOperationsImpl extends HasMetadataOperation> implements CertificateSigningRequestResource { @@ -60,16 +57,9 @@ public CertificateSigningRequest deny(CertificateSigningRequestCondition certifi private CertificateSigningRequest addStatusToCSRAndSubmit( CertificateSigningRequestCondition certificateSigningRequestCondition) { - try { - CertificateSigningRequest fromServerCsr = get(); - fromServerCsr.setStatus(createCertificateSigningRequestStatus(certificateSigningRequestCondition)); - return handleApproveOrDeny(fromServerCsr, CertificateSigningRequest.class); - } catch (InterruptedException ie) { - Thread.currentThread().interrupt(); - throw KubernetesClientException.launderThrowable(forOperationType("approval " + type), ie); - } catch (IOException e) { - throw KubernetesClientException.launderThrowable(forOperationType("approval " + type), e); - } + CertificateSigningRequest fromServerCsr = get(); + fromServerCsr.setStatus(createCertificateSigningRequestStatus(certificateSigningRequestCondition)); + return handleApproveOrDeny(fromServerCsr); } private CertificateSigningRequestStatus createCertificateSigningRequestStatus( diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/certificates/v1beta1/CertificateSigningRequestOperationsImpl.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/certificates/v1beta1/CertificateSigningRequestOperationsImpl.java index 4836b654014..9a74006aa5a 100644 --- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/certificates/v1beta1/CertificateSigningRequestOperationsImpl.java +++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/certificates/v1beta1/CertificateSigningRequestOperationsImpl.java @@ -22,14 +22,11 @@ import io.fabric8.kubernetes.api.model.certificates.v1beta1.CertificateSigningRequestStatus; import io.fabric8.kubernetes.api.model.certificates.v1beta1.CertificateSigningRequestStatusBuilder; import io.fabric8.kubernetes.client.Client; -import io.fabric8.kubernetes.client.KubernetesClientException; import io.fabric8.kubernetes.client.dsl.V1beta1CertificateSigningRequestResource; import io.fabric8.kubernetes.client.dsl.internal.HasMetadataOperation; import io.fabric8.kubernetes.client.dsl.internal.HasMetadataOperationsImpl; import io.fabric8.kubernetes.client.dsl.internal.OperationContext; -import java.io.IOException; - public class CertificateSigningRequestOperationsImpl extends HasMetadataOperation> implements V1beta1CertificateSigningRequestResource { @@ -67,15 +64,8 @@ private CertificateSigningRequestStatus createCertificateSigningRequestStatus( private CertificateSigningRequest addStatusToCSRAndSubmit( CertificateSigningRequestCondition certificateSigningRequestCondition) { - try { - CertificateSigningRequest fromServerCsr = get(); - fromServerCsr.setStatus(createCertificateSigningRequestStatus(certificateSigningRequestCondition)); - return handleApproveOrDeny(fromServerCsr, CertificateSigningRequest.class); - } catch (InterruptedException ie) { - Thread.currentThread().interrupt(); - throw KubernetesClientException.launderThrowable(forOperationType("approval " + type), ie); - } catch (IOException e) { - throw KubernetesClientException.launderThrowable(forOperationType("approval " + type), e); - } + CertificateSigningRequest fromServerCsr = get(); + fromServerCsr.setStatus(createCertificateSigningRequestStatus(certificateSigningRequestCondition)); + return handleApproveOrDeny(fromServerCsr); } } diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/core/v1/PodOperationsImpl.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/core/v1/PodOperationsImpl.java index f9705efd57f..1447e7908ad 100644 --- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/core/v1/PodOperationsImpl.java +++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/core/v1/PodOperationsImpl.java @@ -52,7 +52,6 @@ import io.fabric8.kubernetes.client.dsl.internal.PortForwarderWebsocket; import io.fabric8.kubernetes.client.dsl.internal.uploadable.PodUpload; import io.fabric8.kubernetes.client.http.HttpClient; -import io.fabric8.kubernetes.client.http.HttpRequest; import io.fabric8.kubernetes.client.http.WebSocket; import io.fabric8.kubernetes.client.lib.FilenameUtils; import io.fabric8.kubernetes.client.utils.URLUtils; @@ -251,18 +250,13 @@ private boolean handleEvict(HasMetadata eviction) { throw new KubernetesClientException("Name not specified, but operation requires it."); } - URL requestUrl = new URL(URLUtils.join(getResourceUrl().toString(), "eviction")); - HttpRequest.Builder requestBuilder = httpClient.newHttpRequestBuilder() - .post(JSON, JSON_MAPPER.writeValueAsString(eviction)).url(requestUrl); - handleResponse(requestBuilder, null); + operation(Scope.RESOURCE, "POST", eviction, null, "eviction"); return true; } catch (KubernetesClientException e) { if (e.getCode() != HTTP_TOO_MANY_REQUESTS) { throw e; } return false; - } catch (IOException exception) { - throw KubernetesClientException.launderThrowable(forOperationType("evict"), exception); } }