[provider] refactoring kubernetes provider to single reconciler

internal/cmd/server.go

@@ -151,16 +151,9 @@ func setupRunners(cfg *config.Server) error {
 	// Wait until done
 	<-ctx.Done()
 	// Close messages
-	pResources.GatewayClasses.Close()
-	pResources.Gateways.Close()
-	pResources.HTTPRoutes.Close()
-	pResources.Services.Close()
-	pResources.Secrets.Close()
-	pResources.ReferenceGrants.Close()
-	pResources.Namespaces.Close()
+	pResources.GatewayAPIResources.Close()
 	pResources.GatewayStatuses.Close()
 	pResources.HTTPRouteStatuses.Close()
-	pResources.TLSRoutes.Close()
 	pResources.TLSRouteStatuses.Close()
 	xdsIR.Close()
 	infraIR.Close()

internal/gatewayapi/helpers_v1alpha2.go

@@ -137,6 +137,55 @@ func DowngradeRouteParentStatuses(routeParentStatuses []v1beta1.RouteParentStatu
 	return res
 }
 
+// UpgradeBackendRef converts v1alpha2.BackendRef to v1beta1.BackendRef
+func UpgradeBackendRef(old v1alpha2.BackendRef) v1beta1.BackendRef {
+	upgraded := v1beta1.BackendRef{}
+
+	if old.Group != nil {
+		upgraded.Group = GroupPtr(string(*old.Group))
+	}
+
+	if old.Kind != nil {
+		upgraded.Kind = KindPtr(string(*old.Kind))
+	}
+
+	if old.Namespace != nil {
+		upgraded.Namespace = NamespacePtr(string(*old.Namespace))
+	}
+
+	upgraded.Name = v1beta1.ObjectName(old.Name)
+
+	if old.Port != nil {
+		upgraded.Port = PortNumPtr(int32(*old.Port))
+	}
+
+	return upgraded
+}
+
+func DowngradeBackendRef(old v1beta1.BackendRef) v1alpha2.BackendRef {
+	downgraded := v1alpha2.BackendRef{}
+
+	if old.Group != nil {
+		downgraded.Group = GroupPtrV1Alpha2(string(*old.Group))
+	}
+
+	if old.Kind != nil {
+		downgraded.Kind = KindPtrV1Alpha2(string(*old.Kind))
+	}
+
+	if old.Namespace != nil {
+		downgraded.Namespace = NamespacePtrV1Alpha2(string(*old.Namespace))
+	}
+
+	downgraded.Name = v1alpha2.ObjectName(old.Name)
+
+	if old.Port != nil {
+		downgraded.Port = PortNumPtrV1Alpha2(int(*old.Port))
+	}
+
+	return downgraded
+}
+
 func NamespaceDerefOrAlpha(namespace *v1alpha2.Namespace, defaultNamespace string) string {
 	if namespace != nil && *namespace != "" {
 		return string(*namespace)

internal/gatewayapi/runner/runner.go

@@ -45,52 +45,20 @@ func (r *Runner) Start(ctx context.Context) error {
 }
 
 func (r *Runner) subscribeAndTranslate(ctx context.Context) {
-	// Subscribe to resources
-	gatewayClassesCh := r.ProviderResources.GatewayClasses.Subscribe(ctx)
-	gatewaysCh := r.ProviderResources.Gateways.Subscribe(ctx)
-	secretsCh := r.ProviderResources.Secrets.Subscribe(ctx)
-	refGrantsCh := r.ProviderResources.ReferenceGrants.Subscribe(ctx)
-	httpRoutesCh := r.ProviderResources.HTTPRoutes.Subscribe(ctx)
-	tlsRoutesCh := r.ProviderResources.TLSRoutes.Subscribe(ctx)
-	servicesCh := r.ProviderResources.Services.Subscribe(ctx)
-	namespacesCh := r.ProviderResources.Namespaces.Subscribe(ctx)
-
-	for ctx.Err() == nil {
-		var in gatewayapi.Resources
-		// Receive subscribed resource notifications
-		select {
-		case <-gatewayClassesCh:
-		case <-gatewaysCh:
-		case <-secretsCh:
-		case <-refGrantsCh:
-		case <-httpRoutesCh:
-		case <-tlsRoutesCh:
-		case <-servicesCh:
-		case <-namespacesCh:
-		}
-		r.Logger.Info("received a notification")
-		// Load all resources required for translation
-		in.Gateways = r.ProviderResources.GetGateways()
-		in.Secrets = r.ProviderResources.GetSecrets()
-		in.ReferenceGrants = r.ProviderResources.GetReferenceGrants()
-		in.HTTPRoutes = r.ProviderResources.GetHTTPRoutes()
-		in.TLSRoutes = r.ProviderResources.GetTLSRoutes()
-		in.Services = r.ProviderResources.GetServices()
-		in.Namespaces = r.ProviderResources.GetNamespaces()
-		gatewayClasses := r.ProviderResources.GetGatewayClasses()
-		// Fetch the first gateway class since there should be only 1
-		// gateway class linked to this controller
-		switch {
-		case gatewayClasses == nil:
-			// Envoy Gateway startup.
-			continue
-		default:
+	message.HandleSubscription(r.ProviderResources.GatewayAPIResources.Subscribe(ctx),
+		func(update message.Update[string, *gatewayapi.Resources]) {
+			val := update.Value
+
+			if update.Delete || val == nil {
+				return
+			}
+
 			// Translate and publish IRs.
 			t := &gatewayapi.Translator{
-				GatewayClassName: v1beta1.ObjectName(gatewayClasses[0].GetName()),
+				GatewayClassName: v1beta1.ObjectName(update.Key),
 			}
 			// Translate to IR
-			result := t.Translate(&in)
+			result := t.Translate(val)
 
 			yamlXdsIR, _ := yaml.Marshal(&result.XdsIR)
 			r.Logger.WithValues("output", "xds-ir").Info(string(yamlXdsIR))
@@ -143,8 +111,8 @@ func (r *Runner) subscribeAndTranslate(ctx context.Context) {
 				key := utils.NamespacedName(tlsRoute)
 				r.ProviderResources.TLSRouteStatuses.Store(key, tlsRoute)
 			}
-		}
-	}
+		},
+	)
 	r.Logger.Info("shutting down")
 }
 

internal/gatewayapi/runner/runner_test.go

@@ -13,7 +13,6 @@ import (
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"k8s.io/apimachinery/pkg/types"
 
 	"github.com/envoyproxy/gateway/internal/envoygateway/config"
 	"github.com/envoyproxy/gateway/internal/ir"
@@ -45,8 +44,7 @@ func TestRunner(t *testing.T) {
 	// TODO: pass valid provider resources
 
 	// Delete gateway from the map.
-	key := types.NamespacedName{Namespace: "test", Name: "test"}
-	pResources.Gateways.Delete(key)
+	pResources.GatewayAPIResources.Delete("test")
 	require.Eventually(t, func() bool {
 		out := xdsIR.LoadAll()
 		if out == nil {

internal/gatewayapi/translator.go

@@ -48,6 +48,7 @@ type InfraIRMap map[string]*ir.Infra
 
 // Resources holds the Gateway API and related
 // resources that the translators needs as inputs.
+// +k8s:deepcopy-gen=true
 type Resources struct {
 	Gateways        []*v1beta1.Gateway
 	HTTPRoutes      []*v1beta1.HTTPRoute