Conversion Webhook Support

core/pom.xml

@@ -108,5 +108,10 @@
       <groupId>com.github.java-json-tools</groupId>
       <artifactId>json-patch</artifactId>
     </dependency>
+    <dependency>
+      <groupId>io.fabric8</groupId>
+      <artifactId>crd-generator-apt</artifactId>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 </project>

core/src/main/java/io/javaoperatorsdk/webhook/admission/AdmissionController.java

@@ -0,0 +1,34 @@
+package io.javaoperatorsdk.webhook.admission;
+
+import io.fabric8.kubernetes.api.model.KubernetesResource;
+import io.fabric8.kubernetes.api.model.admission.v1.AdmissionReview;
+import io.javaoperatorsdk.webhook.admission.mutation.DefaultAdmissionRequestMutator;
+import io.javaoperatorsdk.webhook.admission.mutation.Mutator;
+import io.javaoperatorsdk.webhook.admission.validation.DefaultAdmissionRequestValidator;
+import io.javaoperatorsdk.webhook.admission.validation.Validator;
+
+public class AdmissionController<T extends KubernetesResource> {
+
+  private final AdmissionRequestHandler admissionRequestHandler;
+
+  public AdmissionController(Mutator<T> mutator) {
+    this(new DefaultAdmissionRequestMutator<>(mutator));
+  }
+
+  public AdmissionController(Validator<T> mutator) {
+    this(new DefaultAdmissionRequestValidator<>(mutator));
+  }
+
+  public AdmissionController(AdmissionRequestHandler admissionRequestHandler) {
+    this.admissionRequestHandler = admissionRequestHandler;
+  }
+
+  public AdmissionReview handle(AdmissionReview admissionReview) {
+    var response = admissionRequestHandler.handle(admissionReview.getRequest());
+    AdmissionReview responseAdmissionReview = new AdmissionReview();
+    responseAdmissionReview.setResponse(response);
+    response.setUid(admissionReview.getRequest().getUid());
+    return responseAdmissionReview;
+  }
+
+}

core/src/main/java/io/javaoperatorsdk/admissioncontroller/AdmissionControllerException.java → core/src/main/java/io/javaoperatorsdk/webhook/admission/AdmissionControllerException.java

@@ -1,4 +1,4 @@
-package io.javaoperatorsdk.admissioncontroller;
+package io.javaoperatorsdk.webhook.admission;
 
 public class AdmissionControllerException extends RuntimeException {
 

core/src/main/java/io/javaoperatorsdk/admissioncontroller/RequestHandler.java → core/src/main/java/io/javaoperatorsdk/webhook/admission/AdmissionRequestHandler.java

@@ -1,9 +1,9 @@
-package io.javaoperatorsdk.admissioncontroller;
+package io.javaoperatorsdk.webhook.admission;
 
 import io.fabric8.kubernetes.api.model.admission.v1.AdmissionRequest;
 import io.fabric8.kubernetes.api.model.admission.v1.AdmissionResponse;
 
-public interface RequestHandler {
+public interface AdmissionRequestHandler {
 
   AdmissionResponse handle(AdmissionRequest admissionRequest);
 

core/src/main/java/io/javaoperatorsdk/admissioncontroller/AdmissionUtils.java → core/src/main/java/io/javaoperatorsdk/webhook/admission/AdmissionUtils.java

@@ -1,4 +1,4 @@
-package io.javaoperatorsdk.admissioncontroller;
+package io.javaoperatorsdk.webhook.admission;
 
 import java.nio.charset.StandardCharsets;
 import java.util.Base64;
@@ -13,7 +13,9 @@
 public class AdmissionUtils {
 
   public static final String JSON_PATCH = "JSONPatch";
-  private final static ObjectMapper mapper = new ObjectMapper();
+  private static final ObjectMapper mapper = new ObjectMapper();
+
+  private AdmissionUtils() {}
 
   public static AdmissionResponse notAllowedExceptionToAdmissionResponse(
       NotAllowedException notAllowedException) {

core/src/main/java/io/javaoperatorsdk/admissioncontroller/AsyncAdmissionController.java → core/src/main/java/io/javaoperatorsdk/webhook/admission/AsyncAdmissionController.java

@@ -1,27 +1,27 @@
-package io.javaoperatorsdk.admissioncontroller;
+package io.javaoperatorsdk.webhook.admission;
 
 import java.util.concurrent.CompletionStage;
 
 import io.fabric8.kubernetes.api.model.KubernetesResource;
 import io.fabric8.kubernetes.api.model.admission.v1.AdmissionReview;
-import io.javaoperatorsdk.admissioncontroller.mutation.AsyncDefaultRequestMutator;
-import io.javaoperatorsdk.admissioncontroller.mutation.AsyncMutator;
-import io.javaoperatorsdk.admissioncontroller.validation.AsyncDefaultRequestValidator;
-import io.javaoperatorsdk.admissioncontroller.validation.Validator;
+import io.javaoperatorsdk.webhook.admission.mutation.AsyncDefaultAdmissionRequestMutator;
+import io.javaoperatorsdk.webhook.admission.mutation.AsyncMutator;
+import io.javaoperatorsdk.webhook.admission.validation.AsyncDefaultAdmissionRequestValidator;
+import io.javaoperatorsdk.webhook.admission.validation.Validator;
 
 public class AsyncAdmissionController<T extends KubernetesResource> {
 
-  private final AsyncRequestHandler requestHandler;
+  private final AsyncAdmissionRequestHandler requestHandler;
 
   public AsyncAdmissionController(AsyncMutator<T> mutator) {
-    this(new AsyncDefaultRequestMutator<>(mutator));
+    this(new AsyncDefaultAdmissionRequestMutator<>(mutator));
   }
 
   public AsyncAdmissionController(Validator<T> validator) {
-    this(new AsyncDefaultRequestValidator<>(validator));
+    this(new AsyncDefaultAdmissionRequestValidator<>(validator));
   }
 
-  public AsyncAdmissionController(AsyncRequestHandler requestHandler) {
+  public AsyncAdmissionController(AsyncAdmissionRequestHandler requestHandler) {
     this.requestHandler = requestHandler;
   }
 

core/src/main/java/io/javaoperatorsdk/admissioncontroller/AsyncRequestHandler.java → core/src/main/java/io/javaoperatorsdk/webhook/admission/AsyncAdmissionRequestHandler.java

@@ -1,11 +1,11 @@
-package io.javaoperatorsdk.admissioncontroller;
+package io.javaoperatorsdk.webhook.admission;
 
 import java.util.concurrent.CompletionStage;
 
 import io.fabric8.kubernetes.api.model.admission.v1.AdmissionRequest;
 import io.fabric8.kubernetes.api.model.admission.v1.AdmissionResponse;
 
-public interface AsyncRequestHandler {
+public interface AsyncAdmissionRequestHandler {
 
   CompletionStage<AdmissionResponse> handle(AdmissionRequest admissionRequest);
 

core/src/main/java/io/javaoperatorsdk/admissioncontroller/NotAllowedException.java → core/src/main/java/io/javaoperatorsdk/webhook/admission/NotAllowedException.java

@@ -1,12 +1,13 @@
-package io.javaoperatorsdk.admissioncontroller;
+package io.javaoperatorsdk.webhook.admission;
 
 import io.fabric8.kubernetes.api.model.Status;
 
 public class NotAllowedException extends AdmissionControllerException {
 
-  private Status status = new Status();
+  private final Status status;
 
   public NotAllowedException() {
+    status = new Status();
     status.setCode(403);
   }
 
@@ -27,34 +28,40 @@ public NotAllowedException(String message, Throwable cause, boolean enableSuppre
 
   public NotAllowedException(String message) {
     super(message);
+    this.status = new Status();
     this.status.setMessage(message);
     this.status.setCode(403);
   }
 
   public NotAllowedException(int code) {
+    this.status = new Status();
     this.status.setCode(code);
   }
 
   public NotAllowedException(String message, int code) {
     super(message);
+    this.status = new Status();
     this.status.setCode(code);
     this.status.setMessage(message);
   }
 
   public NotAllowedException(String message, Throwable cause, int code) {
     super(message, cause);
+    this.status = new Status();
     this.status.setCode(code);
     this.status.setMessage(message);
   }
 
   public NotAllowedException(Throwable cause, int code) {
     super(cause);
+    this.status = new Status();
     this.status.setCode(code);
   }
 
   public NotAllowedException(String message, Throwable cause, boolean enableSuppression,
       boolean writableStackTrace, int code) {
     super(message, cause, enableSuppression, writableStackTrace);
+    this.status = new Status();
     status.setCode(code);
   }
 

core/src/main/java/io/javaoperatorsdk/admissioncontroller/Operation.java → core/src/main/java/io/javaoperatorsdk/webhook/admission/Operation.java

@@ -1,4 +1,4 @@
-package io.javaoperatorsdk.admissioncontroller;
+package io.javaoperatorsdk.webhook.admission;
 
 public enum Operation {
   CREATE, UPDATE, DELETE, CONNECT

core/src/main/java/io/javaoperatorsdk/admissioncontroller/mutation/AsyncDefaultRequestMutator.java → core/src/main/java/io/javaoperatorsdk/webhook/admission/mutation/AsyncDefaultAdmissionRequestMutator.java

@@ -1,29 +1,32 @@
-package io.javaoperatorsdk.admissioncontroller.mutation;
+package io.javaoperatorsdk.webhook.admission.mutation;
 
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionStage;
 
 import io.fabric8.kubernetes.api.model.KubernetesResource;
 import io.fabric8.kubernetes.api.model.admission.v1.AdmissionRequest;
 import io.fabric8.kubernetes.api.model.admission.v1.AdmissionResponse;
-import io.javaoperatorsdk.admissioncontroller.*;
-import io.javaoperatorsdk.admissioncontroller.clone.Cloner;
-import io.javaoperatorsdk.admissioncontroller.clone.ObjectMapperCloner;
+import io.javaoperatorsdk.webhook.admission.AdmissionUtils;
+import io.javaoperatorsdk.webhook.admission.AsyncAdmissionRequestHandler;
+import io.javaoperatorsdk.webhook.admission.NotAllowedException;
+import io.javaoperatorsdk.webhook.admission.Operation;
+import io.javaoperatorsdk.webhook.clone.Cloner;
+import io.javaoperatorsdk.webhook.clone.ObjectMapperCloner;
 
-import static io.javaoperatorsdk.admissioncontroller.AdmissionUtils.admissionResponseFromMutation;
-import static io.javaoperatorsdk.admissioncontroller.AdmissionUtils.getTargetResource;
+import static io.javaoperatorsdk.webhook.admission.AdmissionUtils.admissionResponseFromMutation;
+import static io.javaoperatorsdk.webhook.admission.AdmissionUtils.getTargetResource;
 
-public class AsyncDefaultRequestMutator<T extends KubernetesResource>
-    implements AsyncRequestHandler {
+public class AsyncDefaultAdmissionRequestMutator<T extends KubernetesResource>
+    implements AsyncAdmissionRequestHandler {
 
   private final AsyncMutator<T> mutator;
   private final Cloner<T> cloner;
 
-  public AsyncDefaultRequestMutator(AsyncMutator<T> mutator) {
+  public AsyncDefaultAdmissionRequestMutator(AsyncMutator<T> mutator) {
     this(mutator, new ObjectMapperCloner<>());
   }
 
-  public AsyncDefaultRequestMutator(AsyncMutator<T> mutator, Cloner<T> cloner) {
+  public AsyncDefaultAdmissionRequestMutator(AsyncMutator<T> mutator, Cloner<T> cloner) {
     this.mutator = mutator;
     this.cloner = cloner;
   }

core/src/main/java/io/javaoperatorsdk/admissioncontroller/mutation/AsyncMutator.java → core/src/main/java/io/javaoperatorsdk/webhook/admission/mutation/AsyncMutator.java

@@ -1,10 +1,10 @@
-package io.javaoperatorsdk.admissioncontroller.mutation;
+package io.javaoperatorsdk.webhook.admission.mutation;
 
 import java.util.concurrent.CompletionStage;
 
 import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.javaoperatorsdk.admissioncontroller.NotAllowedException;
-import io.javaoperatorsdk.admissioncontroller.Operation;
+import io.javaoperatorsdk.webhook.admission.NotAllowedException;
+import io.javaoperatorsdk.webhook.admission.Operation;
 
 public interface AsyncMutator<T extends KubernetesResource> {
 

core/src/main/java/io/javaoperatorsdk/admissioncontroller/mutation/DefaultRequestMutator.java → core/src/main/java/io/javaoperatorsdk/webhook/admission/mutation/DefaultAdmissionRequestMutator.java

@@ -1,28 +1,29 @@
-package io.javaoperatorsdk.admissioncontroller.mutation;
+package io.javaoperatorsdk.webhook.admission.mutation;
 
 import io.fabric8.kubernetes.api.model.KubernetesResource;
 import io.fabric8.kubernetes.api.model.admission.v1.AdmissionRequest;
 import io.fabric8.kubernetes.api.model.admission.v1.AdmissionResponse;
-import io.javaoperatorsdk.admissioncontroller.AdmissionUtils;
-import io.javaoperatorsdk.admissioncontroller.NotAllowedException;
-import io.javaoperatorsdk.admissioncontroller.Operation;
-import io.javaoperatorsdk.admissioncontroller.RequestHandler;
-import io.javaoperatorsdk.admissioncontroller.clone.Cloner;
-import io.javaoperatorsdk.admissioncontroller.clone.ObjectMapperCloner;
+import io.javaoperatorsdk.webhook.admission.AdmissionRequestHandler;
+import io.javaoperatorsdk.webhook.admission.AdmissionUtils;
+import io.javaoperatorsdk.webhook.admission.NotAllowedException;
+import io.javaoperatorsdk.webhook.admission.Operation;
+import io.javaoperatorsdk.webhook.clone.Cloner;
+import io.javaoperatorsdk.webhook.clone.ObjectMapperCloner;
 
-import static io.javaoperatorsdk.admissioncontroller.AdmissionUtils.admissionResponseFromMutation;
-import static io.javaoperatorsdk.admissioncontroller.AdmissionUtils.getTargetResource;
+import static io.javaoperatorsdk.webhook.admission.AdmissionUtils.admissionResponseFromMutation;
+import static io.javaoperatorsdk.webhook.admission.AdmissionUtils.getTargetResource;
 
-public class DefaultRequestMutator<T extends KubernetesResource> implements RequestHandler {
+public class DefaultAdmissionRequestMutator<T extends KubernetesResource>
+    implements AdmissionRequestHandler {
 
   private final Mutator<T> mutator;
   private final Cloner<T> cloner;
 
-  public DefaultRequestMutator(Mutator<T> mutator) {
+  public DefaultAdmissionRequestMutator(Mutator<T> mutator) {
     this(mutator, new ObjectMapperCloner<>());
   }
 
-  public DefaultRequestMutator(Mutator<T> mutator, Cloner<T> cloner) {
+  public DefaultAdmissionRequestMutator(Mutator<T> mutator, Cloner<T> cloner) {
     this.mutator = mutator;
     this.cloner = cloner;
   }

core/src/main/java/io/javaoperatorsdk/admissioncontroller/mutation/Mutator.java → core/src/main/java/io/javaoperatorsdk/webhook/admission/mutation/Mutator.java

@@ -1,8 +1,8 @@
-package io.javaoperatorsdk.admissioncontroller.mutation;
+package io.javaoperatorsdk.webhook.admission.mutation;
 
 import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.javaoperatorsdk.admissioncontroller.NotAllowedException;
-import io.javaoperatorsdk.admissioncontroller.Operation;
+import io.javaoperatorsdk.webhook.admission.NotAllowedException;
+import io.javaoperatorsdk.webhook.admission.Operation;
 
 public interface Mutator<T extends KubernetesResource> {
 

core/src/main/java/io/javaoperatorsdk/admissioncontroller/validation/AsyncDefaultRequestValidator.java → core/src/main/java/io/javaoperatorsdk/webhook/admission/validation/AsyncDefaultAdmissionRequestValidator.java

@@ -1,4 +1,4 @@
-package io.javaoperatorsdk.admissioncontroller.validation;
+package io.javaoperatorsdk.webhook.admission.validation;
 
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionException;
@@ -7,16 +7,19 @@
 import io.fabric8.kubernetes.api.model.KubernetesResource;
 import io.fabric8.kubernetes.api.model.admission.v1.AdmissionRequest;
 import io.fabric8.kubernetes.api.model.admission.v1.AdmissionResponse;
-import io.javaoperatorsdk.admissioncontroller.*;
+import io.javaoperatorsdk.webhook.admission.AdmissionUtils;
+import io.javaoperatorsdk.webhook.admission.AsyncAdmissionRequestHandler;
+import io.javaoperatorsdk.webhook.admission.NotAllowedException;
+import io.javaoperatorsdk.webhook.admission.Operation;
 
-import static io.javaoperatorsdk.admissioncontroller.AdmissionUtils.getTargetResource;
+import static io.javaoperatorsdk.webhook.admission.AdmissionUtils.getTargetResource;
 
-public class AsyncDefaultRequestValidator<T extends KubernetesResource>
-    implements AsyncRequestHandler {
+public class AsyncDefaultAdmissionRequestValidator<T extends KubernetesResource>
+    implements AsyncAdmissionRequestHandler {
 
   private final Validator<T> validator;
 
-  public AsyncDefaultRequestValidator(Validator<T> validator) {
+  public AsyncDefaultAdmissionRequestValidator(Validator<T> validator) {
     this.validator = validator;
   }