diff --git a/pkg/events/events.go b/pkg/events/events.go index 9a0fe6da5..f9e47cc71 100644 --- a/pkg/events/events.go +++ b/pkg/events/events.go @@ -81,6 +81,7 @@ func New(object interface{}, eventType config.EventType, resource, clusterName s Level: LevelMap[eventType], Type: eventType, Cluster: clusterName, + Resource: resource, } // initialize event.TimeStamp with the time of event creation @@ -122,7 +123,6 @@ func New(object interface{}, eventType config.EventType, resource, clusterName s event.Count = eventObj.Count event.Action = eventObj.Action event.TimeStamp = eventObj.LastTimestamp.Time - event.Resource = resource } return event } diff --git a/pkg/filterengine/filters/namespace_checker.go b/pkg/filterengine/filters/namespace_checker.go index fd0fe31f8..ff959502f 100644 --- a/pkg/filterengine/filters/namespace_checker.go +++ b/pkg/filterengine/filters/namespace_checker.go @@ -20,7 +20,6 @@ package filters import ( - "fmt" "regexp" "strings" @@ -51,16 +50,19 @@ func (f NamespaceChecker) Run(object interface{}, event *events.Event) { // load config.yaml botkubeConfig, err := config.New() if err != nil { - log.Errorf(fmt.Sprintf("Error in loading configuration. Error:%s", err.Error())) - log.Debug("Skipping ignore namespace filter.") + log.Errorf("Error in loading configuration. %s", err.Error()) + return } - if botkubeConfig != nil { - for _, resource := range botkubeConfig.Resources { - if resource.Name == event.Resource { - // check if namespace to be ignored - if isNamespaceIgnored(resource.Namespaces, event.Namespace) { - event.Skip = true - } + if botkubeConfig == nil { + log.Errorf("Error in loading configuration.") + return + } + for _, resource := range botkubeConfig.Resources { + if event.Resource == event.Resource { + // check if namespace to be ignored + if isNamespaceIgnored(resource.Namespaces, event.Namespace) { + event.Skip = true + break } } }