Skip to content

Commit 348d6cd

Browse files
committed
refreshes the patches files
Signed-off-by: Min Jin <[email protected]>
1 parent 0523ff9 commit 348d6cd

File tree

4 files changed

+61
-12
lines changed

4 files changed

+61
-12
lines changed

scripts/patches/json.diff

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

scripts/patches/list-meta.diff

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

25+
--
26+
2.40.0
27+

scripts/patches/secret.diff

+18-7
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,15 @@
1+
From 2f237a9b0065778c20c97350fb5aea3d54974e07 Mon Sep 17 00:00:00 2001
2+
From: Min Jin <[email protected]>
3+
Date: Tue, 4 Feb 2025 11:19:21 -0800
4+
Subject: [PATCH] applying scripts/patches/secret.diff
5+
6+
Signed-off-by: Min Jin <[email protected]>
7+
---
8+
.../java/io/kubernetes/client/openapi/models/V1Secret.java | 3 ++-
9+
1 file changed, 2 insertions(+), 1 deletion(-)
10+
111
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
2-
index 5684f4776..aa77bd40f 100644
12+
index 4316c3275..54c8cb914 100644
313
--- a/kubernetes/src/main/java/io/kubernetes/client/openapi/models/V1Secret.java
414
+++ b/kubernetes/src/main/java/io/kubernetes/client/openapi/models/V1Secret.java
515
@@ -18,6 +18,7 @@ import com.google.gson.annotations.JsonAdapter;
@@ -8,16 +18,17 @@ index 5684f4776..aa77bd40f 100644
818
import com.google.gson.stream.JsonWriter;
919
+import io.kubernetes.client.custom.MapUtils;
1020
import io.kubernetes.client.openapi.models.V1ObjectMeta;
11-
import java.io.IOException;
12-
import java.util.Arrays;
13-
@@ -243,8 +244,8 @@ public class V1Secret implements io.kubernetes.client.common.KubernetesObject {
14-
return false;
21+
import io.swagger.annotations.ApiModel;
22+
import io.swagger.annotations.ApiModelProperty;
23+
@@ -254,7 +255,7 @@ public class V1Secret implements io.kubernetes.client.common.KubernetesObject {
1524
}
1625
V1Secret v1Secret = (V1Secret) o;
17-
- return Objects.equals(this.apiVersion, v1Secret.apiVersion) &&
26+
return Objects.equals(this.apiVersion, v1Secret.apiVersion) &&
1827
- Objects.equals(this.data, v1Secret.data) &&
19-
+ return Objects.equals(this.apiVersion, v1Secret.apiVersion) &&
2028
+ MapUtils.equals(this.data, v1Secret.data) &&
2129
Objects.equals(this.immutable, v1Secret.immutable) &&
2230
Objects.equals(this.kind, v1Secret.kind) &&
2331
Objects.equals(this.metadata, v1Secret.metadata) &&
32+
--
33+
2.40.0
34+

scripts/patches/status.diff

+15-2
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 <[email protected]>
3+
Date: Tue, 4 Feb 2025 12:08:35 -0800
4+
Subject: [PATCH] manual apply status patch
5+
6+
Signed-off-by: Min Jin <[email protected]>
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)