From e09a17f29dbe49d30ae8b29ea187cb9de7cca7f8 Mon Sep 17 00:00:00 2001 From: csviri Date: Fri, 24 Mar 2023 08:59:41 +0100 Subject: [PATCH 1/9] chore: fabric8 version --- pom.xml | 2 +- samples/spring-boot/pom.xml | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml index 01bc31d4..8eac003b 100644 --- a/pom.xml +++ b/pom.xml @@ -40,7 +40,7 @@ https://sonarcloud.io 5.9.2 - 6.2.0 + 6.5.1 1.7.32 2.17.1 5.2.0 diff --git a/samples/spring-boot/pom.xml b/samples/spring-boot/pom.xml index 45ff2669..fbde04c4 100644 --- a/samples/spring-boot/pom.xml +++ b/samples/spring-boot/pom.xml @@ -84,12 +84,6 @@ io.javaoperatorsdk.admissioncontroller.sample sample-commons ${project.version} - - - kubernetes-client - io.fabric8 - - test-jar test From 178f32bee48840e5a1e4084adfa5617e7c7d1263 Mon Sep 17 00:00:00 2001 From: csviri Date: Fri, 24 Mar 2023 12:01:16 +0100 Subject: [PATCH 2/9] dekorate version fix --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8eac003b..a213c47a 100644 --- a/pom.xml +++ b/pom.xml @@ -64,7 +64,7 @@ 3.0.1 3.2.1 2.7.3 - 3.1.2 + 3.5.2 From 96b585d4be64f2fef9caf421d8387944f63a7106 Mon Sep 17 00:00:00 2001 From: csviri Date: Fri, 24 Mar 2023 12:11:43 +0100 Subject: [PATCH 3/9] removing dekorate --- pom.xml | 40 ++++++++++++++++++------------------- samples/spring-boot/pom.xml | 24 +++++++++++----------- 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/pom.xml b/pom.xml index a213c47a..2ea221c0 100644 --- a/pom.xml +++ b/pom.xml @@ -124,26 +124,26 @@ json-patch ${json-patch.version} - - io.dekorate - kubernetes-spring-starter - ${dekorate.version} - - - io.dekorate - certmanager-annotations - ${dekorate.version} - - - io.dekorate - kubernetes-annotations - ${dekorate.version} - - - io.dekorate - jib-annotations - ${dekorate.version} - + + + + + + + + + + + + + + + + + + + + diff --git a/samples/spring-boot/pom.xml b/samples/spring-boot/pom.xml index fbde04c4..d29d8fe3 100644 --- a/samples/spring-boot/pom.xml +++ b/samples/spring-boot/pom.xml @@ -49,18 +49,18 @@ reactor-test test - - io.dekorate - kubernetes-spring-starter - - - io.dekorate - certmanager-annotations - - - io.dekorate - jib-annotations - + + + + + + + + + + + + io.javaoperatorsdk kubernetes-webhooks-framework-core From 0f24c1d049d44f1c9f64a2c00e287dd0981f10eb Mon Sep 17 00:00:00 2001 From: csviri Date: Fri, 24 Mar 2023 12:25:39 +0100 Subject: [PATCH 4/9] fix --- .../java/io/javaoperatorsdk/webhook/sample/commons/Utils.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/commons/src/main/java/io/javaoperatorsdk/webhook/sample/commons/Utils.java b/samples/commons/src/main/java/io/javaoperatorsdk/webhook/sample/commons/Utils.java index f9680aa2..f870ff75 100644 --- a/samples/commons/src/main/java/io/javaoperatorsdk/webhook/sample/commons/Utils.java +++ b/samples/commons/src/main/java/io/javaoperatorsdk/webhook/sample/commons/Utils.java @@ -41,7 +41,7 @@ public static void applyAndWait(KubernetesClient client, InputStream is) { public static void applyAndWait(KubernetesClient client, InputStream is, UnaryOperator transfor) { - var resources = client.load(is).get(); + var resources = client.load(is).items(); if (transfor != null) { resources = resources.stream().map(transfor).collect(Collectors.toList()); } From 2f148590e9c9a58fa03b848c272ee4225cb48a90 Mon Sep 17 00:00:00 2001 From: csviri Date: Fri, 24 Mar 2023 12:40:55 +0100 Subject: [PATCH 5/9] wip --- pom.xml | 21 ------------------- .../webhook/sample/commons/Utils.java | 4 ++-- samples/spring-boot/pom.xml | 12 ----------- 3 files changed, 2 insertions(+), 35 deletions(-) diff --git a/pom.xml b/pom.xml index 2ea221c0..c1a74c27 100644 --- a/pom.xml +++ b/pom.xml @@ -64,7 +64,6 @@ 3.0.1 3.2.1 2.7.3 - 3.5.2 @@ -124,26 +123,6 @@ json-patch ${json-patch.version} - - - - - - - - - - - - - - - - - - - - diff --git a/samples/commons/src/main/java/io/javaoperatorsdk/webhook/sample/commons/Utils.java b/samples/commons/src/main/java/io/javaoperatorsdk/webhook/sample/commons/Utils.java index f870ff75..7a61715d 100644 --- a/samples/commons/src/main/java/io/javaoperatorsdk/webhook/sample/commons/Utils.java +++ b/samples/commons/src/main/java/io/javaoperatorsdk/webhook/sample/commons/Utils.java @@ -41,11 +41,11 @@ public static void applyAndWait(KubernetesClient client, InputStream is) { public static void applyAndWait(KubernetesClient client, InputStream is, UnaryOperator transfor) { - var resources = client.load(is).items(); + var resources = client.load(is).get(); if (transfor != null) { resources = resources.stream().map(transfor).collect(Collectors.toList()); } - client.resourceList(resources).createOrReplace(); + client.resourceList(resources).create(); client.resourceList(resources).waitUntilReady(3, TimeUnit.MINUTES); } diff --git a/samples/spring-boot/pom.xml b/samples/spring-boot/pom.xml index d29d8fe3..258e6229 100644 --- a/samples/spring-boot/pom.xml +++ b/samples/spring-boot/pom.xml @@ -49,18 +49,6 @@ reactor-test test - - - - - - - - - - - - io.javaoperatorsdk kubernetes-webhooks-framework-core From 99ed47d6e64ec5e56a9c4f748d24e22d26ac3ff2 Mon Sep 17 00:00:00 2001 From: csviri Date: Fri, 24 Mar 2023 19:54:28 +0100 Subject: [PATCH 6/9] wip --- .../io/javaoperatorsdk/webhook/sample/commons/Utils.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/samples/commons/src/main/java/io/javaoperatorsdk/webhook/sample/commons/Utils.java b/samples/commons/src/main/java/io/javaoperatorsdk/webhook/sample/commons/Utils.java index 7a61715d..4ec825da 100644 --- a/samples/commons/src/main/java/io/javaoperatorsdk/webhook/sample/commons/Utils.java +++ b/samples/commons/src/main/java/io/javaoperatorsdk/webhook/sample/commons/Utils.java @@ -40,10 +40,10 @@ public static void applyAndWait(KubernetesClient client, InputStream is) { } public static void applyAndWait(KubernetesClient client, InputStream is, - UnaryOperator transfor) { + UnaryOperator transformer) { var resources = client.load(is).get(); - if (transfor != null) { - resources = resources.stream().map(transfor).collect(Collectors.toList()); + if (transformer != null) { + resources = resources.stream().map(transformer).collect(Collectors.toList()); } client.resourceList(resources).create(); client.resourceList(resources).waitUntilReady(3, TimeUnit.MINUTES); From 48e2cc4b20e6a28bb405d1f417305d8c8d6b8071 Mon Sep 17 00:00:00 2001 From: csviri Date: Tue, 28 Mar 2023 08:47:24 +0200 Subject: [PATCH 7/9] client version mismatch fix --- .../webhook/sample/commons/Utils.java | 9 +++++-- .../webhook/sample/QuarkusWebhooksE2E.java | 24 +++++++++++++++++-- 2 files changed, 29 insertions(+), 4 deletions(-) diff --git a/samples/commons/src/main/java/io/javaoperatorsdk/webhook/sample/commons/Utils.java b/samples/commons/src/main/java/io/javaoperatorsdk/webhook/sample/commons/Utils.java index 4ec825da..54e7680d 100644 --- a/samples/commons/src/main/java/io/javaoperatorsdk/webhook/sample/commons/Utils.java +++ b/samples/commons/src/main/java/io/javaoperatorsdk/webhook/sample/commons/Utils.java @@ -39,9 +39,8 @@ public static void applyAndWait(KubernetesClient client, InputStream is) { applyAndWait(client, is, null); } - public static void applyAndWait(KubernetesClient client, InputStream is, + public static void applyAndWait(KubernetesClient client, List resources, UnaryOperator transformer) { - var resources = client.load(is).get(); if (transformer != null) { resources = resources.stream().map(transformer).collect(Collectors.toList()); } @@ -49,6 +48,12 @@ public static void applyAndWait(KubernetesClient client, InputStream is, client.resourceList(resources).waitUntilReady(3, TimeUnit.MINUTES); } + public static void applyAndWait(KubernetesClient client, InputStream is, + UnaryOperator transformer) { + var resources = client.load(is).items(); + applyAndWait(client, resources, transformer); + } + public static void addRequiredLabels(Ingress ingress) { ingress.getMetadata().setLabels(Map.of(VALIDATION_TARGET_LABEL, "val")); } diff --git a/samples/quarkus/src/test/java/io/javaoperatorsdk/webhook/sample/QuarkusWebhooksE2E.java b/samples/quarkus/src/test/java/io/javaoperatorsdk/webhook/sample/QuarkusWebhooksE2E.java index be210d9b..bb63fa11 100644 --- a/samples/quarkus/src/test/java/io/javaoperatorsdk/webhook/sample/QuarkusWebhooksE2E.java +++ b/samples/quarkus/src/test/java/io/javaoperatorsdk/webhook/sample/QuarkusWebhooksE2E.java @@ -1,13 +1,15 @@ package io.javaoperatorsdk.webhook.sample; -import java.io.IOException; -import java.io.InputStream; +import java.io.*; import java.net.URL; +import java.util.function.UnaryOperator; import org.junit.jupiter.api.BeforeAll; +import io.fabric8.kubernetes.api.model.HasMetadata; import io.fabric8.kubernetes.client.KubernetesClient; import io.fabric8.kubernetes.client.KubernetesClientBuilder; +import io.javaoperatorsdk.webhook.sample.commons.Utils; import static io.javaoperatorsdk.webhook.sample.commons.Utils.addConversionHookEndpointToCustomResource; import static io.javaoperatorsdk.webhook.sample.commons.Utils.applyAndWait; @@ -32,4 +34,22 @@ static void deployService() throws IOException { } } + private static void applyAndWait(KubernetesClient client, InputStream is) { + var resources = client.load(is).get(); + Utils.applyAndWait(client, resources, null); + } + + private static void applyAndWait(KubernetesClient client, String file) { + applyAndWait(client, file, null); + } + + private static void applyAndWait(KubernetesClient client, String file, + UnaryOperator transformer) { + try (var fis = new FileInputStream(file)) { + var resources = client.load(fis).get(); + Utils.applyAndWait(client, resources, transformer); + } catch (IOException e) { + throw new IllegalStateException(e); + } + } } From 620bdeb7d0e03e327c4a9c9be4f7448300d52215 Mon Sep 17 00:00:00 2001 From: csviri Date: Tue, 28 Mar 2023 08:49:10 +0200 Subject: [PATCH 8/9] comment --- .../io/javaoperatorsdk/webhook/sample/QuarkusWebhooksE2E.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/samples/quarkus/src/test/java/io/javaoperatorsdk/webhook/sample/QuarkusWebhooksE2E.java b/samples/quarkus/src/test/java/io/javaoperatorsdk/webhook/sample/QuarkusWebhooksE2E.java index bb63fa11..210014f2 100644 --- a/samples/quarkus/src/test/java/io/javaoperatorsdk/webhook/sample/QuarkusWebhooksE2E.java +++ b/samples/quarkus/src/test/java/io/javaoperatorsdk/webhook/sample/QuarkusWebhooksE2E.java @@ -34,6 +34,8 @@ static void deployService() throws IOException { } } + // quarkus support uses an older version, these should be removed if quarkus will support newer + // version of fabric8 private static void applyAndWait(KubernetesClient client, InputStream is) { var resources = client.load(is).get(); Utils.applyAndWait(client, resources, null); From 4cbc1a48322f9f6efedbac84720b52a5538f90f0 Mon Sep 17 00:00:00 2001 From: csviri Date: Tue, 28 Mar 2023 09:36:45 +0200 Subject: [PATCH 9/9] dekorate deps back --- pom.xml | 22 ++++++++++++++++++++++ samples/spring-boot/pom.xml | 12 ++++++++++++ 2 files changed, 34 insertions(+) diff --git a/pom.xml b/pom.xml index c1a74c27..a50d9528 100644 --- a/pom.xml +++ b/pom.xml @@ -44,6 +44,8 @@ 1.7.32 2.17.1 5.2.0 + 5.2.0 + 3.5.2 3.12.0 1.0.1 3.21.0 @@ -123,6 +125,26 @@ json-patch ${json-patch.version} + + io.dekorate + kubernetes-spring-starter + ${dekorate.version} + + + io.dekorate + certmanager-annotations + ${dekorate.version} + + + io.dekorate + kubernetes-annotations + ${dekorate.version} + + + io.dekorate + jib-annotations + ${dekorate.version} + diff --git a/samples/spring-boot/pom.xml b/samples/spring-boot/pom.xml index 258e6229..182ce808 100644 --- a/samples/spring-boot/pom.xml +++ b/samples/spring-boot/pom.xml @@ -75,6 +75,18 @@ test-jar test + + io.dekorate + kubernetes-spring-starter + + + io.dekorate + certmanager-annotations + + + io.dekorate + jib-annotations +