refactor: move conversion hook method (#55)

Author: csviri

docs/README.md

@@ -91,7 +91,7 @@ The conversion hook is configured within the `CustomResourceDefinition`, see
 related [Kubernetes docs](https://kubernetes.io/docs/tasks/extend-kubernetes/custom-resources/custom-resource-definition-versioning/#configure-customresourcedefinition-to-use-conversion-webhooks).
 Since this is [not yet supported](https://github.com/fabric8io/kubernetes-client/issues/4692) by the fabric8 client CRD
 generator, the hook definition is
-[added before](https://github.com/java-operator-sdk/admission-controller-framework/blob/e2637a90152bebfca2983ba17268c1f7ec7e9602/samples/commons/src/test/java/io/javaoperatorsdk/webhook/sample/EndToEndTestBase.java#L97-L124) CRD is applied.
+[added before](https://github.com/java-operator-sdk/admission-controller-framework/blob/57a889ea1c0cb42b5a703a3cc8053f51c3982f74/samples/commons/src/main/java/io/javaoperatorsdk/webhook/sample/commons/Utils.java#L83-L110) CRD is applied.
 
 Note
 that [cert manager](https://github.com/java-operator-sdk/admission-controller-framework/blob/e2637a90152bebfca2983ba17268c1f7ec7e9602/samples/quarkus/src/test/java/io/javaoperatorsdk/webhook/sample/QuarkusWebhooksE2E.java#L19-L23)

samples/commons/src/main/java/io/javaoperatorsdk/webhook/sample/commons/Utils.java

@@ -3,16 +3,19 @@
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.util.List;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
 import java.util.function.UnaryOperator;
 import java.util.stream.Collectors;
 
 import io.fabric8.kubernetes.api.model.HasMetadata;
+import io.fabric8.kubernetes.api.model.apiextensions.v1.*;
 import io.fabric8.kubernetes.api.model.networking.v1.*;
 import io.fabric8.kubernetes.client.KubernetesClient;
 
 import static io.javaoperatorsdk.webhook.sample.commons.AdmissionControllers.VALIDATION_TARGET_LABEL;
+import static io.javaoperatorsdk.webhook.sample.commons.ConversionControllers.CONVERSION_PATH;
 
 public class Utils {
 
@@ -77,4 +80,33 @@ public static Ingress testIngress(String name) {
         .build();
   }
 
+  public static UnaryOperator<HasMetadata> addConversionHookEndpointToCustomResource(
+      String serviceName) {
+    return r -> {
+      if (!(r instanceof CustomResourceDefinition)) {
+        return r;
+      }
+      var crd = (CustomResourceDefinition) r;
+      var crc = new CustomResourceConversion();
+      crd.getMetadata()
+          .setAnnotations(Map.of("cert-manager.io/inject-ca-from", "default/" + serviceName));
+      crd.getSpec().setConversion(crc);
+      crc.setStrategy("Webhook");
+
+      var whc = new WebhookConversionBuilder()
+          .withConversionReviewVersions(List.of("v1"))
+          .withClientConfig(new WebhookClientConfigBuilder()
+              .withService(new ServiceReferenceBuilder()
+                  .withPath("/" + CONVERSION_PATH)
+                  .withName(serviceName)
+                  .withNamespace("default")
+                  .withPort(443)
+                  .build())
+              .build())
+          .build();
+      crc.setWebhook(whc);
+      return crd;
+    };
+  }
+
 }

samples/commons/src/test/java/io/javaoperatorsdk/webhook/sample/EndToEndTestBase.java

@@ -1,15 +1,11 @@
 package io.javaoperatorsdk.webhook.sample;
 
 import java.time.Duration;
-import java.util.List;
-import java.util.Map;
 import java.util.concurrent.TimeUnit;
 import java.util.function.Supplier;
-import java.util.function.UnaryOperator;
 
 import org.junit.jupiter.api.Test;
 
-import io.fabric8.kubernetes.api.model.HasMetadata;
 import io.fabric8.kubernetes.api.model.ObjectMetaBuilder;
 import io.fabric8.kubernetes.api.model.apiextensions.v1.*;
 import io.fabric8.kubernetes.client.KubernetesClient;
@@ -20,7 +16,6 @@
 import io.javaoperatorsdk.webhook.sample.commons.customresource.MultiVersionCustomResourceV2;
 
 import static io.javaoperatorsdk.webhook.sample.commons.AdmissionControllers.MUTATION_TARGET_LABEL;
-import static io.javaoperatorsdk.webhook.sample.commons.ConversionControllers.CONVERSION_PATH;
 import static io.javaoperatorsdk.webhook.sample.commons.Utils.*;
 import static io.javaoperatorsdk.webhook.sample.commons.Utils.SPIN_UP_GRACE_PERIOD;
 import static org.assertj.core.api.AssertionsForInterfaceTypes.assertThat;
@@ -93,33 +88,4 @@ public static void waitForCoreDNS(KubernetesClient client) {
     client.apps().deployments().inNamespace("kube-system").withName("coredns").waitUntilReady(2,
         TimeUnit.MINUTES);
   }
-
-  public static UnaryOperator<HasMetadata> addConversionHookEndpointToCustomResource(
-      String serviceName) {
-    return r -> {
-      if (!(r instanceof CustomResourceDefinition)) {
-        return r;
-      }
-      var crd = (CustomResourceDefinition) r;
-      var crc = new CustomResourceConversion();
-      crd.getMetadata()
-          .setAnnotations(Map.of("cert-manager.io/inject-ca-from", "default/" + serviceName));
-      crd.getSpec().setConversion(crc);
-      crc.setStrategy("Webhook");
-
-      var whc = new WebhookConversionBuilder()
-          .withConversionReviewVersions(List.of("v1"))
-          .withClientConfig(new WebhookClientConfigBuilder()
-              .withService(new ServiceReferenceBuilder()
-                  .withPath("/" + CONVERSION_PATH)
-                  .withName(serviceName)
-                  .withNamespace("default")
-                  .withPort(443)
-                  .build())
-              .build())
-          .build();
-      crc.setWebhook(whc);
-      return crd;
-    };
-  }
 }

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

@@ -9,6 +9,7 @@
 import io.fabric8.kubernetes.client.KubernetesClient;
 import io.fabric8.kubernetes.client.KubernetesClientBuilder;
 
+import static io.javaoperatorsdk.webhook.sample.commons.Utils.addConversionHookEndpointToCustomResource;
 import static io.javaoperatorsdk.webhook.sample.commons.Utils.applyAndWait;
 
 class QuarkusWebhooksE2E extends EndToEndTestBase {

samples/spring-boot/src/test/java/io/javaoperatorsdk/webhook/sample/springboot/SpringBootWebhooksE2E.java

@@ -10,6 +10,7 @@
 import io.fabric8.kubernetes.client.KubernetesClientBuilder;
 import io.javaoperatorsdk.webhook.sample.EndToEndTestBase;
 
+import static io.javaoperatorsdk.webhook.sample.commons.Utils.addConversionHookEndpointToCustomResource;
 import static io.javaoperatorsdk.webhook.sample.commons.Utils.applyAndWait;
 
 class SpringBootWebhooksE2E extends EndToEndTestBase {