Kubernetes: node autodiscover, add InternalIP (#15930) (#15989)

Pablo Mercado · web-flow · commit d69f811025b3 · 2020-02-03T10:53:46.000+01:00
* use any node ip
diff --git a/libbeat/autodiscover/providers/kubernetes/node.go b/libbeat/autodiscover/providers/kubernetes/node.go
@@ -188,7 +188,6 @@ func (n *node) emit(node *kubernetes.Node, flag string) {
 		},
 	}
 	n.publish(event)
-
 }
 
 func getAddress(node *kubernetes.Node) string {
@@ -198,6 +197,12 @@ func getAddress(node *kubernetes.Node) string {
 		}
 	}
 
+	for _, address := range node.Status.Addresses {
+		if address.Type == v1.NodeInternalIP && address.Address != "" {
+			return address.Address
+		}
+	}
+
 	return ""
 }
 

Original file line number	Diff line number	Diff line change
`@@ -188,7 +188,6 @@ func (n node) emit(node kubernetes.Node, flag string) {`
`188`	`188`	`},`
`189`	`189`	`}`
`190`	`190`	`n.publish(event)`
`191`		`-`
`192`	`191`	`}`
`193`	`192`
`194`	`193`	`func getAddress(node *kubernetes.Node) string {`
`@@ -198,6 +197,12 @@ func getAddress(node *kubernetes.Node) string {`
`198`	`197`	`}`
`199`	`198`	`}`
`200`	`199`
	`200`	`+ for _, address := range node.Status.Addresses {`
	`201`	`+ if address.Type == v1.NodeInternalIP && address.Address != "" {`
	`202`	`+ return address.Address`
	`203`	`+ }`
	`204`	`+ }`
	`205`	`+`
`201`	`206`	`return ""`
`202`	`207`	`}`
`203`	`208`