report annotation parsing errors as events
This commit is contained in:
parent
17209eb3a9
commit
cf038b97b7
2 changed files with 7 additions and 2 deletions
|
@ -209,7 +209,8 @@ func (e Extractor) Extract(ing *networking.Ingress) (*Ingress, error) {
|
||||||
val = nil
|
val = nil
|
||||||
}
|
}
|
||||||
|
|
||||||
_, alreadyDenied := data[DeniedKeyName]
|
return nil, err
|
||||||
|
/* _, alreadyDenied := data[DeniedKeyName]
|
||||||
if !alreadyDenied {
|
if !alreadyDenied {
|
||||||
errString := err.Error()
|
errString := err.Error()
|
||||||
data[DeniedKeyName] = &errString
|
data[DeniedKeyName] = &errString
|
||||||
|
@ -217,7 +218,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 {
|
||||||
|
|
|
@ -240,6 +240,8 @@ type k8sStore struct {
|
||||||
backendConfigMu *sync.RWMutex
|
backendConfigMu *sync.RWMutex
|
||||||
|
|
||||||
defaultSSLCertificate string
|
defaultSSLCertificate string
|
||||||
|
|
||||||
|
recorder record.EventRecorder
|
||||||
}
|
}
|
||||||
|
|
||||||
// New creates a new object store to be used in the ingress controller.
|
// New creates a new object store to be used in the ingress controller.
|
||||||
|
@ -279,6 +281,7 @@ func New(
|
||||||
recorder := eventBroadcaster.NewRecorder(scheme.Scheme, corev1.EventSource{
|
recorder := eventBroadcaster.NewRecorder(scheme.Scheme, corev1.EventSource{
|
||||||
Component: "nginx-ingress-controller",
|
Component: "nginx-ingress-controller",
|
||||||
})
|
})
|
||||||
|
store.recorder = recorder
|
||||||
|
|
||||||
// k8sStore fulfills resolver.Resolver interface
|
// k8sStore fulfills resolver.Resolver interface
|
||||||
store.annotations = annotations.NewAnnotationExtractor(store)
|
store.annotations = annotations.NewAnnotationExtractor(store)
|
||||||
|
@ -935,6 +938,7 @@ 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
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue