Merge pull request #1646 from kube-logging/aggregator-config-fix

fix: add namespace filter when listing aggregator configs (#1644)
kube-logging · Jan 19, 2024 · ccb3f58 · ccb3f58
2 parents 68f0e88 + a925fc6
commit ccb3f58
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/pkg/resources/model/repository.go b/pkg/resources/model/repository.go
@@ -361,7 +361,7 @@ func (r LoggingResourceRepository) handleMultipleDetachedFluentdObjects(list []v
 
 func (r LoggingResourceRepository) FluentdConfigFor(ctx context.Context, logging v1beta1.Logging) (*v1beta1.FluentdConfig, []v1beta1.FluentdConfig, error) {
 	var list v1beta1.FluentdConfigList
-	if err := r.Client.List(ctx, &list); err != nil {
+	if err := r.Client.List(ctx, &list, client.InNamespace(logging.Spec.ControlNamespace)); err != nil {
 		return nil, []v1beta1.FluentdConfig{}, err
 	}
 
@@ -401,7 +401,7 @@ func (r LoggingResourceRepository) handleMultipleDetachedSyslogNGObjects(list []
 
 func (r LoggingResourceRepository) SyslogNGConfigFor(ctx context.Context, logging v1beta1.Logging) (*v1beta1.SyslogNGConfig, []v1beta1.SyslogNGConfig, error) {
 	var list v1beta1.SyslogNGConfigList
-	if err := r.Client.List(ctx, &list); err != nil {
+	if err := r.Client.List(ctx, &list, client.InNamespace(logging.Spec.ControlNamespace)); err != nil {
 		return nil, []v1beta1.SyslogNGConfig{}, err
 	}