Merge branch 'feat/pipeline-ubi-builds' into feat/pipeline-openshift-operator

Author: shaun-nx

build/ubi/Dockerfile.nginx

@@ -52,7 +52,7 @@ RUN mkdir -p /usr/lib/nginx/modules /var/run/nginx /usr/lib64/nginx/modules \
     # Forward request and error logs to docker log collector
     && ln -sf /dev/stdout /var/log/nginx/access.log \
     && ln -sf /dev/stderr /var/log/nginx/error.log \
-    && mv /usr/lib64/nginx/modules/ngx_* /usr/lib/nginx/modules/
+    && cp /usr/lib64/nginx/modules/ngx_* /usr/lib/nginx/modules/
 
 # Set proper permissions for nginx user
 RUN chown -R 101:1001 /etc/nginx /var/cache/nginx

build/ubi/Dockerfile.nginxplus

@@ -59,7 +59,7 @@ RUN mkdir -p /usr/lib/nginx/modules /var/run/nginx /usr/lib64/nginx/modules \
     # Forward request and error logs to docker log collector
     && ln -sf /dev/stdout /var/log/nginx/access.log \
     && ln -sf /dev/stderr /var/log/nginx/error.log \
-    && mv /usr/lib64/nginx/modules/ngx_* /usr/lib/nginx/modules/
+    && cp /usr/lib64/nginx/modules/ngx_* /usr/lib/nginx/modules/
 
 # Copy default html files to a writable location
 RUN mkdir -p /etc/nginx/html \

internal/controller/nginx/config/generator_test.go

@@ -232,7 +232,7 @@ func TestGenerate(t *testing.T) {
 
 	g.Expect(files[9].Meta.Name).To(Equal("/etc/nginx/main-includes/main.conf"))
 	mainConfStr := string(files[9].Contents)
-	g.Expect(mainConfStr).To(ContainSubstring("load_module /usr/lib/nginx/modules/ngx_otel_module.so;"))
+	g.Expect(mainConfStr).To(ContainSubstring("load_module modules/ngx_otel_module.so;"))
 	g.Expect(mainConfStr).To(ContainSubstring("include /etc/nginx/includes/main_snippet1.conf;"))
 	g.Expect(mainConfStr).To(ContainSubstring("include /etc/nginx/includes/main_snippet2.conf;"))
 

internal/controller/nginx/config/main_config_template.go

@@ -2,7 +2,7 @@ package config
 
 const mainConfigTemplateText = `
 {{ if .Conf.Telemetry.Endpoint -}}
-load_module /usr/lib/nginx/modules/ngx_otel_module.so;
+load_module modules/ngx_otel_module.so;
 {{ end -}}
 
 error_log stderr {{ .Conf.Logging.ErrorLevel }};

internal/controller/nginx/config/main_config_test.go

@@ -20,7 +20,7 @@ func TestExecuteMainConfig_Telemetry(t *testing.T) {
 			Endpoint: "endpoint",
 		},
 	}
-	loadModuleDirective := "load_module /usr/lib/nginx/modules/ngx_otel_module.so;"
+	loadModuleDirective := "load_module modules/ngx_otel_module.so;"
 
 	tests := []struct {
 		name                   string