-
Notifications
You must be signed in to change notification settings - Fork 1.9k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
8ddc6a0
commit 9499cd8
Showing
4 changed files
with
32 additions
and
30 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,15 +1,14 @@ | ||
diff --git a/kubernetes/src/main/java/io/kubernetes/client/openapi/models/V1ListMeta.java b/kubernetes/src/main/java/io/kubernetes/client/openapi/models/V1ListMeta.java | ||
index 60381b312..7fb47e230 100644 | ||
index f161284a2..d3d563bbb 100644 | ||
--- a/kubernetes/src/main/java/io/kubernetes/client/openapi/models/V1ListMeta.java | ||
+++ b/kubernetes/src/main/java/io/kubernetes/client/openapi/models/V1ListMeta.java | ||
@@ -266,7 +266,9 @@ public class V1ListMeta { | ||
@@ -258,7 +258,8 @@ public class V1ListMeta { | ||
@Override | ||
public V1ListMeta read(JsonReader in) throws IOException { | ||
JsonObject jsonObj = elementAdapter.read(in).getAsJsonObject(); | ||
- validateJsonObject(jsonObj); | ||
+ | ||
JsonElement jsonElement = elementAdapter.read(in); | ||
- validateJsonElement(jsonElement); | ||
+ // Disable validation so delete API can tolerate non-status return object (graceful deletion) | ||
+ // validateJsonObject(jsonObj); | ||
return thisAdapter.fromJsonTree(jsonObj); | ||
return thisAdapter.fromJsonTree(jsonElement); | ||
} | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,14 +1,14 @@ | ||
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 | ||
index b2b6db803..8a8a9765d 100644 | ||
index b529e3455..c2268419a 100644 | ||
--- a/kubernetes/src/main/java/io/kubernetes/client/openapi/models/V1Status.java | ||
+++ b/kubernetes/src/main/java/io/kubernetes/client/openapi/models/V1Status.java | ||
@@ -394,7 +394,8 @@ public class V1Status { | ||
@@ -378,7 +378,8 @@ public class V1Status { | ||
@Override | ||
public V1Status read(JsonReader in) throws IOException { | ||
JsonObject jsonObj = elementAdapter.read(in).getAsJsonObject(); | ||
- validateJsonObject(jsonObj); | ||
JsonElement jsonElement = elementAdapter.read(in); | ||
- validateJsonElement(jsonElement); | ||
+ // Disable validation so delete API can tolerate non-status return object (graceful deletion) | ||
+ // validateJsonObject(jsonObj); | ||
return thisAdapter.fromJsonTree(jsonObj); | ||
return thisAdapter.fromJsonTree(jsonElement); | ||
} | ||
|