From 55d8dbfdacd7d31cf39206b58d04f660582f4f07 Mon Sep 17 00:00:00 2001 From: Johannes Rudolph Date: Tue, 6 Aug 2024 14:16:16 +0200 Subject: [PATCH] alternatively just create an event if an annotation was denied --- internal/ingress/annotations/annotations.go | 5 ++--- internal/ingress/controller/store/store.go | 4 +++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/internal/ingress/annotations/annotations.go b/internal/ingress/annotations/annotations.go index 0fc5df9ce..4c073246c 100644 --- a/internal/ingress/annotations/annotations.go +++ b/internal/ingress/annotations/annotations.go @@ -212,8 +212,7 @@ func (e Extractor) Extract(ing *networking.Ingress) (*Ingress, error) { val = nil } - return nil, err - /* _, alreadyDenied := data[DeniedKeyName] + _, alreadyDenied := data[DeniedKeyName] if !alreadyDenied { errString := err.Error() data[DeniedKeyName] = &errString @@ -221,7 +220,7 @@ func (e Extractor) Extract(ing *networking.Ingress) (*Ingress, error) { continue } - klog.V(5).ErrorS(err, "error reading Ingress annotation", "name", name, "ingress", klog.KObj(ing)) */ + klog.V(5).ErrorS(err, "error reading Ingress annotation", "name", name, "ingress", klog.KObj(ing)) } if val != nil { diff --git a/internal/ingress/controller/store/store.go b/internal/ingress/controller/store/store.go index b3147e6b1..d4bd6136f 100644 --- a/internal/ingress/controller/store/store.go +++ b/internal/ingress/controller/store/store.go @@ -938,10 +938,12 @@ func (s *k8sStore) syncIngress(ing *networkingv1.Ingress) { parsed, err := s.annotations.Extract(ing) if err != nil { - s.recorder.Eventf(ing, corev1.EventTypeWarning, "AnnotationParsingFailed", fmt.Sprintf("Error parsing annotations: %v", err)) klog.Error(err) return } + if parsed.Denied != nil { + s.recorder.Eventf(ing, corev1.EventTypeWarning, "AnnotationParsingFailed", fmt.Sprintf("Error parsing annotations: %v", *parsed.Denied)) + } err = s.listers.IngressWithAnnotation.Update(&ingress.Ingress{ Ingress: *copyIng, ParsedAnnotations: parsed,