Skip to content

Generate openapi model for release-22 from upstream release 1.31 #3895

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
k8s-ci-robot merged 6 commits into from
Feb 4, 2025
Merged

Generate openapi model for release-22 from upstream release 1.31 #3895

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
644d739
Automated openapi generation from release-1.31
yue9944882 Feb 4, 2025
d5fdaf6
Format and fluent-gen from release-1.31
yue9944882 Feb 4, 2025
754bdfe
manually apply secret patch
yue9944882 Feb 4, 2025
f33cf28
manually apply JSON patch
yue9944882 Feb 4, 2025
9a1cbba
manually apply list-meta patch
yue9944882 Feb 4, 2025
13864fd
manual apply status patch
yue9944882 Feb 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
manual apply status patch 
Signed-off-by: Min Jin <[email protected]>
  • Loading branch information
@yue9944882
yue9944882 committed Feb 4, 2025
commit 13864fd21923e0d281048b999b41fef062ebb538
3 changes: 2 additions & 1 deletion kubernetes/src/main/java/io/kubernetes/client/openapi/models/V1Status.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -389,7 +389,8 @@ public void write(JsonWriter out, V1Status value) throws IOException {
@Override
public V1Status read(JsonReader in) throws IOException {
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(jsonElement);
}

Expand Down
17 changes: 15 additions & 2 deletions scripts/patches/status.diff
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,18 @@
From 8c5816990a40eb9ad57dda33bd7fb5cfdbcd3627 Mon Sep 17 00:00:00 2001
From: Min Jin <[email protected]>
Date: Tue, 4 Feb 2025 12:08:35 -0800
Subject: [PATCH] manual apply status patch

Signed-off-by: Min Jin <[email protected]>
---
.../java/io/kubernetes/client/openapi/models/V1Status.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

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 b529e3455..c2268419a 100644
index 8faeacd29..e03d69e70 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
@@ -378,7 +378,8 @@ public class V1Status {
@@ -389,7 +389,8 @@ public class V1Status {
@Override
public V1Status read(JsonReader in) throws IOException {
JsonElement jsonElement = elementAdapter.read(in);
Expand All @@ -12,3 +22,6 @@ index b529e3455..c2268419a 100644
return thisAdapter.fromJsonTree(jsonElement);
}

--
2.40.0

Loading