From e1bf9c49b9892bbcb5c5cdb6889f361479472063 Mon Sep 17 00:00:00 2001
From: lin1005q <15811933+lin1005q@users.noreply.github.com>
Date: Sat, 3 Apr 2021 17:08:32 +0800
Subject: [PATCH 1/3] bugfix KubernetesApiResponse cannot be cast to class
 KubernetesObject

---
 .../client/extended/kubectl/KubectlPatch.java        | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/extended/src/main/java/io/kubernetes/client/extended/kubectl/KubectlPatch.java b/extended/src/main/java/io/kubernetes/client/extended/kubectl/KubectlPatch.java
index bce15d4204..e5b1031312 100644
--- a/extended/src/main/java/io/kubernetes/client/extended/kubectl/KubectlPatch.java
+++ b/extended/src/main/java/io/kubernetes/client/extended/kubectl/KubectlPatch.java
@@ -44,10 +44,14 @@ public ApiType execute() throws KubectlException {
     refreshDiscovery();
 
     GenericKubernetesApi genericKubernetesApi = getGenericApi();
-    if (ModelMapper.isNamespaced(apiTypeClass)) {
-      return (ApiType) genericKubernetesApi.patch(namespace, name, patchType, patchContent);
-    } else {
-      return (ApiType) genericKubernetesApi.patch(name, patchType, patchContent);
+    try {
+      if (ModelMapper.isNamespaced(apiTypeClass)) {
+        return (ApiType) genericKubernetesApi.patch(namespace, name, patchType, patchContent).throwsApiException().getObject();
+      } else {
+        return (ApiType) genericKubernetesApi.patch(name, patchType, patchContent).throwsApiException().getObject();
+      }
+    } catch (Exception e) {
+      throw new KubectlException(e);
     }
   }
 }

From 44b30fe01d0471411e2e7d158aa0f1431f884b48 Mon Sep 17 00:00:00 2001
From: lin1005q <15811933+lin1005q@users.noreply.github.com>
Date: Sat, 3 Apr 2021 17:19:07 +0800
Subject: [PATCH 2/3] fix source code format

---
 .../client/extended/kubectl/KubectlPatch.java        | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/extended/src/main/java/io/kubernetes/client/extended/kubectl/KubectlPatch.java b/extended/src/main/java/io/kubernetes/client/extended/kubectl/KubectlPatch.java
index e5b1031312..38f1ec646b 100644
--- a/extended/src/main/java/io/kubernetes/client/extended/kubectl/KubectlPatch.java
+++ b/extended/src/main/java/io/kubernetes/client/extended/kubectl/KubectlPatch.java
@@ -46,9 +46,17 @@ public ApiType execute() throws KubectlException {
     GenericKubernetesApi genericKubernetesApi = getGenericApi();
     try {
       if (ModelMapper.isNamespaced(apiTypeClass)) {
-        return (ApiType) genericKubernetesApi.patch(namespace, name, patchType, patchContent).throwsApiException().getObject();
+        return (ApiType)
+            genericKubernetesApi
+                .patch(namespace, name, patchType, patchContent)
+                .throwsApiException()
+                .getObject();
       } else {
-        return (ApiType) genericKubernetesApi.patch(name, patchType, patchContent).throwsApiException().getObject();
+        return (ApiType)
+            genericKubernetesApi
+                .patch(name, patchType, patchContent)
+                .throwsApiException()
+                .getObject();
       }
     } catch (Exception e) {
       throw new KubectlException(e);

From c6a78d7c8903b85d16d76ee1e765191c1ff88ab4 Mon Sep 17 00:00:00 2001
From: lin1005q <15811933+lin1005q@users.noreply.github.com>
Date: Tue, 6 Apr 2021 08:50:37 +0800
Subject: [PATCH 3/3] update catch ApiException

---
 .../io/kubernetes/client/extended/kubectl/KubectlPatch.java    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/extended/src/main/java/io/kubernetes/client/extended/kubectl/KubectlPatch.java b/extended/src/main/java/io/kubernetes/client/extended/kubectl/KubectlPatch.java
index 38f1ec646b..283fa3233f 100644
--- a/extended/src/main/java/io/kubernetes/client/extended/kubectl/KubectlPatch.java
+++ b/extended/src/main/java/io/kubernetes/client/extended/kubectl/KubectlPatch.java
@@ -15,6 +15,7 @@
 import io.kubernetes.client.common.KubernetesObject;
 import io.kubernetes.client.custom.V1Patch;
 import io.kubernetes.client.extended.kubectl.exception.KubectlException;
+import io.kubernetes.client.openapi.ApiException;
 import io.kubernetes.client.util.ModelMapper;
 import io.kubernetes.client.util.generic.GenericKubernetesApi;
 
@@ -58,7 +59,7 @@ public ApiType execute() throws KubectlException {
                 .throwsApiException()
                 .getObject();
       }
-    } catch (Exception e) {
+    } catch (ApiException e) {
       throw new KubectlException(e);
     }
   }