added blocking channel for tests to backfill

Signed-off-by: James Milligan <[email protected]>

Author: james-milligan

main.go

@@ -201,7 +201,8 @@ func main() {
 	}(errChan)
 
 	setupLog.Info("restoring flagd-kubernetes-sync cluster role binding subjects from current cluster state")
-	podMutator.BackfillPermissions(ctx)
+	// backfill can be handled asynchronously, so we do not need to block via the channel
+	go podMutator.BackfillPermissions(ctx, make(chan struct{}, 1))
 
 	if err := <-errChan; err != nil {
 		setupLog.Error(err, "problem running manager")

webhooks/pod_webhook.go

@@ -53,7 +53,11 @@ type PodMutator struct {
 }
 
 // BackfillPermissions recovers the state of the flagd-kubernetes-sync role binding in the event of upgrade
-func (m *PodMutator) BackfillPermissions(ctx context.Context) {
+func (m *PodMutator) BackfillPermissions(ctx context.Context, backfillComplete chan struct{}) {
+	defer func() {
+		backfillComplete <- struct{}{}
+	}()
+
 	for i := 0; i < 5; i++ {
 		// fetch all pods with the "openfeature.dev/enabled" annotation set to "true"
 		podList := &corev1.PodList{}

webhooks/run_test.go

@@ -2,7 +2,6 @@ package webhooks
 
 import (
 	"context"
-	"log"
 
 	corev1alpha1 "github.com/open-feature/open-feature-operator/apis/core/v1alpha1"
 	corev1alpha2 "github.com/open-feature/open-feature-operator/apis/core/v1alpha2"
@@ -16,7 +15,7 @@ import (
 	// +kubebuilder:scaffold:imports
 )
 
-func run(ctx context.Context, cfg *rest.Config, scheme *runtime.Scheme, opts *envtest.WebhookInstallOptions) error {
+func run(ctx context.Context, cfg *rest.Config, scheme *runtime.Scheme, opts *envtest.WebhookInstallOptions, backfillComplete chan struct{}) error {
 	ctrl.SetLogger(zap.New(zap.UseDevMode(true)))
 
 	mgr, err := ctrl.NewManager(cfg, ctrl.Options{
@@ -61,11 +60,14 @@ func run(ctx context.Context, cfg *rest.Config, scheme *runtime.Scheme, opts *en
 			Log:    ctrl.Log.WithName("validating-featureflagconfiguration-webhook"),
 		},
 	})
-	go func() {
-		if err := mgr.Start(ctx); err != nil {
-			log.Fatal("unable to setup test suite", err)
-		}
-	}()
-	podMutator.BackfillPermissions(ctx)
+
+	go func(ctx context.Context, backfillComplete chan struct{}) {
+		podMutator.BackfillPermissions(ctx, backfillComplete)
+	}(ctx, backfillComplete)
+
+	if err := mgr.Start(ctx); err != nil {
+		return err
+	}
+
 	return nil
 }

webhooks/suite_test.go

@@ -158,9 +158,12 @@ var _ = BeforeSuite(func() {
 	setupPreviouslyExistingPods()
 
 	By("running webhook server")
-	if err := run(testCtx, cfg, scheme, &testEnv.WebhookInstallOptions); err != nil {
-		logf.Log.Error(err, "run webhook server")
-	}
+	backfillComplete := make(chan struct{}, 1)
+	go func() {
+		if err := run(testCtx, cfg, scheme, &testEnv.WebhookInstallOptions, backfillComplete); err != nil {
+			logf.Log.Error(err, "run webhook server")
+		}
+	}()
 	d := &net.Dialer{Timeout: time.Second}
 	Eventually(func() error {
 		serverURL := fmt.Sprintf("%s:%d", testEnv.WebhookInstallOptions.LocalServingHost, testEnv.WebhookInstallOptions.LocalServingPort)
@@ -175,7 +178,7 @@ var _ = BeforeSuite(func() {
 		}
 		return nil
 	}).Should(Succeed())
-
+	<-backfillComplete
 	By("setting up resources")
 	setupMutatePodResources()
 	setupValidateFeatureFlagConfigurationResources()