Merge pull request #6 from tavisto/main

Added the ability to pass a custom node label. Resolves #5

README.md

@@ -35,3 +35,14 @@ kubectl nodepools nodes $nodepool
 ```
 
 Where `$nodepool` should be the name of an existing node pool.
+
+### Using a custom node pool label
+If your cluster uses a different label than the ones supported in code, you can pass a custom label using the `--label/-l` flag as in the following examples:
+
+```shell
+# list nodepools using a custom label
+kubectl nodepools list --label 'custom.domain.io/fancy-node-label'
+
+# list nodes with a nodepool using a custom label
+kubectl nodepools nodes -l 'custom.domain.io/fancy-node-label' $nodepool
+```

main.go

@@ -23,6 +23,7 @@ var (
 	noHeaders bool
 	onlyName  bool
 	output    string
+	label     string
 )
 
 func main() {
@@ -83,6 +84,7 @@ You can also list nodes for a given node pool/group by name.`,
 	flags := cmd.PersistentFlags()
 	flags.BoolVar(&noHeaders, "no-headers", false, "Don't print headers (default print headers)")
 	flags.StringVarP(&output, "output", "o", "", "Output format. Only name.")
+	flags.StringVarP(&label, "label", "l", "", "Label to group nodes into pools with")
 	kflags.AddFlags(flags)
 
 	return cmd
@@ -95,7 +97,11 @@ var providerNodepoolLabels = map[string]string{
 	"DOKS": "doks.digitalocean.com/node-pool-id",
 }
 
-func findNodepool(node corev1.Node) string {
+func findNodepool(node corev1.Node, label string) string {
+	// Check the custom label first
+	if np, ok := node.Labels[label]; ok {
+		return np
+	}
 	for _, lbl := range providerNodepoolLabels {
 		if np, ok := node.Labels[lbl]; ok {
 			return np
@@ -142,7 +148,7 @@ func listCmd() *cobra.Command {
 			names := make([]string, 0, len(nps))
 
 			for _, n := range res.Items {
-				npName := findNodepool(n)
+				npName := findNodepool(n, label)
 
 				np, ok := nps[npName]
 				if !ok {
@@ -206,7 +212,7 @@ func nodesCmd() *cobra.Command {
 			var ns []corev1.Node
 
 			for _, n := range res.Items {
-				if np := findNodepool(n); np == args[0] {
+				if np := findNodepool(n, label); np == args[0] {
 					ns = append(ns, n)
 				}
 			}