update handler to recieve status update for gateways

Author: salonichf5

cmd/gateway/commands_test.go

@@ -63,6 +63,8 @@ func TestCommonFlagsValidation(t *testing.T) {
 			args: []string{
 				"--gateway-ctlr-name=gateway.nginx.org/nginx-gateway",
 				"--gatewayclass=nginx",
+				"--gateway=nginx-gateway/nginx",
+				"--config=nginx-gateway-config",
 			},
 			wantErr: false,
 		},

examples/cafe-example/cafe-routes.yaml

@@ -6,6 +6,8 @@ spec:
   parentRefs:
   - name: gateway
     sectionName: http
+  - name: gateway3
+    sectionName: http
   hostnames:
   - "cafe.example.com"
   rules:
@@ -25,6 +27,8 @@ spec:
   parentRefs:
   - name: gateway
     sectionName: http
+  - name: gateway3
+    sectionName: http
   hostnames:
   - "cafe.example.com"
   rules:

examples/cafe-example/gateway.yaml

@@ -9,3 +9,27 @@ spec:
     port: 80
     protocol: HTTP
     hostname: "*.example.com"
+---
+apiVersion: gateway.networking.k8s.io/v1
+kind: Gateway
+metadata:
+  name: gateway2
+spec:
+  gatewayClassName: nginx
+  listeners:
+  - name: http
+    port: 80
+    protocol: HTTP
+    hostname: "*.example.com"
+---
+apiVersion: gateway.networking.k8s.io/v1
+kind: Gateway
+metadata:
+  name: gateway3
+spec:
+  gatewayClassName: nginx
+  listeners:
+  - name: http
+    port: 80
+    protocol: HTTP
+    hostname: "*.example.com"

internal/mode/static/handler.go

@@ -294,65 +294,72 @@ func (h *eventHandlerImpl) waitForStatusUpdates(ctx context.Context) {
 			return
 		}
 
-		// TODO(sberman): once we support multiple Gateways, we'll have to get
-		// the correct Graph for the Deployment contained in the update message
 		gr := h.cfg.processor.GetLatestGraph()
 		if gr == nil {
 			continue
 		}
 
+		deploymentName := item.Deployment
+		gw := gr.Gateways[deploymentName]
+
 		var nginxReloadRes graph.NginxReloadResult
-		for _, gw := range gr.Gateways {
-			switch {
-			case item.Error != nil:
-				h.cfg.logger.Error(item.Error, "Failed to update NGINX configuration")
-				nginxReloadRes.Error = item.Error
-			case gw != nil:
-				h.cfg.logger.Info("NGINX configuration was successfully updated")
-			}
-			gr.LatestReloadResult = nginxReloadRes
-
-			switch item.UpdateType {
-			case status.UpdateAll:
-				h.updateStatuses(ctx, gr, gw)
-			case status.UpdateGateway:
-				gwAddresses, err := getGatewayAddresses(
-					ctx,
-					h.cfg.k8sClient,
+		switch {
+		case item.Error != nil:
+			h.cfg.logger.Error(item.Error, "Failed to update NGINX configuration")
+			nginxReloadRes.Error = item.Error
+		case gw != nil:
+			h.cfg.logger.Info("NGINX configuration was successfully updated")
+		}
+		gr.LatestReloadResult[deploymentName] = nginxReloadRes
+
+		switch item.UpdateType {
+		case status.UpdateAll:
+			h.updateStatuses(ctx, gr, gw)
+		case status.UpdateGateway:
+			gwAddresses, err := getGatewayAddresses(
+				ctx,
+				h.cfg.k8sClient,
+				item.GatewayService,
+				gw,
+				h.cfg.gatewayClassName,
+			)
+			if err != nil {
+				msg := "error getting Gateway Service IP address"
+				h.cfg.logger.Error(err, msg)
+				h.cfg.eventRecorder.Eventf(
 					item.GatewayService,
-					gw,
-					h.cfg.gatewayClassName,
-				)
-				if err != nil {
-					msg := "error getting Gateway Service IP address"
-					h.cfg.logger.Error(err, msg)
-					h.cfg.eventRecorder.Eventf(
-						item.GatewayService,
-						v1.EventTypeWarning,
-						"GetServiceIPFailed",
-						msg+": %s",
-						err.Error(),
-					)
-					continue
-				}
-
-				transitionTime := metav1.Now()
-
-				gatewayStatuses := status.PrepareGatewayRequests(
-					gw,
-					transitionTime,
-					gwAddresses,
-					gr.LatestReloadResult,
+					v1.EventTypeWarning,
+					"GetServiceIPFailed",
+					msg+": %s",
+					err.Error(),
 				)
-				h.cfg.statusUpdater.UpdateGroup(ctx, groupGateways, gatewayStatuses...)
-			default:
-				panic(fmt.Sprintf("unknown event type %T", item.UpdateType))
+				continue
 			}
+
+			transitionTime := metav1.Now()
+
+			gatewayStatuses := status.PrepareGatewayRequests(
+				gw,
+				transitionTime,
+				gwAddresses,
+				gr.LatestReloadResult[deploymentName],
+			)
+			h.cfg.statusUpdater.UpdateGroup(ctx, groupGateways, gatewayStatuses...)
+		default:
+			panic(fmt.Sprintf("unknown event type %T", item.UpdateType))
 		}
 	}
 }
 
 func (h *eventHandlerImpl) updateStatuses(ctx context.Context, gr *graph.Graph, gw *graph.Gateway) {
+	transitionTime := metav1.Now()
+	gcReqs := status.PrepareGatewayClassRequests(gr.GatewayClass, gr.IgnoredGatewayClasses, transitionTime)
+
+	if gw == nil || gw.DeploymentName == (types.NamespacedName{}) {
+		h.cfg.statusUpdater.UpdateGroup(ctx, groupAllExceptGateways, gcReqs...)
+		return
+	}
+
 	gwAddresses, err := getGatewayAddresses(ctx, h.cfg.k8sClient, nil, gw, h.cfg.gatewayClassName)
 	if err != nil {
 		msg := "error getting Gateway Service IP address"
@@ -366,14 +373,11 @@ func (h *eventHandlerImpl) updateStatuses(ctx context.Context, gr *graph.Graph,
 		)
 	}
 
-	transitionTime := metav1.Now()
-
-	gcReqs := status.PrepareGatewayClassRequests(gr.GatewayClass, gr.IgnoredGatewayClasses, transitionTime)
 	routeReqs := status.PrepareRouteRequests(
 		gr.L4Routes,
 		gr.Routes,
 		transitionTime,
-		gr.LatestReloadResult,
+		gr.LatestReloadResult[gw.DeploymentName],
 		h.cfg.gatewayCtlrName,
 	)
 
@@ -404,7 +408,7 @@ func (h *eventHandlerImpl) updateStatuses(ctx context.Context, gr *graph.Graph,
 		gw,
 		transitionTime,
 		gwAddresses,
-		gr.LatestReloadResult,
+		gr.LatestReloadResult[gw.DeploymentName],
 	)
 	h.cfg.statusUpdater.UpdateGroup(ctx, groupGateways, gwReqs...)
 }

internal/mode/static/handler_test.go

@@ -381,7 +381,7 @@ var _ = Describe("eventHandler", func() {
 			}).Should(Equal(2))
 
 		gr := handler.cfg.processor.GetLatestGraph()
-		Expect(gr.LatestReloadResult.Error.Error()).To(Equal("status error"))
+		Expect(gr.LatestReloadResult[types.NamespacedName{}].Error.Error()).To(Equal("status error"))
 	})
 
 	It("should update Gateway status when receiving a queue event", func() {