From a30dee1d59a539deb35acb2c60edc90fc559291f Mon Sep 17 00:00:00 2001 From: csviri Date: Fri, 20 May 2022 16:09:04 +0200 Subject: [PATCH 1/2] feat: limited build to k8s >= 1.20.x --- .github/workflows/pr.yml | 2 +- .../io/javaoperatorsdk/operator/StatusPatchNotLockingIT.java | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 7e946cb8ff..1c16ab7b10 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -33,7 +33,7 @@ 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' 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()); From 5d1a3ce6df2744dd6790d41d5908883e50591bcf Mon Sep 17 00:00:00 2001 From: csviri Date: Mon, 23 May 2022 08:55:09 +0200 Subject: [PATCH 2/2] remove excludes --- .github/workflows/pr.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 1c16ab7b10..268b71946a 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -35,10 +35,6 @@ jobs: java: [ 11, 17 ] 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