Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 1 addition & 5 deletions .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,8 @@ jobs:
strategy:
matrix:
java: [ 11, 17 ]
kubernetes: [ 'v1.17.17','v1.18.20','v1.19.16','v1.20.15','v1.21.12', 'v1.22.9', 'v1.23.6', 'v1.24.0' ]
kubernetes: ['v1.20.15','v1.21.12', 'v1.22.9', 'v1.23.6', 'v1.24.0' ]
exclude:
- java: 11
kubernetes: 'v1.18.20'
- java: 11
kubernetes: 'v1.19.16'
- java: 11
kubernetes: 'v1.20.15'
- java: 11
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
import java.time.Duration;
import java.util.Map;

import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension;

Expand Down Expand Up @@ -48,7 +47,6 @@ void noOptimisticLockingDoneOnStatusUpdate() throws InterruptedException {
}

// see https://github.com/fabric8io/kubernetes-client/issues/4158
@Disabled("Patch generated supported by K8S version below 1.20.x")
@Test
void valuesAreDeletedIfSetToNull() {
var resource = operator.create(StatusPatchLockingCustomResource.class, createResource());
Expand All @@ -71,7 +69,6 @@ void valuesAreDeletedIfSetToNull() {
});
}


StatusPatchLockingCustomResource createResource() {
StatusPatchLockingCustomResource res = new StatusPatchLockingCustomResource();
res.setSpec(new StatusPatchLockingCustomResourceSpec());
Expand Down