diff --git a/pom.xml b/pom.xml
index 01bc31d4..a50d9528 100644
--- a/pom.xml
+++ b/pom.xml
@@ -40,10 +40,12 @@
https://sonarcloud.io
5.9.2
- 6.2.0
+ 6.5.1
1.7.32
2.17.1
5.2.0
+ 5.2.0
+ 3.5.2
3.12.0
1.0.1
3.21.0
@@ -64,7 +66,6 @@
3.0.1
3.2.1
2.7.3
- 3.1.2
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..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,16 +39,21 @@ public static void applyAndWait(KubernetesClient client, InputStream is) {
applyAndWait(client, is, null);
}
- public static void applyAndWait(KubernetesClient client, InputStream is,
- UnaryOperator transfor) {
- var resources = client.load(is).get();
- if (transfor != null) {
- resources = resources.stream().map(transfor).collect(Collectors.toList());
+ public static void applyAndWait(KubernetesClient client, List resources,
+ UnaryOperator transformer) {
+ if (transformer != null) {
+ resources = resources.stream().map(transformer).collect(Collectors.toList());
}
- client.resourceList(resources).createOrReplace();
+ client.resourceList(resources).create();
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..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
@@ -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,24 @@ 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);
+ }
+
+ 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);
+ }
+ }
}
diff --git a/samples/spring-boot/pom.xml b/samples/spring-boot/pom.xml
index 45ff2669..182ce808 100644
--- a/samples/spring-boot/pom.xml
+++ b/samples/spring-boot/pom.xml
@@ -49,18 +49,6 @@
reactor-test
test
-
- io.dekorate
- kubernetes-spring-starter
-
-
- io.dekorate
- certmanager-annotations
-
-
- io.dekorate
- jib-annotations
-
io.javaoperatorsdk
kubernetes-webhooks-framework-core
@@ -84,15 +72,21 @@
io.javaoperatorsdk.admissioncontroller.sample
sample-commons
${project.version}
-
-
- kubernetes-client
- io.fabric8
-
-
test-jar
test
+
+ io.dekorate
+ kubernetes-spring-starter
+
+
+ io.dekorate
+ certmanager-annotations
+
+
+ io.dekorate
+ jib-annotations
+