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

alternatively just create an event if an annotation was denied

Browse source
This commit is contained in:
Johannes Rudolph 2024-08-06 14:16:16 +02:00 committed by k8s-infra-cherrypick-robot
parent c33fc947c5
commit 1d4160768d
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -209,8 +209,7 @@ func (e Extractor) Extract(ing *networking.Ingress) (*Ingress, error) {
val = nil val = nil
} }
return nil, err _, alreadyDenied := data[DeniedKeyName]
/* _, alreadyDenied := data[DeniedKeyName]
if !alreadyDenied { if !alreadyDenied {
errString := err.Error() errString := err.Error()
data[DeniedKeyName] = &errString data[DeniedKeyName] = &errString
@ -218,7 +217,7 @@ func (e Extractor) Extract(ing *networking.Ingress) (*Ingress, error) {
continue 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 { if val != nil {

4
internal/ingress/controller/store/store.go
View file

@ -938,10 +938,12 @@ func (s *k8sStore) syncIngress(ing *networkingv1.Ingress) {
parsed, err := s.annotations.Extract(ing) parsed, err := s.annotations.Extract(ing)
if err != nil { if err != nil {
s.recorder.Eventf(ing, corev1.EventTypeWarning, "AnnotationParsingFailed", fmt.Sprintf("Error parsing annotations: %v", err))
klog.Error(err) klog.Error(err)
return 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{ err = s.listers.IngressWithAnnotation.Update(&ingress.Ingress{
Ingress: *copyIng, Ingress: *copyIng,
ParsedAnnotations: parsed, ParsedAnnotations: parsed,