chore: update sample to Quarkus 3 (#104)

Author: csviri

samples/quarkus/pom.xml

@@ -17,8 +17,9 @@
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     <quarkus.platform.artifact-id>quarkus-bom</quarkus.platform.artifact-id>
     <quarkus.platform.group-id>io.quarkus.platform</quarkus.platform.group-id>
-    <quarkus.platform.version>2.16.6.Final</quarkus.platform.version>
+    <quarkus.platform.version>3.0.1.Final</quarkus.platform.version>
     <surefire-plugin.version>3.0.0</surefire-plugin.version>
+    <slf4j.version>2.0.6</slf4j.version>
   </properties>
   <dependencyManagement>
     <dependencies>

samples/quarkus/src/main/java/io/javaoperatorsdk/webhook/sample/admission/AdmissionControllerConfig.java

@@ -1,13 +1,13 @@
 package io.javaoperatorsdk.webhook.sample.admission;
 
-import javax.inject.Named;
-import javax.inject.Singleton;
-
 import io.fabric8.kubernetes.api.model.networking.v1.Ingress;
 import io.javaoperatorsdk.webhook.admission.AdmissionController;
 import io.javaoperatorsdk.webhook.admission.AsyncAdmissionController;
 import io.javaoperatorsdk.webhook.sample.commons.AdmissionControllers;
 
+import jakarta.inject.Named;
+import jakarta.inject.Singleton;
+
 public class AdmissionControllerConfig {
 
   public static final String MUTATING_CONTROLLER = "mutatingController";

samples/quarkus/src/main/java/io/javaoperatorsdk/webhook/sample/admission/AdmissionEndpoint.java

@@ -1,16 +1,19 @@
 package io.javaoperatorsdk.webhook.sample.admission;
 
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.ws.rs.*;
-import javax.ws.rs.core.MediaType;
-
 import io.fabric8.kubernetes.api.model.admission.v1.AdmissionReview;
 import io.fabric8.kubernetes.api.model.networking.v1.Ingress;
 import io.javaoperatorsdk.webhook.admission.AdmissionController;
 import io.javaoperatorsdk.webhook.admission.AsyncAdmissionController;
 import io.smallrye.mutiny.Uni;
 
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.MediaType;
+
 @Path("/")
 public class AdmissionEndpoint {
 

samples/quarkus/src/main/java/io/javaoperatorsdk/webhook/sample/conversion/ConversionControllerConfig.java

@@ -1,11 +1,11 @@
 package io.javaoperatorsdk.webhook.sample.conversion;
 
-import javax.inject.Singleton;
-
 import io.javaoperatorsdk.webhook.conversion.AsyncConversionController;
 import io.javaoperatorsdk.webhook.conversion.ConversionController;
 import io.javaoperatorsdk.webhook.sample.commons.ConversionControllers;
 
+import jakarta.inject.Singleton;
+
 public class ConversionControllerConfig {
 
   @Singleton

samples/quarkus/src/main/java/io/javaoperatorsdk/webhook/sample/conversion/ConversionEndpoint.java

@@ -1,16 +1,16 @@
 package io.javaoperatorsdk.webhook.sample.conversion;
 
-import javax.ws.rs.Consumes;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-
 import io.fabric8.kubernetes.api.model.apiextensions.v1.ConversionReview;
 import io.javaoperatorsdk.webhook.conversion.AsyncConversionController;
 import io.javaoperatorsdk.webhook.conversion.ConversionController;
 import io.smallrye.mutiny.Uni;
 
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.MediaType;
+
 import static io.javaoperatorsdk.webhook.sample.commons.ConversionControllers.ASYNC_CONVERSION_PATH;
 import static io.javaoperatorsdk.webhook.sample.commons.ConversionControllers.CONVERSION_PATH;
 

samples/quarkus/src/main/resources/application.properties

@@ -3,7 +3,6 @@ quarkus.http.port=80
 quarkus.http.ssl-port=443
 
 quarkus.kubernetes.image-pull-policy=IfNotPresent
-quarkus.kubernetes.ports."tls".container-port=443
 
 ## To generate the Certificate and the Issuer resources
 quarkus.certificate.secret-name=tls-secret

samples/quarkus/src/test/java/io/javaoperatorsdk/webhook/sample/QuarkusWebhooksE2E.java

@@ -1,15 +1,13 @@
 package io.javaoperatorsdk.webhook.sample;
 
-import java.io.*;
+import java.io.IOException;
+import java.io.InputStream;
 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;
@@ -33,25 +31,4 @@ static void deployService() throws IOException {
       waitForCoreDNS(client);
     }
   }
-
-  // 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<HasMetadata> 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);
-    }
-  }
 }

samples/quarkus/src/test/java/io/javaoperatorsdk/webhook/sample/admission/AdditionalAdmissionConfig.java

@@ -1,13 +1,13 @@
 package io.javaoperatorsdk.webhook.sample.admission;
 
-import javax.inject.Named;
-import javax.inject.Singleton;
-
 import io.fabric8.kubernetes.api.model.networking.v1.Ingress;
 import io.javaoperatorsdk.webhook.admission.AdmissionController;
 import io.javaoperatorsdk.webhook.admission.AsyncAdmissionController;
 import io.javaoperatorsdk.webhook.sample.commons.AdmissionControllers;
 
+import jakarta.inject.Named;
+import jakarta.inject.Singleton;
+
 public class AdditionalAdmissionConfig {
 
   public static final String ERROR_MUTATING_CONTROLLER = "errorMutatingController";

samples/quarkus/src/test/java/io/javaoperatorsdk/webhook/sample/admission/AdmissionAdditionalTestEndpoint.java

@@ -1,19 +1,19 @@
 package io.javaoperatorsdk.webhook.sample.admission;
 
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-
 import io.fabric8.kubernetes.api.model.admission.v1.AdmissionReview;
 import io.fabric8.kubernetes.api.model.networking.v1.Ingress;
 import io.javaoperatorsdk.webhook.admission.AdmissionController;
 import io.javaoperatorsdk.webhook.admission.AsyncAdmissionController;
 import io.smallrye.mutiny.Uni;
 
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.MediaType;
+
 @Path("/")
 public class AdmissionAdditionalTestEndpoint {