Skip to content

Commit 13864fd

Browse files
committed
manual apply status patch
Signed-off-by: Min Jin <minkimzz@amazon.com>
1 parent 9a1cbba commit 13864fd

File tree

2 files changed

+17
-3
lines changed

2 files changed

+17
-3
lines changed

kubernetes/src/main/java/io/kubernetes/client/openapi/models/V1Status.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -389,7 +389,8 @@ public void write(JsonWriter out, V1Status value) throws IOException {
389389
@Override
390390
public V1Status read(JsonReader in) throws IOException {
391391
JsonElement jsonElement = elementAdapter.read(in);
392-
validateJsonElement(jsonElement);
392+
// Disable validation so delete API can tolerate non-status return object (graceful deletion)
393+
// validateJsonObject(jsonObj);
393394
return thisAdapter.fromJsonTree(jsonElement);
394395
}
395396

scripts/patches/status.diff

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,18 @@
1+
From 8c5816990a40eb9ad57dda33bd7fb5cfdbcd3627 Mon Sep 17 00:00:00 2001
2+
From: Min Jin <minkimzz@amazon.com>
3+
Date: Tue, 4 Feb 2025 12:08:35 -0800
4+
Subject: [PATCH] manual apply status patch
5+
6+
Signed-off-by: Min Jin <minkimzz@amazon.com>
7+
---
8+
.../java/io/kubernetes/client/openapi/models/V1Status.java | 3 ++-
9+
1 file changed, 2 insertions(+), 1 deletion(-)
10+
111
diff --git a/kubernetes/src/main/java/io/kubernetes/client/openapi/models/V1Status.java b/kubernetes/src/main/java/io/kubernetes/client/openapi/models/V1Status.java
2-
index b529e3455..c2268419a 100644
12+
index 8faeacd29..e03d69e70 100644
313
--- a/kubernetes/src/main/java/io/kubernetes/client/openapi/models/V1Status.java
414
+++ b/kubernetes/src/main/java/io/kubernetes/client/openapi/models/V1Status.java
5-
@@ -378,7 +378,8 @@ public class V1Status {
15+
@@ -389,7 +389,8 @@ public class V1Status {
616
@Override
717
public V1Status read(JsonReader in) throws IOException {
818
JsonElement jsonElement = elementAdapter.read(in);
@@ -12,3 +22,6 @@ index b529e3455..c2268419a 100644
1222
return thisAdapter.fromJsonTree(jsonElement);
1323
}
1424

25+
--
26+
2.40.0
27+

0 commit comments

Comments
 (0)