add worker connections field to nginxproxy

sarthyparty · sarthyparty · commit 81addf34c53a · 2025-07-10T10:26:15.000-07:00
diff --git a/apis/v1alpha2/nginxproxy_types.go b/apis/v1alpha2/nginxproxy_types.go
@@ -76,6 +76,13 @@ type NginxProxySpec struct {
 	//
 	// +optional
 	Kubernetes *KubernetesSpec `json:"kubernetes,omitempty"`
+	// WorkerConnections specifies the maximum number of simultaneous connections that can be opened by a worker process.
+	// Default is 1024.
+	//
+	// +optional
+	// +kubebuilder:validation:Minimum=1
+	// +kubebuilder:validation:Maximum=65535
+	WorkerConnections *int32 `json:"workerConnections,omitempty"`
 }
 
 // Telemetry specifies the OpenTelemetry configuration.
diff --git a/apis/v1alpha2/zz_generated.deepcopy.go b/apis/v1alpha2/zz_generated.deepcopy.go
diff --git a/config/crd/bases/gateway.nginx.org_nginxproxies.yaml b/config/crd/bases/gateway.nginx.org_nginxproxies.yaml
@@ -7187,6 +7187,14 @@ spec:
                     - key
                     x-kubernetes-list-type: map
                 type: object
+              workerConnections:
+                description: |-
+                  WorkerConnections specifies the maximum number of simultaneous connections that can be opened by a worker process.
+                  Default is 1024.
+                format: int32
+                maximum: 65535
+                minimum: 1
+                type: integer
             type: object
         required:
         - spec
diff --git a/deploy/crds.yaml b/deploy/crds.yaml
@@ -7772,6 +7772,14 @@ spec:
                     - key
                     x-kubernetes-list-type: map
                 type: object
+              workerConnections:
+                description: |-
+                  WorkerConnections specifies the maximum number of simultaneous connections that can be opened by a worker process.
+                  Default is 1024.
+                format: int32
+                maximum: 65535
+                minimum: 1
+                type: integer
             type: object
         required:
         - spec
diff --git a/internal/controller/nginx/conf/nginx-plus.conf b/internal/controller/nginx/conf/nginx-plus.conf
@@ -5,10 +5,6 @@ worker_processes auto;
 
 pid /var/run/nginx/nginx.pid;
 
-events {
-  worker_connections 1024;
-}
-
 http {
   include /etc/nginx/conf.d/*.conf;
   include /etc/nginx/mime.types;
diff --git a/internal/controller/nginx/conf/nginx.conf b/internal/controller/nginx/conf/nginx.conf
@@ -5,10 +5,6 @@ worker_processes auto;
 
 pid /var/run/nginx/nginx.pid;
 
-events {
-  worker_connections 1024;
-}
-
 http {
   include /etc/nginx/conf.d/*.conf;
   include /etc/nginx/mime.types;
diff --git a/internal/controller/nginx/config/main_config_template.go b/internal/controller/nginx/config/main_config_template.go
@@ -7,6 +7,10 @@ load_module modules/ngx_otel_module.so;
 
 error_log stderr {{ .Conf.Logging.ErrorLevel }};
 
+events {
+  worker_connections {{ .Conf.WorkerConnections }};
+}
+
 {{ range $i := .Includes -}}
 include {{ $i.Name }};
 {{ end -}}
diff --git a/internal/controller/nginx/config/main_config_test.go b/internal/controller/nginx/config/main_config_test.go
@@ -147,3 +147,34 @@ func TestGenerateMgmtFiles_Panic(t *testing.T) {
 		gen.generateMgmtFiles(dataplane.Configuration{})
 	}).To(Panic())
 }
+
+func TestExecuteMainConfig_WorkerConnections(t *testing.T) {
+	t.Parallel()
+
+	tests := []struct {
+		name                 string
+		expWorkerConnections string
+		conf                 dataplane.Configuration
+	}{
+		{
+			name: "custom worker connections",
+			conf: dataplane.Configuration{
+				WorkerConnections: 2048,
+			},
+			expWorkerConnections: "worker_connections 2048;",
+		},
+	}
+
+	for _, test := range tests {
+		t.Run(test.name, func(t *testing.T) {
+			t.Parallel()
+			g := NewWithT(t)
+
+			res := executeMainConfig(test.conf)
+			g.Expect(res).To(HaveLen(1))
+			g.Expect(res[0].dest).To(Equal(mainIncludesConfigFile))
+			g.Expect(string(res[0].data)).To(ContainSubstring(test.expWorkerConnections))
+			g.Expect(string(res[0].data)).To(ContainSubstring("events {"))
+		})
+	}
+}
diff --git a/internal/controller/provisioner/objects.go b/internal/controller/provisioner/objects.go
@@ -20,6 +20,7 @@ import (
 
 	ngfAPIv1alpha2 "github.com/nginx/nginx-gateway-fabric/apis/v1alpha2"
 	"github.com/nginx/nginx-gateway-fabric/internal/controller/config"
+	"github.com/nginx/nginx-gateway-fabric/internal/controller/state/dataplane"
 	"github.com/nginx/nginx-gateway-fabric/internal/controller/state/graph"
 	"github.com/nginx/nginx-gateway-fabric/internal/framework/controller"
 	"github.com/nginx/nginx-gateway-fabric/internal/framework/helpers"
@@ -317,8 +318,14 @@ func (p *NginxProvisioner) buildNginxConfigMaps(
 		logLevel = string(*nProxyCfg.Logging.ErrorLevel)
 	}
 
+	workerConnections := dataplane.DefaultWorkerConnections
+	if nProxyCfg != nil && nProxyCfg.WorkerConnections != nil {
+		workerConnections = *nProxyCfg.WorkerConnections
+	}
+
 	mainFields := map[string]interface{}{
-		"ErrorLevel": logLevel,
+		"ErrorLevel":        logLevel,
+		"WorkerConnections": workerConnections,
 	}
 
 	bootstrapCM := &corev1.ConfigMap{
diff --git a/internal/controller/provisioner/objects_test.go b/internal/controller/provisioner/objects_test.go
@@ -1014,3 +1014,47 @@ func TestSetIPFamily(t *testing.T) {
 	g.Expect(svc.Spec.IPFamilyPolicy).To(Equal(helpers.GetPointer(corev1.IPFamilyPolicySingleStack)))
 	g.Expect(svc.Spec.IPFamilies).To(Equal([]corev1.IPFamily{corev1.IPv6Protocol}))
 }
+
+func TestBuildNginxConfigMaps_WorkerConnections(t *testing.T) {
+	t.Parallel()
+	g := NewWithT(t)
+
+	provisioner := &NginxProvisioner{
+		cfg: Config{
+			GatewayPodConfig: &config.GatewayPodConfig{
+				Namespace:   "default",
+				ServiceName: "test-service",
+			},
+		},
+	}
+	objectMeta := metav1.ObjectMeta{Name: "test", Namespace: "default"}
+
+	// Test with default worker connections (nil NginxProxy config)
+	configMaps := provisioner.buildNginxConfigMaps(objectMeta, nil, "test-bootstrap", "test-agent", false, false)
+	g.Expect(configMaps).To(HaveLen(2))
+
+	bootstrapCM, ok := configMaps[0].(*corev1.ConfigMap)
+	g.Expect(ok).To(BeTrue())
+	g.Expect(bootstrapCM.Data["main.conf"]).To(ContainSubstring("worker_connections 1024;"))
+
+	// Test with default worker connections (empty NginxProxy config)
+	nProxyCfgEmpty := &graph.EffectiveNginxProxy{}
+	configMaps = provisioner.buildNginxConfigMaps(objectMeta, nProxyCfgEmpty, "test-bootstrap", "test-agent", false, false)
+	g.Expect(configMaps).To(HaveLen(2))
+
+	bootstrapCM, ok = configMaps[0].(*corev1.ConfigMap)
+	g.Expect(ok).To(BeTrue())
+	g.Expect(bootstrapCM.Data["main.conf"]).To(ContainSubstring("worker_connections 1024;"))
+
+	// Test with custom worker connections
+	nProxyCfg := &graph.EffectiveNginxProxy{
+		WorkerConnections: helpers.GetPointer(int32(2048)),
+	}
+
+	configMaps = provisioner.buildNginxConfigMaps(objectMeta, nProxyCfg, "test-bootstrap", "test-agent", false, false)
+	g.Expect(configMaps).To(HaveLen(2))
+
+	bootstrapCM, ok = configMaps[0].(*corev1.ConfigMap)
+	g.Expect(ok).To(BeTrue())
+	g.Expect(bootstrapCM.Data["main.conf"]).To(ContainSubstring("worker_connections 2048;"))
+}
diff --git a/internal/controller/provisioner/templates.go b/internal/controller/provisioner/templates.go
@@ -9,7 +9,11 @@ var (
 )
 
 const mainTemplateText = `
-error_log stderr {{ .ErrorLevel }};`
+error_log stderr {{ .ErrorLevel }};
+
+events {
+  worker_connections {{ .WorkerConnections }};
+}`
 
 const mgmtTemplateText = `mgmt {
     {{- if .UsageEndpoint }}
diff --git a/internal/controller/state/dataplane/configuration.go b/internal/controller/state/dataplane/configuration.go
@@ -22,9 +22,10 @@ import (
 )
 
 const (
-	wildcardHostname     = "~^"
-	alpineSSLRootCAPath  = "/etc/ssl/cert.pem"
-	defaultErrorLogLevel = "info"
+	wildcardHostname         = "~^"
+	alpineSSLRootCAPath      = "/etc/ssl/cert.pem"
+	defaultErrorLogLevel     = "info"
+	DefaultWorkerConnections = int32(1024)
 )
 
 // BuildConfiguration builds the Configuration from the Graph.
@@ -76,12 +77,13 @@ func BuildConfiguration(
 			buildRefCertificateBundles(g.ReferencedSecrets, g.ReferencedCaCertConfigMaps),
 			backendGroups,
 		),
-		Telemetry:        buildTelemetry(g, gateway),
-		BaseHTTPConfig:   baseHTTPConfig,
-		Logging:          buildLogging(gateway),
-		NginxPlus:        nginxPlus,
-		MainSnippets:     buildSnippetsForContext(gatewaySnippetsFilters, ngfAPIv1alpha1.NginxContextMain),
-		AuxiliarySecrets: buildAuxiliarySecrets(g.PlusSecrets),
+		Telemetry:         buildTelemetry(g, gateway),
+		BaseHTTPConfig:    baseHTTPConfig,
+		Logging:           buildLogging(gateway),
+		NginxPlus:         nginxPlus,
+		MainSnippets:      buildSnippetsForContext(gatewaySnippetsFilters, ngfAPIv1alpha1.NginxContextMain),
+		AuxiliarySecrets:  buildAuxiliarySecrets(g.PlusSecrets),
+		WorkerConnections: buildWorkerConnections(gateway),
 	}
 
 	return config
@@ -1105,6 +1107,19 @@ func buildLogging(gateway *graph.Gateway) Logging {
 	return logSettings
 }
 
+func buildWorkerConnections(gateway *graph.Gateway) int32 {
+	if gateway == nil || gateway.EffectiveNginxProxy == nil {
+		return DefaultWorkerConnections
+	}
+
+	ngfProxy := gateway.EffectiveNginxProxy
+	if ngfProxy.WorkerConnections != nil {
+		return *ngfProxy.WorkerConnections
+	}
+
+	return DefaultWorkerConnections
+}
+
 func buildAuxiliarySecrets(
 	secrets map[types.NamespacedName][]graph.PlusSecretFile,
 ) map[graph.SecretFileType][]byte {
@@ -1143,8 +1158,9 @@ func buildNginxPlus(gateway *graph.Gateway) NginxPlus {
 
 func GetDefaultConfiguration(g *graph.Graph, gateway *graph.Gateway) Configuration {
 	return Configuration{
-		Logging:          buildLogging(gateway),
-		NginxPlus:        NginxPlus{},
-		AuxiliarySecrets: buildAuxiliarySecrets(g.PlusSecrets),
+		Logging:           buildLogging(gateway),
+		NginxPlus:         NginxPlus{},
+		AuxiliarySecrets:  buildAuxiliarySecrets(g.PlusSecrets),
+		WorkerConnections: buildWorkerConnections(gateway),
 	}
 }
diff --git a/internal/controller/state/dataplane/configuration_test.go b/internal/controller/state/dataplane/configuration_test.go
@@ -4895,3 +4895,44 @@ func TestBuildNginxPlus(t *testing.T) {
 		})
 	}
 }
+
+func TestBuildWorkerConnections(t *testing.T) {
+	t.Parallel()
+
+	tests := []struct {
+		gw                   *graph.Gateway
+		msg                  string
+		expWorkerConnections int32
+	}{
+		{
+			msg:                  "NginxProxy is nil",
+			gw:                   &graph.Gateway{},
+			expWorkerConnections: DefaultWorkerConnections,
+		},
+		{
+			msg: "NginxProxy doesn't specify worker connections",
+			gw: &graph.Gateway{
+				EffectiveNginxProxy: &graph.EffectiveNginxProxy{},
+			},
+			expWorkerConnections: DefaultWorkerConnections,
+		},
+		{
+			msg: "NginxProxy specifies worker connections",
+			gw: &graph.Gateway{
+				EffectiveNginxProxy: &graph.EffectiveNginxProxy{
+					WorkerConnections: helpers.GetPointer(int32(2048)),
+				},
+			},
+			expWorkerConnections: 2048,
+		},
+	}
+
+	for _, tc := range tests {
+		t.Run(tc.msg, func(t *testing.T) {
+			t.Parallel()
+			g := NewWithT(t)
+
+			g.Expect(buildWorkerConnections(tc.gw)).To(Equal(tc.expWorkerConnections))
+		})
+	}
+}
diff --git a/internal/controller/state/dataplane/types.go b/internal/controller/state/dataplane/types.go
@@ -54,6 +54,8 @@ type Configuration struct {
 	NginxPlus NginxPlus
 	// BaseHTTPConfig holds the configuration options at the http context.
 	BaseHTTPConfig BaseHTTPConfig
+	// WorkerConnections specifies the maximum number of simultaneous connections that can be opened by a worker process.
+	WorkerConnections int32
 }
 
 // SSLKeyPairID is a unique identifier for a SSLKeyPair.
