Skip to content

Kubernetes: node autodiscover, add InternalIP #15930

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jan 31, 2020
Merged

Kubernetes: node autodiscover, add InternalIP #15930

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
018fd09
use any node ip
odacremolbap Jan 29, 2020
5f75972
remove clause from if
odacremolbap Jan 29, 2020
b954fb9
implement suggestions from review
odacremolbap Jan 30, 2020
eb4195d
fix not equal typo
odacremolbap Jan 30, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 15 additions & 4 deletions libbeat/autodiscover/providers/kubernetes/node.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,17 +188,28 @@ func (n *node) emit(node *kubernetes.Node, flag string) {
},
}
n.publish(event)

}

// getAddress returns an IP address from a kubernetes node.
Copy link
Contributor

@mtojek mtojek Jan 30, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: Kubernetes

//
// It will use external IP if existing, falling back to Internal IP if not,
Copy link
Contributor

@mtojek mtojek Jan 30, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: either InternalIP or internal IP

// hostname and DNS entries are not taken into account.
func getAddress(node *kubernetes.Node) string {
nodeAddress := ""
for _, address := range node.Status.Addresses {
if address.Type == v1.NodeExternalIP && address.Address != "" {
return address.Address
if address.Address == "" {
continue
}
if address.Type == v1.NodeExternalIP {
nodeAddress = address.Address
break
}
if address.Type == v1.NodeInternalIP {
nodeAddress = address.Address
}
}

return ""
return nodeAddress
}

func isNodeReady(node *kubernetes.Node) bool {
Expand Down