diff --git a/internal/admission/controller/main.go b/internal/admission/controller/main.go index 8645756fd..645f298b4 100644 --- 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 index 9afe00953..607bb5cb9 100644 --- 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 {