Skip to content

Commit 0f68efc

Browse files
authored
Merge pull request #3917 from yue9944882/automated-generate-616c8583-edit
Branch(master-java8): Automated Generate from openapi release-1.32
2 parents 1415ab5 + 59745d6 commit 0f68efc

File tree

1,378 files changed

+94052
-73320
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,378 files changed

+94052
-73320
lines changed

.github/workflows/generate.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
uses: actions/setup-java@v4
3636
with:
3737
distribution: 'temurin'
38-
java-version: 11
38+
java-version: 17.0.x
3939
- name: Checkout Gen
4040
uses: actions/checkout@v4
4141
with:
@@ -69,7 +69,7 @@ jobs:
6969
export PACKAGE_NAME="io.kubernetes.client.openapi"
7070
EOF
7171
72-
USE_SINGLE_PARAMETER=true bash java.sh ../../kubernetes/ settings
72+
USE_SINGLE_PARAMETER=false OPENAPI_GENERATOR_COMMIT=v4.3.1 bash java.sh ../../kubernetes/ settings
7373
popd
7474
rm -rf gen
7575
git config user.email "[email protected]"

e2e/src/test/groovy/io/kubernetes/client/e2e/basic/CoreV1ApiTest.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ class CoreV1ApiTest extends Specification {
3232
then:
3333
created != null
3434
when:
35-
V1Status deleted = corev1api.deleteNamespace("e2e-basic", null, null, null, null, null, null)
35+
V1Status deleted = corev1api.deleteNamespace("e2e-basic", null, null, null, null, null, null, null)
3636
then:
3737
deleted != null
3838
}

e2e/src/test/java/io/kubernetes/client/e2e/extended/leaderelection/LeaderElectorTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,7 @@ private void deleteConfigMapLockResource() throws Exception {
277277
try {
278278
CoreV1Api coreV1Api = new CoreV1Api(apiClient);
279279
coreV1Api.deleteNamespacedConfigMap(
280-
LOCK_RESOURCE_NAME, NAMESPACE, null, null, null, null, null, null);
280+
LOCK_RESOURCE_NAME, NAMESPACE, null, null, null, null, null, null, null);
281281
} catch (ApiException ex) {
282282
if (ex.getCode() != HttpURLConnection.HTTP_NOT_FOUND) {
283283
throw ex;
@@ -289,7 +289,7 @@ private void deleteEndpointsLockResource() throws Exception {
289289
try {
290290
CoreV1Api coreV1Api = new CoreV1Api(apiClient);
291291
coreV1Api.deleteNamespacedEndpoints(
292-
LOCK_RESOURCE_NAME, NAMESPACE, null, null, null, null, null, null);
292+
LOCK_RESOURCE_NAME, NAMESPACE, null, null, null, null, null, null, null);
293293
} catch (ApiException ex) {
294294
if (ex.getCode() != HttpURLConnection.HTTP_NOT_FOUND) {
295295
throw ex;
@@ -301,7 +301,7 @@ private void deleteLeaseLockResource() throws Exception {
301301
try {
302302
CoordinationV1Api coordinationV1Api = new CoordinationV1Api(apiClient);
303303
coordinationV1Api.deleteNamespacedLease(
304-
LOCK_RESOURCE_NAME, NAMESPACE, null, null, null, null, null, null);
304+
LOCK_RESOURCE_NAME, NAMESPACE, null, null, null, null, null, null, null);
305305
} catch (ApiException ex) {
306306
if (ex.getCode() != HttpURLConnection.HTTP_NOT_FOUND) {
307307
throw ex;

examples/examples-release-19/src/main/java/io/kubernetes/client/examples/ExpandedExample.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -270,6 +270,7 @@ public static void printLog(String namespace, String podName) throws ApiExceptio
270270
null,
271271
Boolean.FALSE,
272272
Integer.MAX_VALUE,
273+
null,
273274
40,
274275
Boolean.FALSE);
275276
System.out.println(readNamespacedPodLog);

examples/examples-release-19/src/main/java/io/kubernetes/client/examples/YamlExample.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,7 @@ public static void main(String[] args) throws IOException, ApiException, ClassNo
103103
null,
104104
null,
105105
null,
106+
null,
106107
new V1DeleteOptions());
107108
System.out.println(deleteResult);
108109
}

extended/src/main/java/io/kubernetes/client/extended/kubectl/KubectlDrain.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ private void validatePods(List<V1Pod> pods) throws KubectlException {
113113

114114
private void deletePod(CoreV1Api api, String name, String namespace)
115115
throws ApiException, IOException, KubectlException {
116-
api.deleteNamespacedPod(name, namespace, null, null, this.gracePeriodSeconds, null, null, null);
116+
api.deleteNamespacedPod(name, namespace, null, null, this.gracePeriodSeconds, null, null, null, null);
117117
waitForPodDelete(api, name, namespace);
118118
}
119119

fluent/src/main/java/io/kubernetes/client/openapi/models/V1ClaimSourceBuilder.java

Lines changed: 0 additions & 32 deletions
This file was deleted.

fluent/src/main/java/io/kubernetes/client/openapi/models/V1ClaimSourceFluent.java

Lines changed: 0 additions & 80 deletions
This file was deleted.

fluent/src/main/java/io/kubernetes/client/openapi/models/V1ContainerStatusBuilder.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ public V1ContainerStatusBuilder(V1ContainerStatus instance) {
2424
public V1ContainerStatus build() {
2525
V1ContainerStatus buildable = new V1ContainerStatus();
2626
buildable.setAllocatedResources(fluent.getAllocatedResources());
27+
buildable.setAllocatedResourcesStatus(fluent.buildAllocatedResourcesStatus());
2728
buildable.setContainerID(fluent.getContainerID());
2829
buildable.setImage(fluent.getImage());
2930
buildable.setImageID(fluent.getImageID());
@@ -34,6 +35,7 @@ public V1ContainerStatus build() {
3435
buildable.setRestartCount(fluent.getRestartCount());
3536
buildable.setStarted(fluent.getStarted());
3637
buildable.setState(fluent.buildState());
38+
buildable.setUser(fluent.buildUser());
3739
buildable.setVolumeMounts(fluent.buildVolumeMounts());
3840
return buildable;
3941
}

0 commit comments

Comments
 (0)