Fix events block error

Author: sarthyparty

internal/controller/nginx/conf/nginx-plus.conf

@@ -5,6 +5,10 @@ worker_processes auto;
 
 pid /var/run/nginx/nginx.pid;
 
+events {
+  include /etc/nginx/events-includes/*.conf;
+}
+
 http {
   include /etc/nginx/conf.d/*.conf;
   include /etc/nginx/mime.types;

internal/controller/nginx/conf/nginx.conf

@@ -5,6 +5,10 @@ worker_processes auto;
 
 pid /var/run/nginx/nginx.pid;
 
+events {
+  include /etc/nginx/events-includes/*.conf;
+}
+
 http {
   include /etc/nginx/conf.d/*.conf;
   include /etc/nginx/mime.types;

internal/controller/nginx/config/generator.go

@@ -38,6 +38,9 @@ const (
 	// For example, these files include load_module directives and snippets that target the main context.
 	mainIncludesFolder = configFolder + "/main-includes"
 
+	// eventsIncludesFolder is the folder where NGINX events context configuration files are stored.
+	eventsIncludesFolder = configFolder + "/events-includes"
+
 	// secretsFolder is the folder where secrets (like TLS certs/keys) are stored.
 	secretsFolder = configFolder + "/secrets"
 
@@ -56,6 +59,9 @@ const (
 	// mainIncludesConfigFile is the path to the file containing NGINX configuration in the main context.
 	mainIncludesConfigFile = mainIncludesFolder + "/main.conf"
 
+	// eventsIncludesConfigFile is the path to the file containing NGINX events configuration.
+	eventsIncludesConfigFile = eventsIncludesFolder + "/events.conf"
+
 	// mgmtIncludesFile is the path to the file containing the NGINX Plus mgmt config.
 	mgmtIncludesFile = mainIncludesFolder + "/mgmt.conf"
 
@@ -196,6 +202,7 @@ func (g GeneratorImpl) getExecuteFuncs(
 ) []executeFunc {
 	return []executeFunc{
 		executeMainConfig,
+		executeEventsConfig,
 		executeBaseHTTPConfig,
 		g.newExecuteServersFunc(generator, keepAliveCheck),
 		newExecuteUpstreamsFunc(upstreams),

internal/controller/nginx/config/main_config.go

@@ -15,8 +15,9 @@ import (
 )
 
 var (
-	mainConfigTemplate = gotemplate.Must(gotemplate.New("main").Parse(mainConfigTemplateText))
-	mgmtConfigTemplate = gotemplate.Must(gotemplate.New("mgmt").Parse(mgmtConfigTemplateText))
+	mainConfigTemplate   = gotemplate.Must(gotemplate.New("main").Parse(mainConfigTemplateText))
+	mgmtConfigTemplate   = gotemplate.Must(gotemplate.New("mgmt").Parse(mgmtConfigTemplateText))
+	eventsConfigTemplate = gotemplate.Must(gotemplate.New("events").Parse(eventsConfigTemplateText))
 )
 
 type mainConfig struct {
@@ -42,6 +43,17 @@ func executeMainConfig(conf dataplane.Configuration) []executeResult {
 	return results
 }
 
+func executeEventsConfig(conf dataplane.Configuration) []executeResult {
+	eventsData := helpers.MustExecuteTemplate(eventsConfigTemplate, conf)
+
+	return []executeResult{
+		{
+			dest: eventsIncludesConfigFile,
+			data: eventsData,
+		},
+	}
+}
+
 type mgmtConf struct {
 	Endpoint          string
 	Resolver          string

internal/controller/nginx/config/main_config_template.go

@@ -7,15 +7,16 @@ 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 -}}
 `
 
+const eventsConfigTemplateText = `
+worker_connections {{ .WorkerConnections }};
+`
+
 const mgmtConfigTemplateText = `
 mgmt {
 	{{- if .Endpoint }}

internal/controller/provisioner/objects.go

@@ -419,6 +419,23 @@ func (p *NginxProvisioner) buildNginxConfigMaps(
 		bootstrapCM.Data["mgmt.conf"] = string(helpers.MustExecuteTemplate(mgmtTemplate, mgmtFields))
 	}
 
+	// Create events ConfigMap with worker_connections using template
+	eventsFields := map[string]interface{}{
+		"WorkerConnections": workerConnections,
+	}
+
+	eventsCM := &corev1.ConfigMap{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:        p.cfg.GatewayPodConfig.Name + "-events",
+			Namespace:   objectMeta.Namespace,
+			Labels:      objectMeta.Labels,
+			Annotations: objectMeta.Annotations,
+		},
+		Data: map[string]string{
+			"events.conf": string(helpers.MustExecuteTemplate(eventsTemplate, eventsFields)),
+		},
+	}
+
 	metricsPort := config.DefaultNginxMetricsPort
 	port, enableMetrics := graph.MetricsEnabledForNginxProxy(nProxyCfg)
 	if port != nil {
@@ -457,7 +474,7 @@ func (p *NginxProvisioner) buildNginxConfigMaps(
 		},
 	}
 
-	return []client.Object{bootstrapCM, agentCM}
+	return []client.Object{bootstrapCM, agentCM, eventsCM}
 }
 
 func (p *NginxProvisioner) buildOpenshiftObjects(objectMeta metav1.ObjectMeta) []client.Object {
@@ -826,6 +843,7 @@ func (p *NginxProvisioner) buildNginxPodTemplateSpec(
 						{MountPath: "/etc/nginx/conf.d", Name: "nginx-conf"},
 						{MountPath: "/etc/nginx/stream-conf.d", Name: "nginx-stream-conf"},
 						{MountPath: "/etc/nginx/main-includes", Name: "nginx-main-includes"},
+						{MountPath: "/etc/nginx/events-includes", Name: "nginx-events-includes"},
 						{MountPath: "/etc/nginx/secrets", Name: "nginx-secrets"},
 						{MountPath: "/var/run/nginx", Name: "nginx-run"},
 						{MountPath: "/var/cache/nginx", Name: "nginx-cache"},
@@ -845,6 +863,8 @@ func (p *NginxProvisioner) buildNginxPodTemplateSpec(
 						"--destination", "/etc/nginx-agent",
 						"--source", "/includes/main.conf",
 						"--destination", "/etc/nginx/main-includes",
+						"--source", "/events/events.conf",
+						"--destination", "/etc/nginx/events-includes",
 					},
 					Env: []corev1.EnvVar{
 						{
@@ -860,7 +880,9 @@ func (p *NginxProvisioner) buildNginxPodTemplateSpec(
 						{MountPath: "/agent", Name: "nginx-agent-config"},
 						{MountPath: "/etc/nginx-agent", Name: "nginx-agent"},
 						{MountPath: "/includes", Name: "nginx-includes-bootstrap"},
+						{MountPath: "/events", Name: "nginx-events-bootstrap"},
 						{MountPath: "/etc/nginx/main-includes", Name: "nginx-main-includes"},
+						{MountPath: "/etc/nginx/events-includes", Name: "nginx-events-includes"},
 					},
 					SecurityContext: &corev1.SecurityContext{
 						Capabilities: &corev1.Capabilities{
@@ -927,6 +949,7 @@ func (p *NginxProvisioner) buildNginxPodTemplateSpec(
 				{Name: "nginx-conf", VolumeSource: emptyDirVolumeSource},
 				{Name: "nginx-stream-conf", VolumeSource: emptyDirVolumeSource},
 				{Name: "nginx-main-includes", VolumeSource: emptyDirVolumeSource},
+				{Name: "nginx-events-includes", VolumeSource: emptyDirVolumeSource},
 				{Name: "nginx-secrets", VolumeSource: emptyDirVolumeSource},
 				{Name: "nginx-run", VolumeSource: emptyDirVolumeSource},
 				{Name: "nginx-cache", VolumeSource: emptyDirVolumeSource},
@@ -941,6 +964,16 @@ func (p *NginxProvisioner) buildNginxPodTemplateSpec(
 						},
 					},
 				},
+				{
+					Name: "nginx-events-bootstrap",
+					VolumeSource: corev1.VolumeSource{
+						ConfigMap: &corev1.ConfigMapVolumeSource{
+							LocalObjectReference: corev1.LocalObjectReference{
+								Name: p.cfg.GatewayPodConfig.Name + "-events",
+							},
+						},
+					},
+				},
 			},
 		},
 	}

internal/controller/provisioner/templates.go

@@ -3,17 +3,17 @@ package provisioner
 import gotemplate "text/template"
 
 var (
-	mainTemplate  = gotemplate.Must(gotemplate.New("main").Parse(mainTemplateText))
-	mgmtTemplate  = gotemplate.Must(gotemplate.New("mgmt").Parse(mgmtTemplateText))
-	agentTemplate = gotemplate.Must(gotemplate.New("agent").Parse(agentTemplateText))
+	mainTemplate   = gotemplate.Must(gotemplate.New("main").Parse(mainTemplateText))
+	mgmtTemplate   = gotemplate.Must(gotemplate.New("mgmt").Parse(mgmtTemplateText))
+	agentTemplate  = gotemplate.Must(gotemplate.New("agent").Parse(agentTemplateText))
+	eventsTemplate = gotemplate.Must(gotemplate.New("events").Parse(eventsTemplateText))
 )
 
 const mainTemplateText = `
-error_log stderr {{ .ErrorLevel }};
+error_log stderr {{ .ErrorLevel }};`
 
-events {
-    worker_connections {{ .WorkerConnections }};
-}`
+const eventsTemplateText = `
+worker_connections {{ .WorkerConnections }};`
 
 const mgmtTemplateText = `mgmt {
     {{- if .UsageEndpoint }}