From 835624ae770899c286efd169fb033db46576e7f9 Mon Sep 17 00:00:00 2001 From: Javier Criado Marcos Date: Fri, 23 Jun 2023 13:00:57 +0100 Subject: [PATCH] feat: avoid use empty configmaps (#396) Avoid use empty configmaps in fluentd Signed-off-by: jcriadomarco --- config-reloader/datasource/kube_informer.go | 5 ++++- config-reloader/datasource/kubedatasource/configmap.go | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/config-reloader/datasource/kube_informer.go b/config-reloader/datasource/kube_informer.go index 747c47e..d3eeeb3 100644 --- a/config-reloader/datasource/kube_informer.go +++ b/config-reloader/datasource/kube_informer.go @@ -160,7 +160,10 @@ func (d *kubeInformerConnection) GetNamespaces(ctx context.Context) ([]*Namespac if err != nil { return nil, err } - + if configdata == "" { + logrus.Infof("Skipping namespace: %v because is empty", ns) + continue + } fragment, err := fluentd.ParseString(configdata) if err != nil { return nil, err diff --git a/config-reloader/datasource/kubedatasource/configmap.go b/config-reloader/datasource/kubedatasource/configmap.go index 8d313aa..f7df0d0 100644 --- a/config-reloader/datasource/kubedatasource/configmap.go +++ b/config-reloader/datasource/kubedatasource/configmap.go @@ -143,6 +143,7 @@ func (c *ConfigMapDS) readConfig(configmaps []*core.ConfigMap) string { logrus.Debugf("Loaded config data from config map: %s/%s", cm.ObjectMeta.Namespace, cm.ObjectMeta.Name) } else { logrus.Warnf("cannot find entry %s in configmap %s/%s", entryName, cm.ObjectMeta.Namespace, cm.ObjectMeta.Name) + return "" } } return strings.Join(configdata, "\n")