feat: avoid use empty configmaps (vmware#396)

Avoid use empty configmaps in fluentd Signed-off-by: jcriadomarco <jcriadomarco@vmware.com>
lynn-e · Jun 27, 2023 · 835624a · 835624a
1 parent 0976eb8
commit 835624a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git 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
@@ -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")