Skip to content

Commit 9a33d3b

Browse files
rjeberhardrjeberhard
committed
Revert "Kubernetes Java Client 10.0.0 (#1937)"
This reverts commit 8c9d572.
1 parent 89716de commit 9a33d3b

File tree

7 files changed

+79
-31
lines changed

7 files changed

+79
-31
lines changed

‎docs/charts/index.yaml

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,116 +3,178 @@ entries:
33
weblogic-operator:
44
- apiVersion: v1
55
appVersion: 3.1.0
6+
<<<<<<< HEAD
67
created: "2020-09-22T14:11:10.76725-04:00"
78
description: Helm chart for configuring the WebLogic operator.
89
digest: 91ef6ff10ff571364ec1393273f752c00607b633730228ebad9997a9901b675c
10+
=======
11+
created: "2020-09-16T21:57:54.167065-04:00"
12+
description: Helm chart for configuring the WebLogic operator.
13+
digest: d5895a15f656a4f4988137ce75584def1ef217a0756473eb3b9c67e9aedc7c0a
14+
>>>>>>> parent of 8c9d57208... Kubernetes Java Client 10.0.0 (#1937)
915
name: weblogic-operator
1016
type: application
1117
urls:
1218
- https://oracle.github.io/weblogic-kubernetes-operator/charts/weblogic-operator-3.1.0.tgz
1319
version: 3.1.0
1420
- apiVersion: v1
21+
<<<<<<< HEAD
1522
created: "2020-09-22T14:11:10.76297-04:00"
23+
=======
24+
created: "2020-09-16T21:57:54.162608-04:00"
25+
>>>>>>> parent of 8c9d57208... Kubernetes Java Client 10.0.0 (#1937)
1626
description: Helm chart for configuring the WebLogic operator.
1727
digest: 84b5989fe8f2392d2b3b0f721bdab1562566d7d885324beafd9fc9e658b13cd3
1828
name: weblogic-operator
1929
urls:
2030
- https://oracle.github.io/weblogic-kubernetes-operator/charts/weblogic-operator-3.0.2.tgz
2131
version: 3.0.2
2232
- apiVersion: v1
33+
<<<<<<< HEAD
2334
created: "2020-09-22T14:11:10.760368-04:00"
35+
=======
36+
created: "2020-09-16T21:57:54.155889-04:00"
37+
>>>>>>> parent of 8c9d57208... Kubernetes Java Client 10.0.0 (#1937)
2438
description: Helm chart for configuring the WebLogic operator.
2539
digest: e7654ad3f2168f54b3a4b133bf8a86ea12bc474e5ee1d3ab14e1cf53012e9772
2640
name: weblogic-operator
2741
urls:
2842
- https://oracle.github.io/weblogic-kubernetes-operator/charts/weblogic-operator-3.0.1.tgz
2943
version: 3.0.1
3044
- apiVersion: v1
45+
<<<<<<< HEAD
3146
created: "2020-09-22T14:11:10.758061-04:00"
47+
=======
48+
created: "2020-09-16T21:57:54.154276-04:00"
49+
>>>>>>> parent of 8c9d57208... Kubernetes Java Client 10.0.0 (#1937)
3250
description: Helm chart for configuring the WebLogic operator.
3351
digest: 5c7c0d3ae797e98592b6fd2191b104f515d6649d0060af0a3ffef215d4c69864
3452
name: weblogic-operator
3553
urls:
3654
- https://oracle.github.io/weblogic-kubernetes-operator/charts/weblogic-operator-3.0.0.tgz
3755
version: 3.0.0
3856
- apiVersion: v1
57+
<<<<<<< HEAD
3958
created: "2020-09-22T14:11:10.756096-04:00"
59+
=======
60+
created: "2020-09-16T21:57:54.152501-04:00"
61+
>>>>>>> parent of 8c9d57208... Kubernetes Java Client 10.0.0 (#1937)
4062
description: Helm chart for configuring the WebLogic operator.
4163
digest: 5f4cd8f4f3282b52b5e90a1169f26986e8272671845053606ade9c855fb04151
4264
name: weblogic-operator
4365
urls:
4466
- https://oracle.github.io/weblogic-kubernetes-operator/charts/weblogic-operator-3.0.0-rc1.tgz
4567
version: 3.0.0-rc1
4668
- apiVersion: v1
69+
<<<<<<< HEAD
4770
created: "2020-09-22T14:11:10.754294-04:00"
71+
=======
72+
created: "2020-09-16T21:57:54.150228-04:00"
73+
>>>>>>> parent of 8c9d57208... Kubernetes Java Client 10.0.0 (#1937)
4874
description: Helm chart for configuring the WebLogic operator.
4975
digest: d441888a8deae1b1339e7585e3b437dfd2533303e46e842d7378e16db665e234
5076
name: weblogic-operator
5177
urls:
5278
- https://oracle.github.io/weblogic-kubernetes-operator/charts/weblogic-operator-2.6.0.tgz
5379
version: 2.6.0
5480
- apiVersion: v1
81+
<<<<<<< HEAD
5582
created: "2020-09-22T14:11:10.752652-04:00"
83+
=======
84+
created: "2020-09-16T21:57:54.141786-04:00"
85+
>>>>>>> parent of 8c9d57208... Kubernetes Java Client 10.0.0 (#1937)
5686
description: Helm chart for configuring the WebLogic operator.
5787
digest: fe41421b7dc45dc8a3b2888d3a626a37f5d3c8e1fa292fb6699deedc5e1db33d
5888
name: weblogic-operator
5989
urls:
6090
- https://oracle.github.io/weblogic-kubernetes-operator/charts/weblogic-operator-2.5.0.tgz
6191
version: 2.5.0
6292
- apiVersion: v1
93+
<<<<<<< HEAD
6394
created: "2020-09-22T14:11:10.750803-04:00"
95+
=======
96+
created: "2020-09-16T21:57:54.132965-04:00"
97+
>>>>>>> parent of 8c9d57208... Kubernetes Java Client 10.0.0 (#1937)
6498
description: Helm chart for configuring the WebLogic operator.
6599
digest: b36bd32083f67453a62d089a2c09ce38e6655d88ac8a7b38691230c55c40e672
66100
name: weblogic-operator
67101
urls:
68102
- https://oracle.github.io/weblogic-kubernetes-operator/charts/weblogic-operator-2.4.0.tgz
69103
version: 2.4.0
70104
- apiVersion: v1
105+
<<<<<<< HEAD
71106
created: "2020-09-22T14:11:10.748925-04:00"
107+
=======
108+
created: "2020-09-16T21:57:54.128905-04:00"
109+
>>>>>>> parent of 8c9d57208... Kubernetes Java Client 10.0.0 (#1937)
72110
description: Helm chart for configuring the WebLogic operator.
73111
digest: a3eafe4c2c6ff49384e56421201e59a3737d651af8d5b605b87a19eb1f6f1dc3
74112
name: weblogic-operator
75113
urls:
76114
- https://oracle.github.io/weblogic-kubernetes-operator/charts/weblogic-operator-2.3.1.tgz
77115
version: 2.3.1
78116
- apiVersion: v1
117+
<<<<<<< HEAD
79118
created: "2020-09-22T14:11:10.74211-04:00"
119+
=======
120+
created: "2020-09-16T21:57:54.110592-04:00"
121+
>>>>>>> parent of 8c9d57208... Kubernetes Java Client 10.0.0 (#1937)
80122
description: Helm chart for configuring the WebLogic operator.
81123
digest: cbc6caaa6eb28e3c7e906ede14b2ae511a0b35fc12a8e3ab629155b09993e8b2
82124
name: weblogic-operator
83125
urls:
84126
- https://oracle.github.io/weblogic-kubernetes-operator/charts/weblogic-operator-2.3.0.tgz
85127
version: 2.3.0
86128
- apiVersion: v1
129+
<<<<<<< HEAD
87130
created: "2020-09-22T14:11:10.740613-04:00"
131+
=======
132+
created: "2020-09-16T21:57:54.104641-04:00"
133+
>>>>>>> parent of 8c9d57208... Kubernetes Java Client 10.0.0 (#1937)
88134
description: Helm chart for configuring the WebLogic operator.
89135
digest: 23d5a1c554fa8211cc1e86b7ade09460917cb2069e68fb4bfdddafc8db44fdcd
90136
name: weblogic-operator
91137
urls:
92138
- https://oracle.github.io/weblogic-kubernetes-operator/charts/weblogic-operator-2.2.1.tgz
93139
version: 2.2.1
94140
- apiVersion: v1
141+
<<<<<<< HEAD
95142
created: "2020-09-22T14:11:10.739251-04:00"
143+
=======
144+
created: "2020-09-16T21:57:54.102894-04:00"
145+
>>>>>>> parent of 8c9d57208... Kubernetes Java Client 10.0.0 (#1937)
96146
description: Helm chart for configuring the WebLogic operator.
97147
digest: bba303686cb55d84fe8c0d693a2436e7e686b028085b56e012f6381699a3911f
98148
name: weblogic-operator
99149
urls:
100150
- https://oracle.github.io/weblogic-kubernetes-operator/charts/weblogic-operator-2.2.0.tgz
101151
version: 2.2.0
102152
- apiVersion: v1
153+
<<<<<<< HEAD
103154
created: "2020-09-22T14:11:10.737753-04:00"
155+
=======
156+
created: "2020-09-16T21:57:54.095856-04:00"
157+
>>>>>>> parent of 8c9d57208... Kubernetes Java Client 10.0.0 (#1937)
104158
description: Helm chart for configuring the WebLogic operator.
105159
digest: 391e23c0969ada5f0cd2a088ddc6f11f237f57521801ed3925db2149a8437a0d
106160
name: weblogic-operator
107161
urls:
108162
- https://oracle.github.io/weblogic-kubernetes-operator/charts/weblogic-operator-2.1.tgz
109163
version: "2.1"
110164
- apiVersion: v1
165+
<<<<<<< HEAD
111166
created: "2020-09-22T14:11:10.711243-04:00"
167+
=======
168+
created: "2020-09-16T21:57:54.09406-04:00"
169+
>>>>>>> parent of 8c9d57208... Kubernetes Java Client 10.0.0 (#1937)
112170
description: Helm chart for configuring the WebLogic operator.
113171
digest: 298acda78ab73db6b7ba6f2752311bfa40c65874e03fb196b70976192211c1a5
114172
name: weblogic-operator
115173
urls:
116174
- https://oracle.github.io/weblogic-kubernetes-operator/charts/weblogic-operator-2.0.1.tgz
117175
version: 2.0.1
176+
<<<<<<< HEAD
118177
generated: "2020-09-22T14:11:10.709391-04:00"
178+
=======
179+
generated: "2020-09-16T21:57:54.086387-04:00"
180+
>>>>>>> parent of 8c9d57208... Kubernetes Java Client 10.0.0 (#1937)

‎kubernetes/crd/domain-crd.yaml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -317,8 +317,6 @@ spec:
317317
type: string
318318
gmsaCredentialSpecName:
319319
type: string
320-
fsGroupChangePolicy:
321-
type: string
322320
supplementalGroups:
323321
type: array
324322
items:
@@ -2830,8 +2828,6 @@ spec:
28302828
type: string
28312829
gmsaCredentialSpecName:
28322830
type: string
2833-
fsGroupChangePolicy:
2834-
type: string
28352831
supplementalGroups:
28362832
type: array
28372833
items:
@@ -5351,8 +5347,6 @@ spec:
53515347
type: string
53525348
gmsaCredentialSpecName:
53535349
type: string
5354-
fsGroupChangePolicy:
5355-
type: string
53565350
supplementalGroups:
53575351
type: array
53585352
items:
@@ -7750,8 +7744,6 @@ spec:
77507744
type: string
77517745
gmsaCredentialSpecName:
77527746
type: string
7753-
fsGroupChangePolicy:
7754-
type: string
77557747
supplementalGroups:
77567748
type: array
77577749
items:

‎kubernetes/crd/domain-v1beta1-crd.yaml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -318,8 +318,6 @@ spec:
318318
type: string
319319
gmsaCredentialSpecName:
320320
type: string
321-
fsGroupChangePolicy:
322-
type: string
323321
supplementalGroups:
324322
type: array
325323
items:
@@ -2821,8 +2819,6 @@ spec:
28212819
type: string
28222820
gmsaCredentialSpecName:
28232821
type: string
2824-
fsGroupChangePolicy:
2825-
type: string
28262822
supplementalGroups:
28272823
type: array
28282824
items:
@@ -5335,8 +5331,6 @@ spec:
53355331
type: string
53365332
gmsaCredentialSpecName:
53375333
type: string
5338-
fsGroupChangePolicy:
5339-
type: string
53405334
supplementalGroups:
53415335
type: array
53425336
items:
@@ -7732,8 +7726,6 @@ spec:
77327726
type: string
77337727
gmsaCredentialSpecName:
77347728
type: string
7735-
fsGroupChangePolicy:
7736-
type: string
77377729
supplementalGroups:
77387730
type: array
77397731
items:

‎operator/src/main/java/oracle/kubernetes/operator/helpers/CallBuilder.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,7 @@ public <T> T execute(
311311
requestParams.namespace,
312312
(V1DeleteOptions) requestParams.body,
313313
callback));
314-
private final CallFactory<V1Pod> deletePod =
314+
private final CallFactory<V1Status> deletePod =
315315
(requestParams, usage, cont, callback) ->
316316
wrap(
317317
deletePodAsync(
@@ -339,7 +339,7 @@ public <T> T execute(
339339
requestParams.namespace,
340340
(V1DeleteOptions) requestParams.body,
341341
callback));
342-
private final CallFactory<V1PersistentVolume> deletePersistentvolume =
342+
private final CallFactory<V1Status> deletePersistentvolume =
343343
(requestParams, client, cont, callback) ->
344344
wrap(
345345
new CoreV1Api(client)
@@ -352,7 +352,7 @@ public <T> T execute(
352352
propagationPolicy,
353353
(V1DeleteOptions) requestParams.body,
354354
callback));
355-
private final CallFactory<V1PersistentVolumeClaim> deletePersistentvolumeclaim =
355+
private final CallFactory<V1Status> deletePersistentvolumeclaim =
356356
(requestParams, client, cont, callback) ->
357357
wrap(
358358
new CoreV1Api(client)
@@ -404,7 +404,7 @@ public <T> T execute(
404404
(client, requestParams) ->
405405
new CoreV1Api(client)
406406
.createPersistentVolume((V1PersistentVolume) requestParams.body, pretty, null, null);
407-
private SynchronousCallFactory<V1PersistentVolume> deletePvCall =
407+
private SynchronousCallFactory<V1Status> deletePvCall =
408408
(client, requestParams) ->
409409
new CoreV1Api(client)
410410
.deletePersistentVolume(
@@ -424,7 +424,7 @@ public <T> T execute(
424424
pretty,
425425
null,
426426
null);
427-
private SynchronousCallFactory<V1PersistentVolumeClaim> deletePvcCall =
427+
private SynchronousCallFactory<V1Status> deletePvcCall =
428428
(client, requestParams) ->
429429
new CoreV1Api(client)
430430
.deleteNamespacedPersistentVolumeClaim(
@@ -1162,7 +1162,7 @@ private Call deletePodAsync(
11621162
String name,
11631163
String namespace,
11641164
V1DeleteOptions deleteOptions,
1165-
ApiCallback<V1Pod> callback)
1165+
ApiCallback<V1Status> callback)
11661166
throws ApiException {
11671167
return new CoreV1Api(client)
11681168
.deleteNamespacedPodAsync(
@@ -1192,7 +1192,7 @@ public Step deletePodAsync(
11921192
String namespace,
11931193
String domainUid,
11941194
V1DeleteOptions deleteOptions,
1195-
ResponseStep<V1Pod> responseStep) {
1195+
ResponseStep<V1Status> responseStep) {
11961196
return createRequestAsync(
11971197
responseStep, new RequestParams("deletePod", namespace, name, deleteOptions, domainUid),
11981198
deletePod, retryStrategy);

‎operator/src/main/java/oracle/kubernetes/operator/helpers/PodStepContext.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
import io.kubernetes.client.openapi.models.V1PodSpec;
3131
import io.kubernetes.client.openapi.models.V1Probe;
3232
import io.kubernetes.client.openapi.models.V1SecretVolumeSource;
33+
import io.kubernetes.client.openapi.models.V1Status;
3334
import io.kubernetes.client.openapi.models.V1Volume;
3435
import io.kubernetes.client.openapi.models.V1VolumeMount;
3536
import oracle.kubernetes.operator.DomainSourceType;
@@ -411,7 +412,7 @@ private ResponseStep<V1Pod> createResponse(Step next) {
411412
return new CreateResponseStep(next);
412413
}
413414

414-
private ResponseStep<V1Pod> deleteResponse(Step next) {
415+
private ResponseStep<V1Status> deleteResponse(Step next) {
415416
return new DeleteResponseStep(next);
416417
}
417418

@@ -874,7 +875,7 @@ public NextAction onSuccess(Packet packet, CallResponse<V1Pod> callResponse) {
874875
}
875876
}
876877

877-
private class DeleteResponseStep extends ResponseStep<V1Pod> {
878+
private class DeleteResponseStep extends ResponseStep<V1Status> {
878879
DeleteResponseStep(Step next) {
879880
super(next);
880881
}
@@ -884,15 +885,15 @@ protected String getDetail() {
884885
}
885886

886887
@Override
887-
public NextAction onFailure(Packet packet, CallResponse<V1Pod> callResponses) {
888+
public NextAction onFailure(Packet packet, CallResponse<V1Status> callResponses) {
888889
if (callResponses.getStatusCode() == CallBuilder.NOT_FOUND) {
889890
return onSuccess(packet, callResponses);
890891
}
891892
return super.onFailure(getConflictStep(), packet, callResponses);
892893
}
893894

894895
@Override
895-
public NextAction onSuccess(Packet packet, CallResponse<V1Pod> callResponses) {
896+
public NextAction onSuccess(Packet packet, CallResponse<V1Status> callResponses) {
896897
return doNext(replacePod(getNext()), packet);
897898
}
898899
}

‎operator/src/test/java/oracle/kubernetes/operator/helpers/KubernetesTestSupportTest.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
import io.kubernetes.client.openapi.models.V1SecretList;
2929
import io.kubernetes.client.openapi.models.V1Service;
3030
import io.kubernetes.client.openapi.models.V1ServiceList;
31+
import io.kubernetes.client.openapi.models.V1Status;
3132
import io.kubernetes.client.openapi.models.V1SubjectAccessReview;
3233
import io.kubernetes.client.openapi.models.V1TokenReview;
3334
import oracle.kubernetes.operator.calls.CallResponse;
@@ -367,7 +368,7 @@ public void afterDeletePod_podsInDifferentNamespacesStillExist() {
367368
V1Pod pod3 = createPod("ns3", "another");
368369
testSupport.defineResources(pod1, pod2, pod3);
369370

370-
TestResponseStep<V1Pod> responseStep = new TestResponseStep<>();
371+
TestResponseStep<V1Status> responseStep = new TestResponseStep<>();
371372
testSupport.runSteps(new CallBuilder().deletePodAsync("mycrd", "ns2", "", null, responseStep));
372373

373374
assertThat(testSupport.getResources(POD), containsInAnyOrder(pod1, pod3));
@@ -377,7 +378,7 @@ public void afterDeletePod_podsInDifferentNamespacesStillExist() {
377378
public void whenHttpErrorAssociatedWithResource_callResponseIsError() {
378379
testSupport.failOnResource(POD, "pod1", "ns2", HTTP_BAD_REQUEST);
379380

380-
TestResponseStep<V1Pod> responseStep = new TestResponseStep<>();
381+
TestResponseStep<V1Status> responseStep = new TestResponseStep<>();
381382
testSupport.runSteps(new CallBuilder().deletePodAsync("pod1", "ns2", "", null, responseStep));
382383

383384
testSupport.verifyCompletionThrowable(FailureStatusSourceException.class);
@@ -388,7 +389,7 @@ public void whenHttpErrorAssociatedWithResource_callResponseIsError() {
388389
public void whenHttpErrorNotAssociatedWithResource_ignoreIt() {
389390
testSupport.failOnResource(POD, "pod1", "ns2", HTTP_BAD_REQUEST);
390391

391-
TestResponseStep<V1Pod> responseStep = new TestResponseStep<>();
392+
TestResponseStep<V1Status> responseStep = new TestResponseStep<>();
392393
testSupport.runSteps(new CallBuilder().deletePodAsync("pod2", "ns2", "", null, responseStep));
393394
}
394395

0 commit comments

Comments
 (0)