Skip to content
This repository was archived by the owner on Jun 20, 2024. It is now read-only.

Do not exclude k8s node without any IP addr in reclaim #3393

Merged
merged 1 commit into from
Sep 6, 2018
Merged

Do not exclude k8s node without any IP addr in reclaim #3393

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 4 additions & 2 deletions prog/kube-utils/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ type nodeInfo struct {
}

// return the IP addresses of all nodes in the cluster
func getKubePeers(c *kubernetes.Clientset) ([]nodeInfo, error) {
func getKubePeers(c *kubernetes.Clientset, includeWithNoIPAddr bool) ([]nodeInfo, error) {
nodeList, err := c.CoreV1().Nodes().List(api.ListOptions{})
if err != nil {
return nil, err
Expand All @@ -51,6 +51,8 @@ func getKubePeers(c *kubernetes.Clientset) ([]nodeInfo, error) {
addresses = append(addresses, nodeInfo{name: peer.Name, addr: internalIP})
} else if externalIP != "" {
addresses = append(addresses, nodeInfo{name: peer.Name, addr: externalIP})
} else if includeWithNoIPAddr {
addresses = append(addresses, nodeInfo{name: peer.Name, addr: ""})
}
}
return addresses, nil
Expand Down Expand Up @@ -225,7 +227,7 @@ func main() {
}
return
}
peers, err := getKubePeers(c)
peers, err := getKubePeers(c, justReclaim)
if err != nil {
common.Log.Fatalf("[kube-peers] Could not get peers: %v", err)
}
Expand Down