Fix k8s watcher issue when node access to list nodes and ns (#22714)

ChrsMark · web-flow · commit 113703276df1 · 2020-11-26T10:42:45.000+02:00
diff --git a/libbeat/autodiscover/providers/kubernetes/pod.go b/libbeat/autodiscover/providers/kubernetes/pod.go
@@ -88,13 +88,13 @@ func NewPodEventer(uuid uuid.UUID, cfg *common.Config, client k8s.Interface, pub
 	}
 	nodeWatcher, err := kubernetes.NewWatcher(client, &kubernetes.Node{}, options, nil)
 	if err != nil {
-		return nil, fmt.Errorf("couldn't create watcher for %T due to error %+v", &kubernetes.Node{}, err)
+		logger.Errorf("couldn't create watcher for %T due to error %+v", &kubernetes.Node{}, err)
 	}
 	namespaceWatcher, err := kubernetes.NewWatcher(client, &kubernetes.Namespace{}, kubernetes.WatchOptions{
 		SyncTimeout: config.SyncPeriod,
 	}, nil)
 	if err != nil {
-		return nil, fmt.Errorf("couldn't create watcher for %T due to error %+v", &kubernetes.Namespace{}, err)
+		logger.Errorf("couldn't create watcher for %T due to error %+v", &kubernetes.Namespace{}, err)
 	}
 	metaGen := metadata.GetPodMetaGen(cfg, watcher, nodeWatcher, namespaceWatcher, metaConf)
 
diff --git a/libbeat/common/kubernetes/metadata/metadata.go b/libbeat/common/kubernetes/metadata/metadata.go
@@ -60,8 +60,13 @@ func GetPodMetaGen(
 	namespaceWatcher kubernetes.Watcher,
 	metaConf *AddResourceMetadataConfig) MetaGen {
 
-	nodeMetaGen := NewNodeMetadataGenerator(metaConf.Node, nodeWatcher.Store())
-	namespaceMetaGen := NewNamespaceMetadataGenerator(metaConf.Namespace, namespaceWatcher.Store())
+	var nodeMetaGen, namespaceMetaGen MetaGen
+	if nodeWatcher != nil {
+		nodeMetaGen = NewNodeMetadataGenerator(metaConf.Node, nodeWatcher.Store())
+	}
+	if namespaceWatcher != nil {
+		namespaceMetaGen = NewNamespaceMetadataGenerator(metaConf.Namespace, namespaceWatcher.Store())
+	}
 	metaGen := NewPodMetadataGenerator(cfg, podWatcher.Store(), nodeMetaGen, namespaceMetaGen)
 
 	return metaGen
diff --git a/libbeat/processors/add_kubernetes_metadata/kubernetes.go b/libbeat/processors/add_kubernetes_metadata/kubernetes.go
@@ -220,13 +220,17 @@ func (k *kubernetesAnnotator) init(config kubeAnnotatorConfig, cfg *common.Confi
 
 		// NOTE: order is important here since pod meta will include node meta and hence node.Store() should
 		// be populated before trying to generate metadata for Pods.
-		if err := nodeWatcher.Start(); err != nil {
-			k.log.Debugf("add_kubernetes_metadata", "Couldn't start node watcher: %v", err)
-			return
+		if nodeWatcher != nil {
+			if err := nodeWatcher.Start(); err != nil {
+				k.log.Debugf("add_kubernetes_metadata", "Couldn't start node watcher: %v", err)
+				return
+			}
 		}
-		if err := namespaceWatcher.Start(); err != nil {
-			k.log.Debugf("add_kubernetes_metadata", "Couldn't start namespace watcher: %v", err)
-			return
+		if namespaceWatcher != nil {
+			if err := namespaceWatcher.Start(); err != nil {
+				k.log.Debugf("add_kubernetes_metadata", "Couldn't start namespace watcher: %v", err)
+				return
+			}
 		}
 		if err := watcher.Start(); err != nil {
 			k.log.Debugf("add_kubernetes_metadata", "Couldn't start pod watcher: %v", err)

Original file line number	Diff line number	Diff line change
`@@ -88,13 +88,13 @@ func NewPodEventer(uuid uuid.UUID, cfg *common.Config, client k8s.Interface, pub`
`88`	`88`	`}`
`89`	`89`	`nodeWatcher, err := kubernetes.NewWatcher(client, &kubernetes.Node{}, options, nil)`
`90`	`90`	`if err != nil {`
`91`		`- return nil, fmt.Errorf("couldn't create watcher for %T due to error %+v", &kubernetes.Node{}, err)`
	`91`	`+ logger.Errorf("couldn't create watcher for %T due to error %+v", &kubernetes.Node{}, err)`
`92`	`92`	`}`
`93`	`93`	`namespaceWatcher, err := kubernetes.NewWatcher(client, &kubernetes.Namespace{}, kubernetes.WatchOptions{`
`94`	`94`	`SyncTimeout: config.SyncPeriod,`
`95`	`95`	`}, nil)`
`96`	`96`	`if err != nil {`
`97`		`- return nil, fmt.Errorf("couldn't create watcher for %T due to error %+v", &kubernetes.Namespace{}, err)`
	`97`	`+ logger.Errorf("couldn't create watcher for %T due to error %+v", &kubernetes.Namespace{}, err)`
`98`	`98`	`}`
`99`	`99`	`metaGen := metadata.GetPodMetaGen(cfg, watcher, nodeWatcher, namespaceWatcher, metaConf)`
`100`	`100`