fixup! test: Configure e2e client scheme for metallb types

Author: jimmidyson

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

@@ -5,6 +5,7 @@ package metallb
 import (
 	"fmt"
 
+	"github.com/samber/lo"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
@@ -32,15 +33,13 @@ func ConfigurationObjects(input *ConfigurationInput) ([]client.Object, error) {
 			Name:      input.Name,
 			Namespace: input.Namespace,
 		},
+		Spec: metallbv1.IPAddressPoolSpec{
+			Addresses: lo.Map(input.AddressRanges, func(ar v1alpha1.AddressRange, _ int) string {
+				return fmt.Sprintf("%s-%s", ar.Start, ar.End)
+			}),
+		},
 	}
 
-	addresses := []string{}
-	for _, ar := range input.AddressRanges {
-		addresses = append(addresses, fmt.Sprintf("%s-%s", ar.Start, ar.End))
-	}
-
-	ipAddressPool.Spec.Addresses = addresses
-
 	l2Advertisement := &metallbv1.L2Advertisement{
 		TypeMeta: metav1.TypeMeta{
 			Kind:       "L2Advertisement",
@@ -50,10 +49,11 @@ func ConfigurationObjects(input *ConfigurationInput) ([]client.Object, error) {
 			Name:      input.Name,
 			Namespace: input.Namespace,
 		},
+		Spec: metallbv1.L2AdvertisementSpec{
+			IPAddressPools: []string{ipAddressPool.GetName()},
+		},
 	}
 
-	l2Advertisement.Spec.IPAddressPools = []string{ipAddressPool.GetName()}
-
 	return []client.Object{
 		ipAddressPool,
 		l2Advertisement,

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

@@ -162,8 +162,10 @@ func (n *MetalLB) Apply(
 						},
 					},
 				); err != nil {
-					// Return early if the error is not a conflict.
-					if !apierrors.IsConflict(err) {
+					// Return early if the error is not a conflict or an internal error.
+					// Internal errors are generally seen when the necessary CRD webhooks are not yet registered so are
+					// retryable.
+					if !apierrors.IsConflict(err) && !apierrors.IsInternalError(err) {
 						return false, err
 					}
 

test/e2e/e2e_suite_test.go

@@ -19,7 +19,6 @@ import (
 
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
-	storagev1 "k8s.io/api/storage/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/klog/v2"
 	capie2e "sigs.k8s.io/cluster-api/test/e2e"
@@ -28,6 +27,7 @@ import (
 	"sigs.k8s.io/cluster-api/test/framework/clusterctl"
 	ctrl "sigs.k8s.io/controller-runtime"
 
+	metallbv1 "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/api/external/go.universe.tf/metallb/api/v1beta1"
 	helmaddonsv1 "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/api/external/sigs.k8s.io/cluster-api-addon-provider-helm/api/v1alpha1"
 	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/test/e2e/framework"
 	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/test/framework/bootstrap"
@@ -209,7 +209,7 @@ func initScheme() *runtime.Scheme {
 	scheme := runtime.NewScheme()
 	capie2eframework.TryAddDefaultSchemes(scheme)
 	Expect(helmaddonsv1.AddToScheme(scheme)).To(Succeed())
-	Expect(storagev1.AddToScheme(scheme)).To(Succeed())
+	Expect(metallbv1.AddToScheme(scheme)).To(Succeed())
 	return scheme
 }
 

test/e2e/resource_helpers.go

@@ -11,6 +11,7 @@ import (
 	"time"
 
 	. "github.com/onsi/gomega"
+	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	capie2e "sigs.k8s.io/cluster-api/test/e2e"
 	"sigs.k8s.io/cluster-api/test/framework"
 	"sigs.k8s.io/controller-runtime/pkg/client"
@@ -30,8 +31,8 @@ func WaitForResources(
 ) {
 	start := time.Now()
 
-	for i := range input.Resources {
-		obj := input.Resources[i].DeepCopyObject().(client.Object)
+	for _, obj := range input.Resources {
+		obj = obj.DeepCopyObject().(client.Object)
 		key := client.ObjectKeyFromObject(obj)
 		capie2e.Byf("waiting for resource %s %s to be present",
 			obj.GetObjectKind().GroupVersionKind(),
@@ -41,11 +42,14 @@ func WaitForResources(
 			obj.GetObjectKind().GroupVersionKind(),
 			key,
 		)
-		Eventually(func() bool {
+		Eventually(func() (bool, error) {
 			if err := input.Getter.Get(ctx, key, obj); err != nil {
-				return false
+				if apierrors.IsNotFound(err) {
+					return false, nil
+				}
+				return false, err
 			}
-			return true
+			return true, nil
 		}, intervals...).Should(BeTrue(),
 			fmt.Sprintf("Resource %s %s was not found",
 				obj.GetObjectKind().GroupVersionKind(),