add worker connections field to nginxproxy

Author: sarthyparty

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.

apis/v1alpha2/zz_generated.deepcopy.go

@@ -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

config/crd/bases/gateway.nginx.org_nginxproxies.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

deploy/crds.yaml

@@ -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;

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;

internal/controller/nginx/conf/nginx.conf

@@ -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 -}}

internal/controller/nginx/config/main_config_template.go

@@ -147,3 +147,55 @@ 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: "default worker connections",
+			conf: dataplane.Configuration{
+				WorkerConnections: 1024,
+			},
+			expWorkerConnections: "worker_connections 1024;",
+		},
+		{
+			name: "custom worker connections",
+			conf: dataplane.Configuration{
+				WorkerConnections: 2048,
+			},
+			expWorkerConnections: "worker_connections 2048;",
+		},
+		{
+			name: "minimum worker connections",
+			conf: dataplane.Configuration{
+				WorkerConnections: 1,
+			},
+			expWorkerConnections: "worker_connections 1;",
+		},
+		{
+			name: "maximum worker connections",
+			conf: dataplane.Configuration{
+				WorkerConnections: 65535,
+			},
+			expWorkerConnections: "worker_connections 65535;",
+		},
+	}
+
+	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 {"))
+		})
+	}
+}

internal/controller/nginx/config/main_config_test.go

@@ -317,8 +317,14 @@ func (p *NginxProvisioner) buildNginxConfigMaps(
 		logLevel = string(*nProxyCfg.Logging.ErrorLevel)
 	}
 
+	workerConnections := int32(1024)
+	if nProxyCfg != nil && nProxyCfg.WorkerConnections != nil {
+		workerConnections = *nProxyCfg.WorkerConnections
+	}
+
 	mainFields := map[string]interface{}{
-		"ErrorLevel": logLevel,
+		"ErrorLevel":        logLevel,
+		"WorkerConnections": workerConnections,
 	}
 
 	bootstrapCM := &corev1.ConfigMap{

internal/controller/provisioner/objects.go

@@ -1014,3 +1014,30 @@ 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 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;"))
+}