Enable configuration of loadBalancerClass

Add the ability to set a 'loadBalancerClass' value on the 'MetalLB' CRD.
The 'Service.Spec.LoadBalancerClass' field reached GA in Kubernetes 1.24
and support was introduced in MetalLB in v0.13 [1].

[1] metallb/metallb#1417

Signed-off-by: Stephen Finucane <stephenfin@redhat.com>
Closes: #267

api/v1beta1/metallb_types.go

@@ -59,6 +59,11 @@ type MetalLBSpec struct {
 	// +kubebuilder:validation:Enum=all;debug;info;warn;error;none
 	LogLevel MetalLBLogLevel `json:"logLevel,omitempty"`
 
+	// The loadBalancerClass spec attribute that the MetalLB controller should
+	// be watching for
+	// +optional
+	LoadBalancerClass string `json:"loadBalancerClass,omitempty"`
+
 	// node selector applied to MetalLB controller deployment.
 	// +optional
 	ControllerNodeSelector map[string]string `json:"controllerNodeSelector,omitempty"`

bin/metallb-operator.yaml

@@ -2277,6 +2277,10 @@ spec:
                 description: Foo is an example field of MetalLB. Edit MetalLB_types.go
                   to remove/update
                 type: string
+              loadBalancerClass:
+                description: The loadBalancerClass spec attribute that the MetalLB
+                  controller should be watching for
+                type: string
               logLevel:
                 description: 'Define the verbosity of the controller and the speaker
                   logging. Allowed values are: all, debug, info, warn, error, none.

config/crd/bases/metallb.io_metallbs.yaml

@@ -996,6 +996,10 @@ spec:
                 description: Foo is an example field of MetalLB. Edit MetalLB_types.go
                   to remove/update
                 type: string
+              loadBalancerClass:
+                description: The loadBalancerClass spec attribute that the MetalLB
+                  controller should be watching for
+                type: string
               logLevel:
                 description: 'Define the verbosity of the controller and the speaker
                   logging. Allowed values are: all, debug, info, warn, error, none.

config/samples/demo/metallb-advanced-config.yaml

@@ -1,8 +1,8 @@
 apiVersion: node.k8s.io/v1
 kind: RuntimeClass
 metadata:
-  name: myclass 
-handler: myconfiguration 
+  name: myclass
+handler: myconfiguration
 ---
 apiVersion: scheduling.k8s.io/v1
 kind: PriorityClass
@@ -19,6 +19,7 @@ spec:
   logLevel: debug
   nodeSelector:
     feature.node.kubernetes.io/metalLB.capable: 'true'
+  loadBalancerClass: 'metallb.universe.tf/metallb'
   speakerTolerations:
   - key: "Example"
     operator: "Exists"

config/samples/demo/metallb.yaml

@@ -6,6 +6,7 @@ metadata:
 spec:
   nodeSelector:
     feature.node.kubernetes.io/metalLB.capable: 'true'
+  loadBalancerClass: 'metallb.universe.tf/metallb'
   speakerTolerations:
   - key: "Example"
     operator: "Exists"

pkg/helm/config.go

@@ -49,11 +49,18 @@ type imageInfo struct {
 }
 
 func patchToChartValues(c *chartConfig, crdConfig *metallbv1beta1.MetalLB, withPrometheus bool, valueMap map[string]interface{}) {
+	withGeneralValues(c, crdConfig, valueMap)
 	withPrometheusValues(c, valueMap)
 	withControllerValues(c, crdConfig, valueMap)
 	withSpeakerValues(c, crdConfig, valueMap)
 }
 
+func withGeneralValues(c *chartConfig, crdConfig *metallbv1beta1.MetalLB, valueMap map[string]interface{}) {
+	if crdConfig.Spec.LoadBalancerClass != "" {
+		valueMap["loadBalancerClass"] = crdConfig.Spec.LoadBalancerClass
+	}
+}
+
 func withPrometheusValues(c *chartConfig, valueMap map[string]interface{}) {
 	speakerTLSConfig := map[string]interface{}{
 		"insecureSkipVerify": true,

pkg/helm/helm_test.go

@@ -85,6 +85,7 @@ func TestParseMetalLBChartWithCustomValues(t *testing.T) {
 			Effect:   v1.TaintEffectNoExecute,
 		},
 	}
+	loadBalancerClass := "metallb.universe.tf/metallb"
 	controllerNodeSelector := map[string]string{"kubernetes.io/os": "linux", "node-role.kubernetes.io/worker": "true"}
 	controllerConfig := &metallbv1beta1.Config{
 		PriorityClassName: "high-priority",
@@ -118,6 +119,7 @@ func TestParseMetalLBChartWithCustomValues(t *testing.T) {
 			ControllerTolerations:  controllerTolerations,
 			ControllerConfig:       controllerConfig,
 			SpeakerConfig:          speakerConfig,
+			LoadBalancerClass:      loadBalancerClass,
 		},
 	}
 
@@ -163,6 +165,7 @@ func TestParseMetalLBChartWithCustomValues(t *testing.T) {
 				if container.Name == "speaker" {
 					g.Expect(container.Resources).NotTo(BeNil())
 					g.Expect(container.Resources.Limits.Cpu().MilliValue()).To(Equal(int64(200)))
+					g.Expect(container.Args).To(ContainElement("--lb-class=metallb.universe.tf/metallb"))
 					speakerContainerFound = true
 				}
 			}