Skip to content

Kubernetes Java Client 10.0.0 #1937

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
merged 3 commits into from
Sep 22, 2020
Merged

Kubernetes Java Client 10.0.0 #1937

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
93402e2
Kubernetes Java Client 10.0.0
rjeberhard Sep 18, 2020
7e50f72
Merge remote-tracking branch 'origin/develop' into client-10.0.0
rjeberhard Sep 22, 2020
03eb5c0
Rebuild charts
rjeberhard Sep 22, 2020
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
32 changes: 16 additions & 16 deletions docs/charts/index.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,116 +3,116 @@ entries:
weblogic-operator:
- apiVersion: v1
appVersion: 3.1.0
created: "2020-09-16T21:57:54.167065-04:00"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We seem to have to update this file an awful lot. If it were published as a result of generating a website rather than updating the git repo, that wouldn't be necessary. Is it really so advantageous to avoid web site generation?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll open a JIRA to investigate how we can do this differently. I don't care when we do this. There is some concern that not doing it during the build means that we don't test the chart generation until we push to master.

Copy link
Member Author

@rjeberhard rjeberhard Sep 22, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

https://jira.****/jira/browse/OWLS-84737

created: "2020-09-22T10:35:23.016377-04:00"
description: Helm chart for configuring the WebLogic operator.
digest: d5895a15f656a4f4988137ce75584def1ef217a0756473eb3b9c67e9aedc7c0a
digest: 7c5003ad0cf9601fd99e298444585e8e5b7a04715792ab425e894a3c61abba6d
name: weblogic-operator
type: application
urls:
- https://oracle.github.io/weblogic-kubernetes-operator/charts/weblogic-operator-3.1.0.tgz
version: 3.1.0
- apiVersion: v1
created: "2020-09-16T21:57:54.162608-04:00"
created: "2020-09-22T10:35:23.013117-04:00"
description: Helm chart for configuring the WebLogic operator.
digest: 84b5989fe8f2392d2b3b0f721bdab1562566d7d885324beafd9fc9e658b13cd3
name: weblogic-operator
urls:
- https://oracle.github.io/weblogic-kubernetes-operator/charts/weblogic-operator-3.0.2.tgz
version: 3.0.2
- apiVersion: v1
created: "2020-09-16T21:57:54.155889-04:00"
created: "2020-09-22T10:35:23.010269-04:00"
description: Helm chart for configuring the WebLogic operator.
digest: e7654ad3f2168f54b3a4b133bf8a86ea12bc474e5ee1d3ab14e1cf53012e9772
name: weblogic-operator
urls:
- https://oracle.github.io/weblogic-kubernetes-operator/charts/weblogic-operator-3.0.1.tgz
version: 3.0.1
- apiVersion: v1
created: "2020-09-16T21:57:54.154276-04:00"
created: "2020-09-22T10:35:23.006389-04:00"
description: Helm chart for configuring the WebLogic operator.
digest: 5c7c0d3ae797e98592b6fd2191b104f515d6649d0060af0a3ffef215d4c69864
name: weblogic-operator
urls:
- https://oracle.github.io/weblogic-kubernetes-operator/charts/weblogic-operator-3.0.0.tgz
version: 3.0.0
- apiVersion: v1
created: "2020-09-16T21:57:54.152501-04:00"
created: "2020-09-22T10:35:23.003506-04:00"
description: Helm chart for configuring the WebLogic operator.
digest: 5f4cd8f4f3282b52b5e90a1169f26986e8272671845053606ade9c855fb04151
name: weblogic-operator
urls:
- https://oracle.github.io/weblogic-kubernetes-operator/charts/weblogic-operator-3.0.0-rc1.tgz
version: 3.0.0-rc1
- apiVersion: v1
created: "2020-09-16T21:57:54.150228-04:00"
created: "2020-09-22T10:35:23.000324-04:00"
description: Helm chart for configuring the WebLogic operator.
digest: d441888a8deae1b1339e7585e3b437dfd2533303e46e842d7378e16db665e234
name: weblogic-operator
urls:
- https://oracle.github.io/weblogic-kubernetes-operator/charts/weblogic-operator-2.6.0.tgz
version: 2.6.0
- apiVersion: v1
created: "2020-09-16T21:57:54.141786-04:00"
created: "2020-09-22T10:35:22.997678-04:00"
description: Helm chart for configuring the WebLogic operator.
digest: fe41421b7dc45dc8a3b2888d3a626a37f5d3c8e1fa292fb6699deedc5e1db33d
name: weblogic-operator
urls:
- https://oracle.github.io/weblogic-kubernetes-operator/charts/weblogic-operator-2.5.0.tgz
version: 2.5.0
- apiVersion: v1
created: "2020-09-16T21:57:54.132965-04:00"
created: "2020-09-22T10:35:22.994511-04:00"
description: Helm chart for configuring the WebLogic operator.
digest: b36bd32083f67453a62d089a2c09ce38e6655d88ac8a7b38691230c55c40e672
name: weblogic-operator
urls:
- https://oracle.github.io/weblogic-kubernetes-operator/charts/weblogic-operator-2.4.0.tgz
version: 2.4.0
- apiVersion: v1
created: "2020-09-16T21:57:54.128905-04:00"
created: "2020-09-22T10:35:22.990855-04:00"
description: Helm chart for configuring the WebLogic operator.
digest: a3eafe4c2c6ff49384e56421201e59a3737d651af8d5b605b87a19eb1f6f1dc3
name: weblogic-operator
urls:
- https://oracle.github.io/weblogic-kubernetes-operator/charts/weblogic-operator-2.3.1.tgz
version: 2.3.1
- apiVersion: v1
created: "2020-09-16T21:57:54.110592-04:00"
created: "2020-09-22T10:35:22.986371-04:00"
description: Helm chart for configuring the WebLogic operator.
digest: cbc6caaa6eb28e3c7e906ede14b2ae511a0b35fc12a8e3ab629155b09993e8b2
name: weblogic-operator
urls:
- https://oracle.github.io/weblogic-kubernetes-operator/charts/weblogic-operator-2.3.0.tgz
version: 2.3.0
- apiVersion: v1
created: "2020-09-16T21:57:54.104641-04:00"
created: "2020-09-22T10:35:22.978478-04:00"
description: Helm chart for configuring the WebLogic operator.
digest: 23d5a1c554fa8211cc1e86b7ade09460917cb2069e68fb4bfdddafc8db44fdcd
name: weblogic-operator
urls:
- https://oracle.github.io/weblogic-kubernetes-operator/charts/weblogic-operator-2.2.1.tgz
version: 2.2.1
- apiVersion: v1
created: "2020-09-16T21:57:54.102894-04:00"
created: "2020-09-22T10:35:22.974161-04:00"
description: Helm chart for configuring the WebLogic operator.
digest: bba303686cb55d84fe8c0d693a2436e7e686b028085b56e012f6381699a3911f
name: weblogic-operator
urls:
- https://oracle.github.io/weblogic-kubernetes-operator/charts/weblogic-operator-2.2.0.tgz
version: 2.2.0
- apiVersion: v1
created: "2020-09-16T21:57:54.095856-04:00"
created: "2020-09-22T10:35:22.968738-04:00"
description: Helm chart for configuring the WebLogic operator.
digest: 391e23c0969ada5f0cd2a088ddc6f11f237f57521801ed3925db2149a8437a0d
name: weblogic-operator
urls:
- https://oracle.github.io/weblogic-kubernetes-operator/charts/weblogic-operator-2.1.tgz
version: "2.1"
- apiVersion: v1
created: "2020-09-16T21:57:54.09406-04:00"
created: "2020-09-22T10:35:22.964251-04:00"
description: Helm chart for configuring the WebLogic operator.
digest: 298acda78ab73db6b7ba6f2752311bfa40c65874e03fb196b70976192211c1a5
name: weblogic-operator
urls:
- https://oracle.github.io/weblogic-kubernetes-operator/charts/weblogic-operator-2.0.1.tgz
version: 2.0.1
generated: "2020-09-16T21:57:54.086387-04:00"
generated: "2020-09-22T10:35:22.957399-04:00"
Binary file modified docs/charts/weblogic-operator-3.1.0.tgz
View file
Open in desktop
Binary file not shown.
8 changes: 8 additions & 0 deletions kubernetes/crd/domain-crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -317,6 +317,8 @@ spec:
type: string
gmsaCredentialSpecName:
type: string
fsGroupChangePolicy:
type: string
supplementalGroups:
type: array
items:
Expand Down Expand Up @@ -2828,6 +2830,8 @@ spec:
type: string
gmsaCredentialSpecName:
type: string
fsGroupChangePolicy:
type: string
supplementalGroups:
type: array
items:
Expand Down Expand Up @@ -5347,6 +5351,8 @@ spec:
type: string
gmsaCredentialSpecName:
type: string
fsGroupChangePolicy:
type: string
supplementalGroups:
type: array
items:
Expand Down Expand Up @@ -7744,6 +7750,8 @@ spec:
type: string
gmsaCredentialSpecName:
type: string
fsGroupChangePolicy:
type: string
supplementalGroups:
type: array
items:
Expand Down
8 changes: 8 additions & 0 deletions kubernetes/crd/domain-v1beta1-crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,6 +318,8 @@ spec:
type: string
gmsaCredentialSpecName:
type: string
fsGroupChangePolicy:
type: string
supplementalGroups:
type: array
items:
Expand Down Expand Up @@ -2819,6 +2821,8 @@ spec:
type: string
gmsaCredentialSpecName:
type: string
fsGroupChangePolicy:
type: string
supplementalGroups:
type: array
items:
Expand Down Expand Up @@ -5331,6 +5335,8 @@ spec:
type: string
gmsaCredentialSpecName:
type: string
fsGroupChangePolicy:
type: string
supplementalGroups:
type: array
items:
Expand Down Expand Up @@ -7726,6 +7732,8 @@ spec:
type: string
gmsaCredentialSpecName:
type: string
fsGroupChangePolicy:
type: string
supplementalGroups:
type: array
items:
Expand Down
14 changes: 7 additions & 7 deletions operator/src/main/java/oracle/kubernetes/operator/helpers/CallBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -311,7 +311,7 @@ public <T> T execute(
requestParams.namespace,
(V1DeleteOptions) requestParams.body,
callback));
private final CallFactory<V1Status> deletePod =
private final CallFactory<V1Pod> deletePod =
(requestParams, usage, cont, callback) ->
wrap(
deletePodAsync(
Expand Down Expand Up @@ -339,7 +339,7 @@ public <T> T execute(
requestParams.namespace,
(V1DeleteOptions) requestParams.body,
callback));
private final CallFactory<V1Status> deletePersistentvolume =
private final CallFactory<V1PersistentVolume> deletePersistentvolume =
(requestParams, client, cont, callback) ->
wrap(
new CoreV1Api(client)
Expand All @@ -352,7 +352,7 @@ public <T> T execute(
propagationPolicy,
(V1DeleteOptions) requestParams.body,
callback));
private final CallFactory<V1Status> deletePersistentvolumeclaim =
private final CallFactory<V1PersistentVolumeClaim> deletePersistentvolumeclaim =
(requestParams, client, cont, callback) ->
wrap(
new CoreV1Api(client)
Expand Down Expand Up @@ -404,7 +404,7 @@ public <T> T execute(
(client, requestParams) ->
new CoreV1Api(client)
.createPersistentVolume((V1PersistentVolume) requestParams.body, pretty, null, null);
private SynchronousCallFactory<V1Status> deletePvCall =
private SynchronousCallFactory<V1PersistentVolume> deletePvCall =
(client, requestParams) ->
new CoreV1Api(client)
.deletePersistentVolume(
Expand All @@ -424,7 +424,7 @@ public <T> T execute(
pretty,
null,
null);
private SynchronousCallFactory<V1Status> deletePvcCall =
private SynchronousCallFactory<V1PersistentVolumeClaim> deletePvcCall =
(client, requestParams) ->
new CoreV1Api(client)
.deleteNamespacedPersistentVolumeClaim(
Expand Down Expand Up @@ -1162,7 +1162,7 @@ private Call deletePodAsync(
String name,
String namespace,
V1DeleteOptions deleteOptions,
ApiCallback<V1Status> callback)
ApiCallback<V1Pod> callback)
throws ApiException {
return new CoreV1Api(client)
.deleteNamespacedPodAsync(
Expand Down Expand Up @@ -1192,7 +1192,7 @@ public Step deletePodAsync(
String namespace,
String domainUid,
V1DeleteOptions deleteOptions,
ResponseStep<V1Status> responseStep) {
ResponseStep<V1Pod> responseStep) {
return createRequestAsync(
responseStep, new RequestParams("deletePod", namespace, name, deleteOptions, domainUid),
deletePod, retryStrategy);
Expand Down
9 changes: 4 additions & 5 deletions operator/src/main/java/oracle/kubernetes/operator/helpers/PodStepContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
import io.kubernetes.client.openapi.models.V1PodSpec;
import io.kubernetes.client.openapi.models.V1Probe;
import io.kubernetes.client.openapi.models.V1SecretVolumeSource;
import io.kubernetes.client.openapi.models.V1Status;
import io.kubernetes.client.openapi.models.V1Volume;
import io.kubernetes.client.openapi.models.V1VolumeMount;
import oracle.kubernetes.operator.DomainSourceType;
Expand Down Expand Up @@ -412,7 +411,7 @@ private ResponseStep<V1Pod> createResponse(Step next) {
return new CreateResponseStep(next);
}

private ResponseStep<V1Status> deleteResponse(Step next) {
private ResponseStep<V1Pod> deleteResponse(Step next) {
return new DeleteResponseStep(next);
}

Expand Down Expand Up @@ -875,7 +874,7 @@ public NextAction onSuccess(Packet packet, CallResponse<V1Pod> callResponse) {
}
}

private class DeleteResponseStep extends ResponseStep<V1Status> {
private class DeleteResponseStep extends ResponseStep<V1Pod> {
DeleteResponseStep(Step next) {
super(next);
}
Expand All @@ -885,15 +884,15 @@ protected String getDetail() {
}

@Override
public NextAction onFailure(Packet packet, CallResponse<V1Status> callResponses) {
public NextAction onFailure(Packet packet, CallResponse<V1Pod> callResponses) {
if (callResponses.getStatusCode() == CallBuilder.NOT_FOUND) {
return onSuccess(packet, callResponses);
}
return super.onFailure(getConflictStep(), packet, callResponses);
}

@Override
public NextAction onSuccess(Packet packet, CallResponse<V1Status> callResponses) {
public NextAction onSuccess(Packet packet, CallResponse<V1Pod> callResponses) {
return doNext(replacePod(getNext()), packet);
}
}
Expand Down
7 changes: 3 additions & 4 deletions operator/src/test/java/oracle/kubernetes/operator/helpers/KubernetesTestSupportTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
import io.kubernetes.client.openapi.models.V1SecretList;
import io.kubernetes.client.openapi.models.V1Service;
import io.kubernetes.client.openapi.models.V1ServiceList;
import io.kubernetes.client.openapi.models.V1Status;
import io.kubernetes.client.openapi.models.V1SubjectAccessReview;
import io.kubernetes.client.openapi.models.V1TokenReview;
import oracle.kubernetes.operator.calls.CallResponse;
Expand Down Expand Up @@ -368,7 +367,7 @@ public void afterDeletePod_podsInDifferentNamespacesStillExist() {
V1Pod pod3 = createPod("ns3", "another");
testSupport.defineResources(pod1, pod2, pod3);

TestResponseStep<V1Status> responseStep = new TestResponseStep<>();
TestResponseStep<V1Pod> responseStep = new TestResponseStep<>();
testSupport.runSteps(new CallBuilder().deletePodAsync("mycrd", "ns2", "", null, responseStep));

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

TestResponseStep<V1Status> responseStep = new TestResponseStep<>();
TestResponseStep<V1Pod> responseStep = new TestResponseStep<>();
testSupport.runSteps(new CallBuilder().deletePodAsync("pod1", "ns2", "", null, responseStep));

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

TestResponseStep<V1Status> responseStep = new TestResponseStep<>();
TestResponseStep<V1Pod> responseStep = new TestResponseStep<>();
testSupport.runSteps(new CallBuilder().deletePodAsync("pod2", "ns2", "", null, responseStep));
}

Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -689,7 +689,7 @@
<assertj.core.version>3.15.0</assertj.core.version>
<commons.io.version>2.6</commons.io.version>
<awaitility-version>4.0.2</awaitility-version>
<client-java-version>9.0.2</client-java-version>
<client-java-version>10.0.0</client-java-version>
<junit.jupiter.version>5.6.0</junit.jupiter.version>
<junit.vintage.version>5.6.0</junit.vintage.version>
<junit.platform.version>1.6.0</junit.platform.version>
Expand Down