refactor: extract label-selector as a flag for node-funder and operator

cmd/beekeeper/cmd/node_funder.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	"strings"
 	"time"
 
 	"github.com/ethersphere/beekeeper/pkg/config"
@@ -13,6 +14,8 @@ import (
 	"github.com/spf13/cobra"
 )
 
+const ingressNodeFunderLabelSelector string = "beekeeper.ethswarm.org/node-funder=true"
+
 func (c *command) initNodeFunderCmd() (err error) {
 	const (
 		optionNameAddresses         = "addresses"
@@ -23,6 +26,7 @@ func (c *command) initNodeFunderCmd() (err error) {
 		optionNameMinNative         = "min-native"
 		optionNameMinSwarm          = "min-swarm"
 		optionNameTimeout           = "timeout"
+		optionNameLabelSelector     = "label-selector"
 	)
 
 	cmd := &cobra.Command{
@@ -81,7 +85,8 @@ func (c *command) initNodeFunderCmd() (err error) {
 			var nodeLister funder.NodeLister
 			// if addresses are provided, use them, not k8s client to list nodes
 			if cfg.Namespace != "" {
-				nodeLister = newNodeLister(c.k8sClient, c.log)
+				label := c.globalConfig.GetString(optionNameLabelSelector)
+				nodeLister = newNodeLister(c.k8sClient, label, c.log)
 			}
 
 			return funder.Fund(ctx, funder.Config{
@@ -105,6 +110,7 @@ func (c *command) initNodeFunderCmd() (err error) {
 	cmd.Flags().String(optionNameWalletKey, "", "Hex-encoded private key for the Bee node wallet. Required.")
 	cmd.Flags().Float64(optionNameMinNative, 0, "Minimum amount of chain native coins (xDAI) nodes should have.")
 	cmd.Flags().Float64(optionNameMinSwarm, 0, "Minimum amount of swarm tokens (xBZZ) nodes should have.")
+	cmd.Flags().String(optionNameLabelSelector, ingressNodeFunderLabelSelector, "Label selector for the ingress resources to be used for node-funder together with namespace. Empty string means no filtering.")
 	cmd.Flags().Duration(optionNameTimeout, 5*time.Minute, "Timeout.")
 
 	c.root.AddCommand(cmd)
@@ -114,12 +120,14 @@ func (c *command) initNodeFunderCmd() (err error) {
 
 type nodeLister struct {
 	k8sClient *k8s.Client
+	label     string
 	log       logging.Logger
 }
 
-func newNodeLister(k8sClient *k8s.Client, l logging.Logger) *nodeLister {
+func newNodeLister(k8sClient *k8s.Client, label string, l logging.Logger) *nodeLister {
 	return &nodeLister{
 		k8sClient: k8sClient,
+		label:     label,
 		log:       l,
 	}
 }
@@ -133,12 +141,12 @@ func (nf *nodeLister) List(ctx context.Context, namespace string) (nodes []funde
 		return nil, fmt.Errorf("namespace not provided")
 	}
 
-	ingressHosts, err := nf.k8sClient.Ingress.ListAPINodesHosts(ctx, namespace)
+	ingressHosts, err := nf.k8sClient.Ingress.GetIngressHosts(ctx, namespace, nf.label)
 	if err != nil {
 		return nil, fmt.Errorf("list ingress api nodes hosts: %s", err.Error())
 	}
 
-	ingressRouteHosts, err := nf.k8sClient.IngressRoute.ListAPINodesHosts(ctx, namespace)
+	ingressRouteHosts, err := nf.k8sClient.IngressRoute.GetIngressHosts(ctx, namespace, nf.label)
 	if err != nil {
 		return nil, fmt.Errorf("list ingress route api nodes hosts: %s", err.Error())
 	}
@@ -147,7 +155,7 @@ func (nf *nodeLister) List(ctx context.Context, namespace string) (nodes []funde
 
 	for _, node := range ingressHosts {
 		nodes = append(nodes, funder.NodeInfo{
-			Name:    node.Name,
+			Name:    strings.TrimSuffix(node.Name, "-api"),
 			Address: fmt.Sprintf("http://%s", node.Host),
 		})
 	}

config/config.yaml

@@ -105,6 +105,7 @@ node-groups:
       app.kubernetes.io/name: "bee"
       app.kubernetes.io/part-of: "bee"
       app.kubernetes.io/version: "latest"
+      beekeeper.ethswarm.org/node-funder: "true"
     node-selector:
       node-group: "private"
     persistence-enabled: false

config/local.yaml

@@ -117,6 +117,7 @@ node-groups:
       app.kubernetes.io/name: "bee"
       app.kubernetes.io/part-of: "bee"
       app.kubernetes.io/version: "latest"
+      beekeeper.ethswarm.org/node-funder: "true"
     node-selector:
       node-group: "local"
     persistence-enabled: false

config/testnet-giant.yaml

@@ -53,6 +53,7 @@ node-groups:
       app.kubernetes.io/name: "bee"
       app.kubernetes.io/part-of: "bee"
       app.kubernetes.io/version: "latest"
+      beekeeper.ethswarm.org/node-funder: "true"
     node-selector:
       node-group: "testnet-giant"
     persistence-enabled: false

config/testnet.yaml

@@ -50,6 +50,7 @@ node-groups:
       app.kubernetes.io/name: "bee"
       app.kubernetes.io/part-of: "bee"
       app.kubernetes.io/version: "latest"
+      beekeeper.ethswarm.org/node-funder: "true"
     node-selector:
       node-group: "private"
     persistence-enabled: true

pkg/k8s/customresource/ingressroute/client.go

@@ -3,7 +3,6 @@ package ingressroute
 import (
 	"context"
 	"fmt"
-	"strings"
 
 	"github.com/ethersphere/beekeeper/pkg/k8s/ingress"
 	"k8s.io/apimachinery/pkg/api/errors"
@@ -82,10 +81,10 @@ func (c *Client) Delete(ctx context.Context, name, namespace string) (err error)
 	return
 }
 
-// ListAPINodesHosts list Ingresses that are nodes
-func (c *Client) ListAPINodesHosts(ctx context.Context, namespace string) (nodes []ingress.NodeInfo, err error) {
+// GetIngressHosts list Ingress Routes hosts using label as selector, for the given namespace. If label is empty, all Ingresses are listed.
+func (c *Client) GetIngressHosts(ctx context.Context, namespace, label string) (nodes []ingress.NodeInfo, err error) {
 	ingressRoutes, err := c.clientset.IngressRoutes(namespace).List(ctx, metav1.ListOptions{
-		LabelSelector: "app.kubernetes.io/name=bee",
+		LabelSelector: label,
 	})
 	if err != nil {
 		if errors.IsNotFound(err) {
@@ -96,15 +95,13 @@ func (c *Client) ListAPINodesHosts(ctx context.Context, namespace string) (nodes
 
 	if ingressRoutes != nil {
 		for _, ingressRoute := range ingressRoutes.Items {
-			if strings.HasSuffix(ingressRoute.Name, "-api") {
-				for _, route := range ingressRoute.Spec.Routes {
-					host := route.GetHost()
-					if host != "" {
-						nodes = append(nodes, ingress.NodeInfo{
-							Name: strings.TrimSuffix(ingressRoute.Name, "-api"),
-							Host: host,
-						})
-					}
+			for _, route := range ingressRoute.Spec.Routes {
+				host := route.GetHost()
+				if host != "" {
+					nodes = append(nodes, ingress.NodeInfo{
+						Name: ingressRoute.Name,
+						Host: host,
+					})
 				}
 			}
 		}

pkg/k8s/ingress/client.go

@@ -3,7 +3,6 @@ package ingress
 import (
 	"context"
 	"fmt"
-	"strings"
 
 	v1 "k8s.io/api/networking/v1"
 	"k8s.io/apimachinery/pkg/api/errors"
@@ -76,10 +75,10 @@ func (c *Client) Delete(ctx context.Context, name, namespace string) (err error)
 	return
 }
 
-// ListAPINodesHosts list Ingresses that are nodes
-func (c *Client) ListAPINodesHosts(ctx context.Context, namespace string) (nodes []NodeInfo, err error) {
+// GetIngressHosts list Ingresses hosts using label as selector, for the given namespace. If label is empty, all Ingresses are listed.
+func (c *Client) GetIngressHosts(ctx context.Context, namespace, label string) (nodes []NodeInfo, err error) {
 	ingreses, err := c.clientset.NetworkingV1().Ingresses(namespace).List(ctx, metav1.ListOptions{
-		LabelSelector: "app.kubernetes.io/name=bee",
+		LabelSelector: label,
 	})
 	if err != nil {
 		if errors.IsNotFound(err) {
@@ -89,14 +88,12 @@ func (c *Client) ListAPINodesHosts(ctx context.Context, namespace string) (nodes
 	}
 
 	for _, ingress := range ingreses.Items {
-		if strings.HasSuffix(ingress.Name, "-api") {
-			for _, rule := range ingress.Spec.Rules {
-				if rule.Host != "" {
-					nodes = append(nodes, NodeInfo{
-						Name: strings.TrimSuffix(ingress.Name, "-api"),
-						Host: rule.Host,
-					})
-				}
+		for _, rule := range ingress.Spec.Rules {
+			if rule.Host != "" {
+				nodes = append(nodes, NodeInfo{
+					Name: ingress.Name,
+					Host: rule.Host,
+				})
 			}
 		}
 	}