DevFW-CICD/ingress-nginx-helm
15
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

webhook: remove useless code. (#8236)

Browse source 
* webhook: remove useless code

Signed-off-by: SpecialYang <940129520@qq.com>

* Remove duplicated codec
This commit is contained in:
Yang 2022-02-14 02:25:47 +08:00 committed by GitHub
parent c1be3499eb
commit 53a232f829
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 0 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
internal/admission/controller/main.go
View file

@ -72,7 +72,6 @@ func (ia *IngressAdmission) HandleAdmission(obj runtime.Object) (runtime.Object,
codec := json.NewSerializerWithOptions(json.DefaultMetaFactory, scheme, scheme, json.SerializerOptions{ codec := json.NewSerializerWithOptions(json.DefaultMetaFactory, scheme, scheme, json.SerializerOptions{
Pretty: true, Pretty: true,
}) })
codec.Decode(review.Request.Object.Raw, nil, nil)
_, _, err := codec.Decode(review.Request.Object.Raw, nil, &ingress) _, _, err := codec.Decode(review.Request.Object.Raw, nil, &ingress)
if err != nil { if err != nil {
klog.ErrorS(err, "failed to decode ingress") klog.ErrorS(err, "failed to decode ingress")

5
internal/ingress/controller/controller.go
View file

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