refactor: Allow other packages to create metallb configuration

Author: dlipovetsky

pkg/handlers/generic/lifecycle/serviceloadbalancer/metallb/configuration.go

@@ -11,32 +11,32 @@ import (
 	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/api/v1alpha1"
 )
 
-func groupVersionKind(kind string) schema.GroupVersionKind {
+func GroupVersionKind(kind string) schema.GroupVersionKind {
 	return schema.GroupVersionKind{
 		Group:   "metallb.io",
 		Version: "v1beta1",
 		Kind:    kind,
 	}
 }
 
-type configurationInput struct {
-	name          string
-	namespace     string
-	addressRanges []v1alpha1.AddressRange
+type ConfigurationInput struct {
+	Name          string
+	Namespace     string
+	AddressRanges []v1alpha1.AddressRange
 }
 
-func configurationObjects(input *configurationInput) ([]unstructured.Unstructured, error) {
-	if len(input.addressRanges) == 0 {
-		return nil, fmt.Errorf("must define one or more addressRanges")
+func ConfigurationObjects(input *ConfigurationInput) ([]*unstructured.Unstructured, error) {
+	if len(input.AddressRanges) == 0 {
+		return nil, fmt.Errorf("must define one or more AddressRanges")
 	}
 
-	ipAddressPool := unstructured.Unstructured{}
-	ipAddressPool.SetGroupVersionKind(groupVersionKind("IPAddressPool"))
-	ipAddressPool.SetName(input.name)
-	ipAddressPool.SetNamespace(input.namespace)
+	ipAddressPool := &unstructured.Unstructured{}
+	ipAddressPool.SetGroupVersionKind(GroupVersionKind("IPAddressPool"))
+	ipAddressPool.SetName(input.Name)
+	ipAddressPool.SetNamespace(input.Namespace)
 
 	addresses := []string{}
-	for _, ar := range input.addressRanges {
+	for _, ar := range input.AddressRanges {
 		addresses = append(addresses, fmt.Sprintf("%s-%s", ar.Start, ar.End))
 	}
 	if err := unstructured.SetNestedStringSlice(
@@ -48,10 +48,10 @@ func configurationObjects(input *configurationInput) ([]unstructured.Unstructure
 		return nil, fmt.Errorf("failed to set IPAddressPool .spec.addresses: %w", err)
 	}
 
-	l2Advertisement := unstructured.Unstructured{}
-	l2Advertisement.SetGroupVersionKind(groupVersionKind("L2Advertisement"))
-	l2Advertisement.SetName(input.name)
-	l2Advertisement.SetNamespace(input.namespace)
+	l2Advertisement := &unstructured.Unstructured{}
+	l2Advertisement.SetGroupVersionKind(GroupVersionKind("L2Advertisement"))
+	l2Advertisement.SetName(input.Name)
+	l2Advertisement.SetNamespace(input.Namespace)
 
 	if err := unstructured.SetNestedStringSlice(
 		l2Advertisement.Object,
@@ -64,7 +64,7 @@ func configurationObjects(input *configurationInput) ([]unstructured.Unstructure
 		return nil, fmt.Errorf("failed to set L2Advertisement .spec.ipAddressPools: %w", err)
 	}
 
-	return []unstructured.Unstructured{
+	return []*unstructured.Unstructured{
 		ipAddressPool,
 		l2Advertisement,
 	}, nil

pkg/handlers/generic/lifecycle/serviceloadbalancer/metallb/handler.go

@@ -28,8 +28,8 @@ import (
 )
 
 const (
-	defaultHelmReleaseName      = "metallb"
-	defaultHelmReleaseNamespace = "metallb-system"
+	DefaultHelmReleaseName      = "metallb"
+	DefaultHelmReleaseNamespace = "metallb-system"
 )
 
 // These labels allow the MetalLB speaker pod to obtain elevated permissions,
@@ -107,14 +107,14 @@ func (n *MetalLB) Apply(
 	err = handlersutils.EnsureNamespaceWithMetadata(
 		ctx,
 		remoteClient,
-		defaultHelmReleaseNamespace,
+		DefaultHelmReleaseNamespace,
 		podSecurityReleaseNamespaceLabels,
 		nil,
 	)
 	if err != nil {
 		return fmt.Errorf(
 			"failed to ensure release namespace %q exists: %w",
-			defaultHelmReleaseName,
+			DefaultHelmReleaseName,
 			err,
 		)
 	}
@@ -139,8 +139,8 @@ func (n *MetalLB) Apply(
 			ClusterSelector: metav1.LabelSelector{
 				MatchLabels: map[string]string{clusterv1.ClusterNameLabel: cluster.Name},
 			},
-			ReleaseNamespace: defaultHelmReleaseNamespace,
-			ReleaseName:      defaultHelmReleaseName,
+			ReleaseNamespace: DefaultHelmReleaseNamespace,
+			ReleaseName:      DefaultHelmReleaseName,
 			Version:          helmChartInfo.Version,
 			ValuesTemplate:   values,
 		},
@@ -189,10 +189,10 @@ func (n *MetalLB) Apply(
 		),
 	)
 
-	cos, err := configurationObjects(&configurationInput{
-		name:          defaultHelmReleaseName,
-		namespace:     defaultHelmReleaseNamespace,
-		addressRanges: slb.Configuration.AddressRanges,
+	cos, err := ConfigurationObjects(&ConfigurationInput{
+		Name:          DefaultHelmReleaseName,
+		Namespace:     DefaultHelmReleaseNamespace,
+		AddressRanges: slb.Configuration.AddressRanges,
 	})
 	if err != nil {
 		return fmt.Errorf("failed to generate MetalLB configuration: %w", err)
@@ -206,7 +206,7 @@ func (n *MetalLB) Apply(
 		true,
 		func(ctx context.Context) (done bool, err error) {
 			for i := range cos {
-				o := &cos[i]
+				o := cos[i]
 				if err = client.ServerSideApply(
 					ctx,
 					remoteClient,