From 43d412039cf585174f8e76677a583c8bf7a7ea8a Mon Sep 17 00:00:00 2001
From: shravan <shravan.ss@zopsmart.com>
Date: Thu, 7 May 2020 23:11:04 +0530
Subject: [PATCH] 744 relocating logic

---
 pkg/webhooks/server.go     | 9 ---------
 pkg/webhooks/validation.go | 4 ++++
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/pkg/webhooks/server.go b/pkg/webhooks/server.go
index 2a9c7551d8..a8e9f652e2 100644
--- a/pkg/webhooks/server.go
+++ b/pkg/webhooks/server.go
@@ -355,15 +355,6 @@ func (ws *WebhookServer) resourceValidation(request *v1beta1.AdmissionRequest) *
 		logger.Error(err, "failed to load service account in context")
 	}
 
-	if val, err := ctx.Query("request.object.metadata.deletionTimestamp"); val != nil && err == nil {
-		return &v1beta1.AdmissionResponse{
-			Allowed: true,
-			Result: &metav1.Status{
-				Status: "Success",
-			},
-		}
-	}
-
 	// VALIDATION
 	ok, msg := ws.HandleValidation(request, policies, nil, ctx, userRequestInfo)
 	if !ok {
diff --git a/pkg/webhooks/validation.go b/pkg/webhooks/validation.go
index 2326e7d89c..781421111a 100644
--- a/pkg/webhooks/validation.go
+++ b/pkg/webhooks/validation.go
@@ -23,6 +23,10 @@ func (ws *WebhookServer) HandleValidation(request *v1beta1.AdmissionRequest, pol
 	logger := ws.log.WithValues("action", "validation", "uid", request.UID, "kind", request.Kind, "namespace", request.Namespace, "name", request.Name, "operation", request.Operation)
 	logger.V(4).Info("incoming request")
 
+	if val, err := ctx.Query("request.object.metadata.deletionTimestamp"); val != nil && err == nil {
+		return true, ""
+	}
+
 	// Get new and old resource
 	newR, oldR, err := utils.ExtractResources(patchedResource, request)
 	if err != nil {