diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 7e946cb8ff..268b71946a 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -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 diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/StatusPatchNotLockingIT.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/StatusPatchNotLockingIT.java index 6292da120c..d7c477a9ac 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/StatusPatchNotLockingIT.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/StatusPatchNotLockingIT.java @@ -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; @@ -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()); @@ -71,7 +69,6 @@ void valuesAreDeletedIfSetToNull() { }); } - StatusPatchLockingCustomResource createResource() { StatusPatchLockingCustomResource res = new StatusPatchLockingCustomResource(); res.setSpec(new StatusPatchLockingCustomResourceSpec());