webhook: remove useless code. (#8236)

* webhook: remove useless code Signed-off-by: SpecialYang <940129520@qq.com> * Remove duplicated codec
kubernetes · Feb 13, 2022 · 53a232f · 53a232f
1 parent c1be349
commit 53a232f
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 6 deletions.
diff --git a/internal/admission/controller/main.go b/internal/admission/controller/main.go
@@ -72,7 +72,6 @@ func (ia *IngressAdmission) HandleAdmission(obj runtime.Object) (runtime.Object,
 	codec := json.NewSerializerWithOptions(json.DefaultMetaFactory, scheme, scheme, json.SerializerOptions{
 		Pretty: true,
 	})
-	codec.Decode(review.Request.Object.Raw, nil, nil)
 	_, _, err := codec.Decode(review.Request.Object.Raw, nil, &ingress)
 	if err != nil {
 		klog.ErrorS(err, "failed to decode ingress")

diff --git a/internal/ingress/controller/controller.go b/internal/ingress/controller/controller.go
@@ -1741,17 +1741,12 @@ func checkOverlap(ing *networking.Ingress, ingresses []*ingress.Ingress, servers
 			}
 
 			// same ingress
-			skipValidation := false
 			for _, existing := range existingIngresses {
 				if existing.ObjectMeta.Namespace == ing.ObjectMeta.Namespace && existing.ObjectMeta.Name == ing.ObjectMeta.Name {
 					return nil
 				}
 			}
 
-			if skipValidation {
-				continue
-			}
-
 			// path overlap. Check if one of the ingresses has a canary annotation
 			isCanaryEnabled, annotationErr := parser.GetBoolAnnotation("canary", ing)
 			for _, existing := range existingIngresses {