address comments

Signed-off-by: Huabing (Robin) Zhao <zhaohuabing@gmail.com>

Author: zhaohuabing

internal/infrastructure/kubernetes/ratelimit_infra_test.go

@@ -16,26 +16,23 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	"github.com/envoyproxy/gateway/internal/infrastructure/kubernetes/ratelimit"
-	"github.com/envoyproxy/gateway/internal/provider/kubernetes"
 )
 
 func createRateLimitTLSSecret(t *testing.T, client client.Client) {
-	_, secretErr := kubernetes.CreateOrUpdateSecrets(context.Background(), client, []corev1.Secret{
-		{
-			Type: corev1.SecretTypeTLS,
-			TypeMeta: metav1.TypeMeta{
-				Kind:       "Secret",
-				APIVersion: "v1",
-			},
-			ObjectMeta: metav1.ObjectMeta{
-				Name:      "ratelimit-cert",
-				Namespace: "envoy-gateway-system",
-				Labels: map[string]string{
-					"control-plane": "envoy-gateway",
-				},
+	secretErr := client.Create(context.Background(), &corev1.Secret{
+		Type: corev1.SecretTypeTLS,
+		TypeMeta: metav1.TypeMeta{
+			Kind:       "Secret",
+			APIVersion: "v1",
+		},
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      "ratelimit-cert",
+			Namespace: "envoy-gateway-system",
+			Labels: map[string]string{
+				"control-plane": "envoy-gateway",
 			},
 		},
-	}, false)
+	})
 	require.NoError(t, secretErr)
 }
 

internal/infrastructure/manager.go

@@ -20,13 +20,11 @@ import (
 	"github.com/envoyproxy/gateway/internal/message"
 )
 
-var (
-	// globalClient is the cached client used by infrastructure managers
-	globalClient client.Client
-)
+// globalClient is the cached client used by infrastructure managers
+var globalClient client.Client
 
 // SetGlobalClient sets the global cached client for infrastructure managers.
-// This should be called by the provider after creating the manager.
+// This should be called by the kubernetes provider after creating the manager.
 func SetGlobalClient(cli client.Client) {
 	globalClient = cli
 }

internal/infrastructure/runner/runner.go

@@ -7,6 +7,7 @@ package runner
 
 import (
 	"context"
+	"sync"
 
 	"github.com/telepresenceio/watchable"
 	"k8s.io/utils/ptr"
@@ -27,6 +28,8 @@ type Config struct {
 type Runner struct {
 	Config
 	mgr infrastructure.Manager
+
+	rateLimitInfraOnce sync.Once
 }
 
 // Close implements Runner interface.
@@ -52,6 +55,7 @@ func (r *Runner) Start(ctx context.Context) (err error) {
 		return nil
 	}
 	errNotifier := message.RunnerErrorNotifier{RunnerName: r.Name(), RunnerErrors: r.RunnerErrors}
+
 	r.mgr, err = infrastructure.NewManager(ctx, &r.Server, r.Logger, errNotifier)
 	if err != nil {
 		r.Logger.Error(err, "failed to create new manager")
@@ -64,17 +68,6 @@ func (r *Runner) Start(ctx context.Context) (err error) {
 		sub := r.InfraIR.Subscribe(ctx)
 		go r.updateProxyInfraFromSubscription(ctx, sub)
 
-		// Enable global ratelimit if it has been configured.
-		if r.EnvoyGateway.RateLimit != nil {
-			go r.enableRateLimitInfra(ctx)
-		} else {
-			// Delete the ratelimit infra if it exists.
-			go func() {
-				if err := r.mgr.DeleteRateLimitInfra(ctx); err != nil {
-					r.Logger.Error(err, "failed to delete ratelimit infra")
-				}
-			}()
-		}
 		r.Logger.Info("started")
 		<-ctx.Done()
 		r.InfraIR.Close()
@@ -132,13 +125,20 @@ func (r *Runner) updateProxyInfraFromSubscription(ctx context.Context, sub <-cha
 					errChan <- err
 				}
 			}
+
+			// Handle rate limit infra once on first IR update.
+			r.rateLimitInfraOnce.Do(func() {
+				if r.EnvoyGateway.RateLimit != nil {
+					if err := r.mgr.CreateOrUpdateRateLimitInfra(ctx); err != nil {
+						r.Logger.Error(err, "failed to create ratelimit infra")
+					}
+				} else {
+					if err := r.mgr.DeleteRateLimitInfra(ctx); err != nil {
+						r.Logger.Error(err, "failed to delete ratelimit infra")
+					}
+				}
+			})
 		},
 	)
 	r.Logger.Info("infra subscriber shutting down")
 }
-
-func (r *Runner) enableRateLimitInfra(ctx context.Context) {
-	if err := r.mgr.CreateOrUpdateRateLimitInfra(ctx); err != nil {
-		r.Logger.Error(err, "failed to create ratelimit infra")
-	}
-}