fix: status codes

Author: csviri

core/src/main/java/io/javaoperatorsdk/admissioncontroller/AdmissionUtils.java

@@ -4,7 +4,6 @@
 import java.util.Base64;
 
 import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.Status;
 import io.fabric8.kubernetes.api.model.admission.v1.AdmissionRequest;
 import io.fabric8.kubernetes.api.model.admission.v1.AdmissionResponse;
 import io.fabric8.zjsonpatch.JsonDiff;
@@ -35,9 +34,6 @@ public static AdmissionResponse admissionResponseFromMutation(KubernetesResource
     AdmissionResponse admissionResponse = new AdmissionResponse();
     admissionResponse.setAllowed(true);
     admissionResponse.setPatchType(JSON_PATCH);
-    Status status = new Status();
-    status.setCode(200);
-    admissionResponse.setStatus(status);
     var originalResNode = mapper.valueToTree(originalResource);
     var mutatedResNode = mapper.valueToTree(mutatedResource);
 

samples/spring-boot-sample/src/main/java/io/javaoperatorsdk/admissioncontroller/sample/springbootsample/AdmissionEndpoint.java

@@ -2,8 +2,6 @@
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.ResponseBody;
@@ -29,17 +27,14 @@ public AdmissionEndpoint(
 
   @PostMapping("/mutate")
   @ResponseBody
-  public ResponseEntity<AdmissionReview> mutate(@RequestBody AdmissionReview admissionReview) {
-    AdmissionReview resultReview = addLabelMutationController.handle(admissionReview);
-    return new ResponseEntity<>(resultReview,
-        HttpStatus.valueOf(resultReview.getResponse().getStatus().getCode()));
+  public AdmissionReview mutate(@RequestBody AdmissionReview admissionReview) {
+    return addLabelMutationController.handle(admissionReview);
   }
 
   @PostMapping("/validate")
-  public ResponseEntity<AdmissionReview> validate(@RequestBody AdmissionReview admissionReview) {
-    AdmissionReview resultReview = validatingController.handle(admissionReview);
-    return new ResponseEntity<>(resultReview,
-        HttpStatus.valueOf(resultReview.getResponse().getStatus().getCode()));
+  @ResponseBody
+  public AdmissionReview validate(@RequestBody AdmissionReview admissionReview) {
+    return validatingController.handle(admissionReview);
   }
 
 }

samples/spring-boot-sample/src/test/java/io/javaoperatorsdk/admissioncontroller/sample/springbootsample/AdmissionEndpointTest.java

@@ -30,16 +30,16 @@ public class AdmissionEndpointTest {
   public void testValidation() throws Exception {
     mockMvc.perform(post("/validate").contentType(MediaType.APPLICATION_JSON)
         .content(new String(Files.readAllBytes(request.getFile().toPath()))))
-        .andExpect(status().isForbidden());
+        .andExpectAll(status().isOk(), content().json("{}"));
   }
 
   @Test
   public void testMutation() throws Exception {
     mockMvc.perform(post("/mutate").contentType(MediaType.APPLICATION_JSON)
         .content(new String(Files.readAllBytes(request.getFile().toPath()))))
-        .andExpectAll(status().isOk(), content().contentType(MediaType.APPLICATION_JSON),
+        .andExpectAll(content().contentType(MediaType.APPLICATION_JSON),
             content().json(
-                "{\"apiVersion\":\"admission.k8s.io/v1\",\"kind\":\"AdmissionReview\",\"response\":{\"allowed\":true,\"patch\":\"W3sib3AiOiJhZGQiLCJwYXRoIjoiL21ldGFkYXRhL2xhYmVscy9hcHAua3ViZXJuZXRlcy5pb34xbmFtZSIsInZhbHVlIjoibXV0YXRpb24tdGVzdCJ9XQ==\",\"patchType\":\"JSONPatch\",\"status\":{\"apiVersion\":\"v1\",\"kind\":\"Status\",\"code\":200},\"uid\":\"0df28fbd-5f5f-11e8-bc74-36e6bb280816\"}}"));
+                "{\"apiVersion\":\"admission.k8s.io/v1\",\"kind\":\"AdmissionReview\",\"response\":{\"allowed\":true,\"patch\":\"W3sib3AiOiJhZGQiLCJwYXRoIjoiL21ldGFkYXRhL2xhYmVscy9hcHAua3ViZXJuZXRlcy5pb34xbmFtZSIsInZhbHVlIjoibXV0YXRpb24tdGVzdCJ9XQ==\",\"patchType\":\"JSONPatch\",\"uid\":\"0df28fbd-5f5f-11e8-bc74-36e6bb280816\"}}"));
   }
 
 }