alternatively just create an event if an annotation was denied

kubernetes · Nov 20, 2024 · 1d41607 · 1d41607
1 parent c33fc94
commit 1d41607
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/internal/ingress/annotations/annotations.go b/internal/ingress/annotations/annotations.go
@@ -209,16 +209,15 @@ 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
 				klog.ErrorS(err, "error reading Ingress annotation", "name", name, "ingress", klog.KObj(ing))
 				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
@@ -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,