Merge pull request #3896 from yue9944882/refresh-patches

Refreshes the patches files

Author: k8s-ci-robot

scripts/patches/json.diff

@@ -1,5 +1,14 @@
+From eeb5069c974d3146495f8a9dc52653f029d3cc2d Mon Sep 17 00:00:00 2001
+From: Min Jin <[email protected]>
+Date: Tue, 4 Feb 2025 11:59:25 -0800
+Subject: [PATCH] manually apply JSON patch
+
+---
+ .../io/kubernetes/client/openapi/JSON.java    | 36 ++++++++++++++++---
+ 1 file changed, 32 insertions(+), 4 deletions(-)
+
 diff --git a/kubernetes/src/main/java/io/kubernetes/client/openapi/JSON.java b/kubernetes/src/main/java/io/kubernetes/client/openapi/JSON.java
-index 870629244..d7d2d5579 100644
+index dda3ec708..fe902b293 100644
 --- a/kubernetes/src/main/java/io/kubernetes/client/openapi/JSON.java
 +++ b/kubernetes/src/main/java/io/kubernetes/client/openapi/JSON.java
 @@ -23,6 +23,9 @@ import com.google.gson.JsonElement;
@@ -87,3 +96,6 @@ index 870629244..d7d2d5579 100644
              }
          }
      }
+-- 
+2.40.0
+

scripts/patches/list-meta.diff

@@ -1,8 +1,18 @@
+From ff206c043bea0e87076e1f981634473b3522b1df Mon Sep 17 00:00:00 2001
+From: Min Jin <[email protected]>
+Date: Tue, 4 Feb 2025 12:07:01 -0800
+Subject: [PATCH] manually apply list-meta patch
+
+Signed-off-by: Min Jin <[email protected]>
+---
+ .../java/io/kubernetes/client/openapi/models/V1ListMeta.java   | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
 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 f161284a2..d3d563bbb 100644
+index 4ea44ec7f..1ef9ec2a6 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
-@@ -258,7 +258,8 @@ public class V1ListMeta {
+@@ -265,7 +265,8 @@ public class V1ListMeta {
             @Override
             public V1ListMeta read(JsonReader in) throws IOException {
               JsonElement jsonElement = elementAdapter.read(in);
@@ -12,3 +22,6 @@ index f161284a2..d3d563bbb 100644
               return thisAdapter.fromJsonTree(jsonElement);
             }
 
+-- 
+2.40.0
+

scripts/patches/secret.diff

@@ -1,5 +1,15 @@
+From 2f237a9b0065778c20c97350fb5aea3d54974e07 Mon Sep 17 00:00:00 2001
+From: Min Jin <[email protected]>
+Date: Tue, 4 Feb 2025 11:19:21 -0800
+Subject: [PATCH] applying scripts/patches/secret.diff
+
+Signed-off-by: Min Jin <[email protected]>
+---
+ .../java/io/kubernetes/client/openapi/models/V1Secret.java     | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
 diff --git a/kubernetes/src/main/java/io/kubernetes/client/openapi/models/V1Secret.java b/kubernetes/src/main/java/io/kubernetes/client/openapi/models/V1Secret.java
-index 5684f4776..aa77bd40f 100644
+index 4316c3275..54c8cb914 100644
 --- a/kubernetes/src/main/java/io/kubernetes/client/openapi/models/V1Secret.java
 +++ b/kubernetes/src/main/java/io/kubernetes/client/openapi/models/V1Secret.java
 @@ -18,6 +18,7 @@ import com.google.gson.annotations.JsonAdapter;
@@ -8,16 +18,17 @@ index 5684f4776..aa77bd40f 100644
  import com.google.gson.stream.JsonWriter;
 +import io.kubernetes.client.custom.MapUtils;
  import io.kubernetes.client.openapi.models.V1ObjectMeta;
- import java.io.IOException;
- import java.util.Arrays;
-@@ -243,8 +244,8 @@ public class V1Secret implements io.kubernetes.client.common.KubernetesObject {
-       return false;
+ import io.swagger.annotations.ApiModel;
+ import io.swagger.annotations.ApiModelProperty;
+@@ -254,7 +255,7 @@ public class V1Secret implements io.kubernetes.client.common.KubernetesObject {
      }
      V1Secret v1Secret = (V1Secret) o;
--    return Objects.equals(this.apiVersion, v1Secret.apiVersion) &&
+     return Objects.equals(this.apiVersion, v1Secret.apiVersion) &&
 -        Objects.equals(this.data, v1Secret.data) &&
-+    return Objects.equals(this.apiVersion, v1Secret.apiVersion) &&
 +        MapUtils.equals(this.data, v1Secret.data) &&
          Objects.equals(this.immutable, v1Secret.immutable) &&
          Objects.equals(this.kind, v1Secret.kind) &&
          Objects.equals(this.metadata, v1Secret.metadata) &&
+-- 
+2.40.0
+

scripts/patches/status.diff

@@ -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);
@@ -12,3 +22,6 @@ index b529e3455..c2268419a 100644
               return thisAdapter.fromJsonTree(jsonElement);
             }
 
+-- 
+2.40.0
+