From d9531cfbf531362418cb0834f44e25de48187a52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Attila=20M=C3=A9sz=C3=A1ros?= Date: Mon, 17 Mar 2025 11:03:59 +0100 Subject: [PATCH 1/3] improve: e2e tests MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Attila Mészáros --- .../webhook/sample/AbstractEndToEndTest.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/samples/commons/src/test/java/io/javaoperatorsdk/webhook/sample/AbstractEndToEndTest.java b/samples/commons/src/test/java/io/javaoperatorsdk/webhook/sample/AbstractEndToEndTest.java index 87857677..f97a16ea 100644 --- a/samples/commons/src/test/java/io/javaoperatorsdk/webhook/sample/AbstractEndToEndTest.java +++ b/samples/commons/src/test/java/io/javaoperatorsdk/webhook/sample/AbstractEndToEndTest.java @@ -4,6 +4,7 @@ import java.util.concurrent.TimeUnit; import java.util.function.Supplier; +import io.fabric8.kubernetes.client.ConfigBuilder; import org.junit.jupiter.api.Test; import io.fabric8.kubernetes.api.model.ObjectMetaBuilder; @@ -13,6 +14,8 @@ import io.javaoperatorsdk.webhook.sample.commons.customresource.MultiVersionCustomResource; import io.javaoperatorsdk.webhook.sample.commons.customresource.MultiVersionCustomResourceSpec; import io.javaoperatorsdk.webhook.sample.commons.customresource.MultiVersionCustomResourceV2; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import static io.javaoperatorsdk.webhook.sample.commons.AdmissionControllers.MUTATION_TARGET_LABEL; import static io.javaoperatorsdk.webhook.sample.commons.Utils.SPIN_UP_GRACE_PERIOD; @@ -25,7 +28,10 @@ @SuppressWarnings("deprecation") public abstract class AbstractEndToEndTest { - protected KubernetesClient client = new KubernetesClientBuilder().build(); + private static final Logger log = LoggerFactory.getLogger(AbstractEndToEndTest.class); + + protected KubernetesClient client = new KubernetesClientBuilder().withConfig(new ConfigBuilder() + .withNamespace("default").build()).build(); public static final String TEST_CR_NAME = "test-cr"; public static final int CR_SPEC_VALUE = 5; @@ -80,6 +86,7 @@ T avoidRequestTimeout(Supplier operator) { try { return operator.get(); } catch (KubernetesClientException e) { + log.warn("Applying resource. This might be expected.",e); return null; } } From 242ffb903861d55ee914c4d58f9eea8b5311c215 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Attila=20M=C3=A9sz=C3=A1ros?= Date: Mon, 17 Mar 2025 11:05:03 +0100 Subject: [PATCH 2/3] format MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Attila Mészáros --- .../webhook/sample/AbstractEndToEndTest.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/samples/commons/src/test/java/io/javaoperatorsdk/webhook/sample/AbstractEndToEndTest.java b/samples/commons/src/test/java/io/javaoperatorsdk/webhook/sample/AbstractEndToEndTest.java index f97a16ea..73afcb01 100644 --- a/samples/commons/src/test/java/io/javaoperatorsdk/webhook/sample/AbstractEndToEndTest.java +++ b/samples/commons/src/test/java/io/javaoperatorsdk/webhook/sample/AbstractEndToEndTest.java @@ -4,18 +4,18 @@ import java.util.concurrent.TimeUnit; import java.util.function.Supplier; -import io.fabric8.kubernetes.client.ConfigBuilder; import org.junit.jupiter.api.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import io.fabric8.kubernetes.api.model.ObjectMetaBuilder; +import io.fabric8.kubernetes.client.ConfigBuilder; import io.fabric8.kubernetes.client.KubernetesClient; import io.fabric8.kubernetes.client.KubernetesClientBuilder; import io.fabric8.kubernetes.client.KubernetesClientException; import io.javaoperatorsdk.webhook.sample.commons.customresource.MultiVersionCustomResource; import io.javaoperatorsdk.webhook.sample.commons.customresource.MultiVersionCustomResourceSpec; import io.javaoperatorsdk.webhook.sample.commons.customresource.MultiVersionCustomResourceV2; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import static io.javaoperatorsdk.webhook.sample.commons.AdmissionControllers.MUTATION_TARGET_LABEL; import static io.javaoperatorsdk.webhook.sample.commons.Utils.SPIN_UP_GRACE_PERIOD; @@ -31,7 +31,7 @@ public abstract class AbstractEndToEndTest { private static final Logger log = LoggerFactory.getLogger(AbstractEndToEndTest.class); protected KubernetesClient client = new KubernetesClientBuilder().withConfig(new ConfigBuilder() - .withNamespace("default").build()).build(); + .withNamespace("default").build()).build(); public static final String TEST_CR_NAME = "test-cr"; public static final int CR_SPEC_VALUE = 5; @@ -86,7 +86,7 @@ T avoidRequestTimeout(Supplier operator) { try { return operator.get(); } catch (KubernetesClientException e) { - log.warn("Applying resource. This might be expected.",e); + log.warn("Applying resource. This might be expected.", e); return null; } } From e9d3c67a0e486cc1261a598a6d1d9ea11284547e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Attila=20M=C3=A9sz=C3=A1ros?= Date: Mon, 17 Mar 2025 11:24:10 +0100 Subject: [PATCH 3/3] slf4j bump MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Attila Mészáros --- pom.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 0360bd3e..0b257630 100644 --- a/pom.xml +++ b/pom.xml @@ -52,7 +52,7 @@ 5.10.2 7.1.0 - 1.7.36 + 2.0.12 2.24.3 5.15.2 3.12.0 @@ -122,7 +122,6 @@ log4j-core ${log4j.version} -