Merge branch 'change/control-data-plane-split' into docs/update-accessing-nginx-containers

Author: ADubhlaoich

apis/v1alpha2/nginxproxy_types.go

@@ -517,6 +517,12 @@ type ServiceSpec struct {
 	// +optional
 	LoadBalancerIP *string `json:"loadBalancerIP,omitempty"`
 
+	// LoadBalancerClass is the class of the load balancer implementation this Service belongs to.
+	// Requires service type to be LoadBalancer.
+	//
+	// +optional
+	LoadBalancerClass *string `json:"loadBalancerClass,omitempty"`
+
 	// Annotations contain any Service-specific annotations.
 	//
 	// +optional

apis/v1alpha2/zz_generated.deepcopy.go

@@ -427,6 +427,10 @@ nginx:
     # -- The static IP address for the load balancer. Requires nginx.service.type set to LoadBalancer.
     # loadBalancerIP: ""
 
+    # -- LoadBalancerClass is the class of the load balancer implementation this Service belongs to.
+    # Requires nginx.service.type set to LoadBalancer.
+    # loadBalancerClass: ""
+
     # -- The IP ranges (CIDR) that are allowed to access the load balancer. Requires nginx.service.type set to LoadBalancer.
     # loadBalancerSourceRanges: []
 

charts/nginx-gateway-fabric/values.yaml

@@ -3482,6 +3482,11 @@ spec:
                         - Cluster
                         - Local
                         type: string
+                      loadBalancerClass:
+                        description: |-
+                          LoadBalancerClass is the class of the load balancer implementation this Service belongs to.
+                          Requires service type to be LoadBalancer.
+                        type: string
                       loadBalancerIP:
                         description: LoadBalancerIP is a static IP address for the
                           load balancer. Requires service type to be LoadBalancer.

config/crd/bases/gateway.nginx.org_nginxproxies.yaml

@@ -4067,6 +4067,11 @@ spec:
                         - Cluster
                         - Local
                         type: string
+                      loadBalancerClass:
+                        description: |-
+                          LoadBalancerClass is the class of the load balancer implementation this Service belongs to.
+                          Requires service type to be LoadBalancer.
+                        type: string
                       loadBalancerIP:
                         description: LoadBalancerIP is a static IP address for the
                           load balancer. Requires service type to be LoadBalancer.

deploy/crds.yaml

@@ -109,23 +109,21 @@ type objectFilter struct {
 // (3) Updating control plane configuration.
 // (4) Tracks the NGINX Plus usage reporting Secret (if applicable).
 type eventHandlerImpl struct {
-	// latestConfiguration is the latest Configuration generation.
-	latestConfiguration *dataplane.Configuration
+	// latestConfigurations are the latest Configuration generation for each Gateway tree.
+	latestConfigurations map[types.NamespacedName]*dataplane.Configuration
 
 	// objectFilters contains all created objectFilters, with the key being a filterKey
 	objectFilters map[filterKey]objectFilter
 
 	cfg  eventHandlerConfig
 	lock sync.Mutex
-
-	// version is the current version number of the nginx config.
-	version int
 }
 
 // newEventHandlerImpl creates a new eventHandlerImpl.
 func newEventHandlerImpl(cfg eventHandlerConfig) *eventHandlerImpl {
 	handler := &eventHandlerImpl{
-		cfg: cfg,
+		cfg:                  cfg,
+		latestConfigurations: make(map[types.NamespacedName]*dataplane.Configuration),
 	}
 
 	handler.objectFilters = map[filterKey]objectFilter{
@@ -158,28 +156,23 @@ func (h *eventHandlerImpl) HandleEventBatch(ctx context.Context, logger logr.Log
 		h.parseAndCaptureEvent(ctx, logger, event)
 	}
 
-	changeType, gr := h.cfg.processor.Process()
+	gr := h.cfg.processor.Process()
 
 	// Once we've processed resources on startup and built our first graph, mark the Pod as ready.
 	if !h.cfg.graphBuiltHealthChecker.ready {
 		h.cfg.graphBuiltHealthChecker.setAsReady()
 	}
 
-	h.sendNginxConfig(ctx, logger, gr, changeType)
+	h.sendNginxConfig(ctx, logger, gr)
 }
 
 // enable is called when the pod becomes leader to ensure the provisioner has
 // the latest configuration.
 func (h *eventHandlerImpl) enable(ctx context.Context) {
-	h.sendNginxConfig(ctx, h.cfg.logger, h.cfg.processor.GetLatestGraph(), state.ClusterStateChange)
+	h.sendNginxConfig(ctx, h.cfg.logger, h.cfg.processor.GetLatestGraph())
 }
 
-func (h *eventHandlerImpl) sendNginxConfig(
-	ctx context.Context,
-	logger logr.Logger,
-	gr *graph.Graph,
-	changeType state.ChangeType,
-) {
+func (h *eventHandlerImpl) sendNginxConfig(ctx context.Context, logger logr.Logger, gr *graph.Graph) {
 	if gr == nil {
 		return
 	}
@@ -215,68 +208,30 @@ func (h *eventHandlerImpl) sendNginxConfig(
 			panic("expected deployment, got nil")
 		}
 
-		configApplied := h.processStateAndBuildConfig(ctx, logger, gr, gw, changeType, deployment)
-
-		configErr := deployment.GetLatestConfigError()
-		upstreamErr := deployment.GetLatestUpstreamError()
-		err := errors.Join(configErr, upstreamErr)
-
-		if configApplied || err != nil {
-			obj := &status.QueueObject{
-				UpdateType: status.UpdateAll,
-				Error:      err,
-				Deployment: gw.DeploymentName,
-			}
-			h.cfg.statusQueue.Enqueue(obj)
-		}
-	}
-}
-
-func (h *eventHandlerImpl) processStateAndBuildConfig(
-	ctx context.Context,
-	logger logr.Logger,
-	gr *graph.Graph,
-	currentGateway *graph.Gateway,
-	changeType state.ChangeType,
-	deployment *agent.Deployment,
-) bool {
-	var configApplied bool
-	switch changeType {
-	case state.EndpointsOnlyChange:
-		h.version++
-		cfg := dataplane.BuildConfiguration(ctx, gr, currentGateway, h.cfg.serviceResolver, h.version, h.cfg.plus)
+		cfg := dataplane.BuildConfiguration(ctx, gr, gw, h.cfg.serviceResolver, h.cfg.plus)
 		depCtx, getErr := h.getDeploymentContext(ctx)
 		if getErr != nil {
 			logger.Error(getErr, "error getting deployment context for usage reporting")
 		}
 		cfg.DeploymentContext = depCtx
 
-		h.setLatestConfiguration(&cfg)
+		h.setLatestConfiguration(gw, &cfg)
 
 		deployment.FileLock.Lock()
-		if h.cfg.plus {
-			configApplied = h.cfg.nginxUpdater.UpdateUpstreamServers(deployment, cfg)
-		} else {
-			configApplied = h.updateNginxConf(deployment, cfg)
-		}
+		h.updateNginxConf(deployment, cfg)
 		deployment.FileLock.Unlock()
-	case state.ClusterStateChange:
-		h.version++
-		cfg := dataplane.BuildConfiguration(ctx, gr, currentGateway, h.cfg.serviceResolver, h.version, h.cfg.plus)
-		depCtx, getErr := h.getDeploymentContext(ctx)
-		if getErr != nil {
-			logger.Error(getErr, "error getting deployment context for usage reporting")
-		}
-		cfg.DeploymentContext = depCtx
 
-		h.setLatestConfiguration(&cfg)
+		configErr := deployment.GetLatestConfigError()
+		upstreamErr := deployment.GetLatestUpstreamError()
+		err := errors.Join(configErr, upstreamErr)
 
-		deployment.FileLock.Lock()
-		configApplied = h.updateNginxConf(deployment, cfg)
-		deployment.FileLock.Unlock()
+		obj := &status.QueueObject{
+			UpdateType: status.UpdateAll,
+			Error:      err,
+			Deployment: gw.DeploymentName,
+		}
+		h.cfg.statusQueue.Enqueue(obj)
 	}
-
-	return configApplied
 }
 
 func (h *eventHandlerImpl) waitForStatusUpdates(ctx context.Context) {
@@ -451,16 +406,14 @@ func (h *eventHandlerImpl) parseAndCaptureEvent(ctx context.Context, logger logr
 func (h *eventHandlerImpl) updateNginxConf(
 	deployment *agent.Deployment,
 	conf dataplane.Configuration,
-) bool {
+) {
 	files := h.cfg.generator.Generate(conf)
-	applied := h.cfg.nginxUpdater.UpdateConfig(deployment, files)
+	h.cfg.nginxUpdater.UpdateConfig(deployment, files)
 
 	// If using NGINX Plus, update upstream servers using the API.
 	if h.cfg.plus {
 		h.cfg.nginxUpdater.UpdateUpstreamServers(deployment, conf)
 	}
-
-	return applied
 }
 
 // updateControlPlaneAndSetStatus updates the control plane configuration and then sets the status
@@ -570,21 +523,28 @@ func (h *eventHandlerImpl) getDeploymentContext(ctx context.Context) (dataplane.
 }
 
 // GetLatestConfiguration gets the latest configuration.
-func (h *eventHandlerImpl) GetLatestConfiguration() *dataplane.Configuration {
+func (h *eventHandlerImpl) GetLatestConfiguration() []*dataplane.Configuration {
 	h.lock.Lock()
 	defer h.lock.Unlock()
 
-	return h.latestConfiguration
+	configs := make([]*dataplane.Configuration, 0, len(h.latestConfigurations))
+	for _, cfg := range h.latestConfigurations {
+		configs = append(configs, cfg)
+	}
+
+	return configs
 }
 
 // setLatestConfiguration sets the latest configuration.
-// TODO(sberman): once we support multiple Gateways, this will likely have to be a map
-// of all configurations.
-func (h *eventHandlerImpl) setLatestConfiguration(cfg *dataplane.Configuration) {
+func (h *eventHandlerImpl) setLatestConfiguration(gateway *graph.Gateway, cfg *dataplane.Configuration) {
+	if gateway == nil || gateway.Source == nil {
+		return
+	}
+
 	h.lock.Lock()
 	defer h.lock.Unlock()
 
-	h.latestConfiguration = cfg
+	h.latestConfigurations[client.ObjectKeyFromObject(gateway.Source)] = cfg
 }
 
 func objectFilterKey(obj client.Object, nsName types.NamespacedName) filterKey {