Merge branch 'main' into feat/ubi-base-image

Author: shaun-nx

.github/workflows/ci.yml

@@ -208,7 +208,7 @@ jobs:
       - name: Build binary
         uses: goreleaser/goreleaser-action@e435ccd777264be153ace6237001ef4d979d3a7a # v6.4.0
         with:
-          version: v2.12.1 # renovate: datasource=github-tags depName=goreleaser/goreleaser
+          version: v2.12.2 # renovate: datasource=github-tags depName=goreleaser/goreleaser
           args: ${{ (inputs.is_production_release && (inputs.dry_run == false || inputs.dry_run == null)) && 'release' || 'build --snapshot' }} --clean
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/conformance.yml

@@ -99,7 +99,7 @@ jobs:
       - name: Build binary
         uses: goreleaser/goreleaser-action@e435ccd777264be153ace6237001ef4d979d3a7a # v6.4.0
         with:
-          version: v2.12.1 # renovate: datasource=github-tags depName=goreleaser/goreleaser
+          version: v2.12.2 # renovate: datasource=github-tags depName=goreleaser/goreleaser
           args: build --single-target --snapshot --clean
         env:
           TELEMETRY_ENDPOINT: "" # disables sending telemetry

.github/workflows/functional.yml

@@ -83,7 +83,7 @@ jobs:
       - name: Build binary
         uses: goreleaser/goreleaser-action@e435ccd777264be153ace6237001ef4d979d3a7a # v6.4.0
         with:
-          version: v2.12.1 # renovate: datasource=github-tags depName=goreleaser/goreleaser
+          version: v2.12.2 # renovate: datasource=github-tags depName=goreleaser/goreleaser
           args: build --single-target --snapshot --clean
         env:
           TELEMETRY_ENDPOINT: otel-collector-opentelemetry-collector.collector.svc.cluster.local:4317

internal/controller/handler.go

@@ -338,7 +338,6 @@ func (h *eventHandlerImpl) updateStatuses(ctx context.Context, gr *graph.Graph,
 		gr.L4Routes,
 		gr.Routes,
 		transitionTime,
-		gw.LatestReloadResult,
 		h.cfg.gatewayCtlrName,
 	)
 

internal/controller/provisioner/templates.go

@@ -90,12 +90,4 @@ collector:
                 receivers: ["host_metrics", "nginx_metrics"]
                 exporters: ["prometheus"]
 {{- end }}
-data_plane_config:
-    nginx:
-        reload_backoff:
-            initial_interval: .5s
-            max_interval: 1.5s
-            max_elapsed_time: 3s
-            randomization_factor: 0.5
-            multiplier: 1.5
 `

internal/controller/state/conditions/conditions.go

@@ -49,10 +49,6 @@ const (
 	// as another route.
 	RouteReasonHostnameConflict v1.RouteConditionReason = "HostnameConflict"
 
-	// RouteReasonGatewayNotProgrammed is used when the associated Gateway is not programmed.
-	// Used with Accepted (false).
-	RouteReasonGatewayNotProgrammed v1.RouteConditionReason = "GatewayNotProgrammed"
-
 	// RouteReasonUnsupportedConfiguration is used when the associated Gateway does not support the Route.
 	// Used with Accepted (false).
 	RouteReasonUnsupportedConfiguration v1.RouteConditionReason = "UnsupportedConfiguration"
@@ -493,17 +489,6 @@ func NewRouteUnsupportedConfiguration(msg string) Condition {
 	}
 }
 
-// NewRouteGatewayNotProgrammed returns a Condition that indicates that the Gateway it references is not programmed,
-// which does not guarantee that the Route has been configured.
-func NewRouteGatewayNotProgrammed(msg string) Condition {
-	return Condition{
-		Type:    string(v1.RouteConditionAccepted),
-		Status:  metav1.ConditionFalse,
-		Reason:  string(RouteReasonGatewayNotProgrammed),
-		Message: msg,
-	}
-}
-
 // NewRouteInvalidIPFamily returns a Condition that indicates that the Service associated with the Route
 // is not configured with the same IP family as the NGINX server.
 func NewRouteInvalidIPFamily(msg string) Condition {

internal/controller/status/prepare_requests.go

@@ -28,7 +28,6 @@ func PrepareRouteRequests(
 	l4routes map[graph.L4RouteKey]*graph.L4Route,
 	routes map[graph.RouteKey]*graph.L7Route,
 	transitionTime metav1.Time,
-	nginxReloadRes graph.NginxReloadResult,
 	gatewayCtlrName string,
 ) []UpdateRequest {
 	reqs := make([]UpdateRequest, 0, len(routes))
@@ -38,7 +37,6 @@ func PrepareRouteRequests(
 			gatewayCtlrName,
 			r.ParentRefs,
 			r.Conditions,
-			nginxReloadRes,
 			transitionTime,
 			r.Source.GetGeneration(),
 		)
@@ -61,7 +59,6 @@ func PrepareRouteRequests(
 			gatewayCtlrName,
 			r.ParentRefs,
 			r.Conditions,
-			nginxReloadRes,
 			transitionTime,
 			r.Source.GetGeneration(),
 		)
@@ -140,7 +137,6 @@ func prepareRouteStatus(
 	gatewayCtlrName string,
 	parentRefs []graph.ParentRef,
 	conds []conditions.Condition,
-	nginxReloadRes graph.NginxReloadResult,
 	transitionTime metav1.Time,
 	srcGeneration int64,
 ) v1.RouteStatus {
@@ -169,13 +165,6 @@ func prepareRouteStatus(
 			allConds = append(allConds, ref.Attachment.FailedConditions...)
 		}
 
-		if nginxReloadRes.Error != nil {
-			allConds = append(
-				allConds,
-				conditions.NewRouteGatewayNotProgrammed(conditions.RouteMessageFailedNginxReload),
-			)
-		}
-
 		conds := conditions.DeduplicateConditions(allConds)
 		apiConds := conditions.ConvertConditions(conds, srcGeneration, transitionTime)
 

internal/controller/status/prepare_requests_test.go

@@ -432,7 +432,6 @@ func TestBuildHTTPRouteStatuses(t *testing.T) {
 		map[graph.L4RouteKey]*graph.L4Route{},
 		routes,
 		transitionTime,
-		graph.NginxReloadResult{},
 		gatewayCtlrName,
 	)
 
@@ -511,7 +510,6 @@ func TestBuildGRPCRouteStatuses(t *testing.T) {
 		map[graph.L4RouteKey]*graph.L4Route{},
 		routes,
 		transitionTime,
-		graph.NginxReloadResult{},
 		gatewayCtlrName,
 	)
 
@@ -588,7 +586,6 @@ func TestBuildTLSRouteStatuses(t *testing.T) {
 		routes,
 		map[graph.RouteKey]*graph.L7Route{},
 		transitionTime,
-		graph.NginxReloadResult{},
 		gatewayCtlrName,
 	)
 
@@ -605,108 +602,6 @@ func TestBuildTLSRouteStatuses(t *testing.T) {
 	}
 }
 
-func TestBuildRouteStatusesNginxErr(t *testing.T) {
-	t.Parallel()
-	const gatewayCtlrName = "controller"
-
-	hr1 := &v1.HTTPRoute{
-		ObjectMeta: metav1.ObjectMeta{
-			Namespace:  "test",
-			Name:       "hr-valid",
-			Generation: 3,
-		},
-		Spec: v1.HTTPRouteSpec{
-			CommonRouteSpec: commonRouteSpecValid,
-		},
-	}
-
-	routeKey := graph.CreateRouteKey(hr1)
-
-	gwNsName := types.NamespacedName{Namespace: "test", Name: "gateway"}
-
-	routes := map[graph.RouteKey]*graph.L7Route{
-		routeKey: {
-			Valid:     true,
-			RouteType: graph.RouteTypeHTTP,
-			Source:    hr1,
-			ParentRefs: []graph.ParentRef{
-				{
-					Idx:     0,
-					Gateway: &graph.ParentRefGateway{NamespacedName: gwNsName},
-					Attachment: &graph.ParentRefAttachmentStatus{
-						Attached: true,
-					},
-					SectionName: commonRouteSpecValid.ParentRefs[0].SectionName,
-				},
-			},
-		},
-	}
-
-	transitionTime := helpers.PrepareTimeForFakeClient(metav1.Now())
-
-	expectedStatus := v1.HTTPRouteStatus{
-		RouteStatus: v1.RouteStatus{
-			Parents: []v1.RouteParentStatus{
-				{
-					ParentRef: v1.ParentReference{
-						Namespace:   helpers.GetPointer(v1.Namespace(gwNsName.Namespace)),
-						Name:        v1.ObjectName(gwNsName.Name),
-						SectionName: helpers.GetPointer[v1.SectionName]("listener-80-1"),
-					},
-					ControllerName: gatewayCtlrName,
-					Conditions: []metav1.Condition{
-						{
-							Type:               string(v1.RouteConditionResolvedRefs),
-							Status:             metav1.ConditionTrue,
-							ObservedGeneration: 3,
-							LastTransitionTime: transitionTime,
-							Reason:             string(v1.RouteReasonResolvedRefs),
-							Message:            "All references are resolved",
-						},
-						{
-							Type:               string(v1.RouteConditionAccepted),
-							Status:             metav1.ConditionFalse,
-							ObservedGeneration: 3,
-							LastTransitionTime: transitionTime,
-							Reason:             string(conditions.RouteReasonGatewayNotProgrammed),
-							Message:            conditions.RouteMessageFailedNginxReload,
-						},
-					},
-				},
-			},
-		},
-	}
-
-	g := NewWithT(t)
-
-	k8sClient := createK8sClientFor(&v1.HTTPRoute{})
-
-	for _, r := range routes {
-		err := k8sClient.Create(context.Background(), r.Source)
-		g.Expect(err).ToNot(HaveOccurred())
-	}
-
-	updater := NewUpdater(k8sClient, logr.Discard())
-
-	reqs := PrepareRouteRequests(
-		map[graph.L4RouteKey]*graph.L4Route{},
-		routes,
-		transitionTime,
-		graph.NginxReloadResult{Error: errors.New("test error")},
-		gatewayCtlrName,
-	)
-
-	g.Expect(reqs).To(HaveLen(1))
-
-	updater.Update(context.Background(), reqs...)
-
-	var hr v1.HTTPRoute
-
-	err := k8sClient.Get(context.Background(), routeKey.NamespacedName, &hr)
-	g.Expect(err).ToNot(HaveOccurred())
-	g.Expect(helpers.Diff(expectedStatus, hr.Status)).To(BeEmpty())
-}
-
 func TestBuildGatewayClassStatuses(t *testing.T) {
 	t.Parallel()
 	transitionTime := helpers.PrepareTimeForFakeClient(metav1.Now())

tests/results/dp-perf/edge/edge-oss.md

@@ -6,27 +6,27 @@ NGINX Plus: false
 
 NGINX Gateway Fabric:
 
-- Commit: 9155a2b6a8d3179165797ef3e789e97283f7a695
-- Date: 2025-03-15T07:17:11Z
+- Commit: 635b3fcd6e643f4bd24ebbd4c901619a030c4bc0
+- Date: 2025-09-15T17:56:13Z
 - Dirty: false
 
 GKE Cluster:
 
 - Node count: 12
-- k8s version: v1.31.6-gke.1020000
+- k8s version: v1.33.4-gke.1036000
 - vCPUs per node: 16
-- RAM per node: 65851340Ki
+- RAM per node: 65851528Ki
 - Max pods per node: 110
 - Zone: us-west1-b
 - Instance Type: n2d-standard-16
 
 ## Test1: Running latte path based routing
 
 ```text
-Requests      [total, rate, throughput]         30000, 1000.02, 1000.00
-Duration      [total, attack, wait]             30s, 29.999s, 569.726µs
-Latencies     [min, mean, 50, 90, 95, 99, max]  492.479µs, 670.385µs, 659.036µs, 746.275µs, 777.873µs, 857.407µs, 10.667ms
-Bytes In      [total, mean]                     4800000, 160.00
+Requests      [total, rate, throughput]         30000, 1000.02, 999.99
+Duration      [total, attack, wait]             30s, 29.999s, 823.134µs
+Latencies     [min, mean, 50, 90, 95, 99, max]  701.612µs, 944.922µs, 913.567µs, 1.064ms, 1.127ms, 1.318ms, 19.252ms
+Bytes In      [total, mean]                     4770000, 159.00
 Bytes Out     [total, mean]                     0, 0.00
 Success       [ratio]                           100.00%
 Status Codes  [code:count]                      200:30000  
@@ -36,23 +36,23 @@ Error Set:
 ## Test2: Running coffee header based routing
 
 ```text
-Requests      [total, rate, throughput]         29999, 1000.00, 999.98
-Duration      [total, attack, wait]             30s, 29.999s, 665.107µs
-Latencies     [min, mean, 50, 90, 95, 99, max]  518.165µs, 707.025µs, 693.839µs, 792.941µs, 827.269µs, 914.615µs, 9.399ms
-Bytes In      [total, mean]                     4829839, 161.00
+Requests      [total, rate, throughput]         30000, 1000.02, 999.98
+Duration      [total, attack, wait]             30s, 29.999s, 1.086ms
+Latencies     [min, mean, 50, 90, 95, 99, max]  709.701µs, 978.507µs, 947.668µs, 1.092ms, 1.16ms, 1.369ms, 18.067ms
+Bytes In      [total, mean]                     4800000, 160.00
 Bytes Out     [total, mean]                     0, 0.00
 Success       [ratio]                           100.00%
-Status Codes  [code:count]                      200:29999  
+Status Codes  [code:count]                      200:30000  
 Error Set:
 ```
 
 ## Test3: Running coffee query based routing
 
 ```text
-Requests      [total, rate, throughput]         30000, 1000.03, 1000.01
-Duration      [total, attack, wait]             30s, 29.999s, 715.919µs
-Latencies     [min, mean, 50, 90, 95, 99, max]  535.068µs, 708.655µs, 696.175µs, 794.741µs, 829.728µs, 926.641µs, 9.422ms
-Bytes In      [total, mean]                     5070000, 169.00
+Requests      [total, rate, throughput]         30000, 1000.01, 999.98
+Duration      [total, attack, wait]             30.001s, 30s, 907.607µs
+Latencies     [min, mean, 50, 90, 95, 99, max]  754.461µs, 1.003ms, 978.075µs, 1.155ms, 1.226ms, 1.387ms, 10.062ms
+Bytes In      [total, mean]                     5040000, 168.00
 Bytes Out     [total, mean]                     0, 0.00
 Success       [ratio]                           100.00%
 Status Codes  [code:count]                      200:30000  
@@ -62,10 +62,10 @@ Error Set:
 ## Test4: Running tea GET method based routing
 
 ```text
-Requests      [total, rate, throughput]         30000, 1000.02, 1000.00
-Duration      [total, attack, wait]             30s, 29.999s, 689.244µs
-Latencies     [min, mean, 50, 90, 95, 99, max]  517.044µs, 689.83µs, 678.3µs, 768.738µs, 802.493µs, 884.763µs, 13.123ms
-Bytes In      [total, mean]                     4740000, 158.00
+Requests      [total, rate, throughput]         30000, 1000.04, 1000.01
+Duration      [total, attack, wait]             30s, 29.999s, 832.592µs
+Latencies     [min, mean, 50, 90, 95, 99, max]  709.117µs, 967.336µs, 940.759µs, 1.083ms, 1.15ms, 1.346ms, 16.037ms
+Bytes In      [total, mean]                     4710000, 157.00
 Bytes Out     [total, mean]                     0, 0.00
 Success       [ratio]                           100.00%
 Status Codes  [code:count]                      200:30000  
@@ -75,10 +75,10 @@ Error Set:
 ## Test5: Running tea POST method based routing
 
 ```text
-Requests      [total, rate, throughput]         30000, 1000.03, 1000.01
-Duration      [total, attack, wait]             30s, 29.999s, 618.418µs
-Latencies     [min, mean, 50, 90, 95, 99, max]  506.217µs, 700.343µs, 688.984µs, 785.078µs, 815.876µs, 898.036µs, 9.243ms
-Bytes In      [total, mean]                     4740000, 158.00
+Requests      [total, rate, throughput]         30000, 1000.04, 1000.00
+Duration      [total, attack, wait]             30s, 29.999s, 1.005ms
+Latencies     [min, mean, 50, 90, 95, 99, max]  733.008µs, 1.005ms, 975.492µs, 1.137ms, 1.201ms, 1.382ms, 21.294ms
+Bytes In      [total, mean]                     4710000, 157.00
 Bytes Out     [total, mean]                     0, 0.00
 Success       [ratio]                           100.00%
 Status Codes  [code:count]                      200:30000