fix rebase

Signed-off-by: Haywood Shannon <[email protected]>

Signed-off-by: Haywood Shannon <[email protected]>

Author: haywoodsh

build/Dockerfile

@@ -14,8 +14,8 @@ ARG PACKAGE_REPO=pkgs.nginx.com
 FROM ghcr.io/nginx/dependencies/nginx-ubi-ppc64le:nginx-1.27.4@sha256:fff4dde599b89cb22e5cea5d8cfba8c47bcedaa8e6fa549f5fe74a89c733aa2f AS ubi-ppc64le
 FROM ghcr.io/nginx/alpine-fips:0.2.4-alpine3.19@sha256:2a7f8451110b588b733e4cb8727a48153057b1debac5c78ef8a539ff63712fa1 AS alpine-fips-3.19
 FROM ghcr.io/nginx/alpine-fips:0.2.4-alpine3.21@sha256:5221dec2e33436f2586c743c7aa3ef4626c0ec54184dc3364d101036d4f4a060 AS alpine-fips-3.21
-FROM redhat/ubi9-minimal:9.5@sha256:e1c4703364c5cb58f5462575dc90345bcd934ddc45e6c32f9c162f2b5617681c AS ubi-minimal
-FROM golang:1.24-alpine@sha256:7772cb5322baa875edd74705556d08f0eeca7b9c4b5367754ce3f2f00041ccee AS golang-builder
+FROM redhat/ubi9-minimal:9.5@sha256:a50731d3397a4ee28583f1699842183d4d24fadcc565c4688487af9ee4e13a44 AS ubi-minimal
+FROM golang:1.24-alpine@sha256:ef18ee7117463ac1055f5a370ed18b8750f01589f13ea0b48642f5792b234044 AS golang-builder
 
 
 ############################################# Base image for Alpine #############################################
@@ -27,7 +27,7 @@ RUN printf "%s%s%s\n" "http://nginx.org/packages/mainline/alpine/v" `egrep -o '^
 
 
 ############################################# Base image for Debian #############################################
-FROM nginx:1.27.4@sha256:124b44bfc9ccd1f3cedf4b592d4d1e8bddb78b51ec2ed5056c52d3692baebc19 AS debian
+FROM nginx:1.27.4@sha256:09369da6b10306312cd908661320086bf87fbae1b6b0c49a1f50ba531fef2eab AS debian
 
 RUN apt-get update \
 	&& apt-get install --no-install-recommends --no-install-suggests -y \
@@ -41,7 +41,6 @@ RUN apt-get update \
 	&& apt-get purge --auto-remove -y gnupg2 lsb-release curl \
 	&& rm -rf /var/lib/apt/lists/* /etc/apt/preferences.d/99nginx /etc/apt/sources.list.d/nginx.list
 
-
 ############################################# NGINX files #############################################
 FROM scratch AS nginx-files
 ARG IC_VERSION

internal/configs/config_params.go

@@ -37,7 +37,6 @@ type ConfigParams struct {
 	MainOtelLoadModule                     bool
 	MainOtelTraceInHTTP                    bool
 	MainOtelExporterEndpoint               string
-	MainOtelExporterTrustedCA              string
 	MainOtelExporterHeaderName             string
 	MainOtelExporterHeaderValue            string
 	MainOtelServiceName                    string

internal/configs/configmaps.go

@@ -799,8 +799,7 @@ func parseConfigMapOpenTelemetry(l *slog.Logger, cfgm *v1.ConfigMap, cfgParams *
 	}
 
 	if cfgParams.MainOtelExporterEndpoint == "" &&
-		(cfgParams.MainOtelExporterTrustedCA != "" ||
-			cfgParams.MainOtelExporterHeaderName != "" ||
+		(cfgParams.MainOtelExporterHeaderName != "" ||
 			cfgParams.MainOtelExporterHeaderValue != "" ||
 			cfgParams.MainOtelServiceName != "" ||
 			cfgParams.MainOtelTraceInHTTP) {

internal/configs/configmaps_test.go

@@ -1379,10 +1379,9 @@ func TestParseZoneSyncResolverIPV6MapResolverIPV6(t *testing.T) {
 func TestOpenTelemetryConfigurationSuccess(t *testing.T) {
 	t.Parallel()
 	tests := []struct {
-		configMap                *v1.ConfigMap
-		expectedLoadModule       bool
-		expectedExporterEndpoint string
-		//expectedExporterTrustedCA   string
+		configMap                   *v1.ConfigMap
+		expectedLoadModule          bool
+		expectedExporterEndpoint    string
 		expectedExporterHeaderName  string
 		expectedExporterHeaderValue string
 		expectedServiceName         string

internal/configs/version1/config.go

@@ -243,7 +243,6 @@ type MainConfig struct {
 	MainOtelLoadModule                 bool
 	MainOtelGlobalTraceEnabled         bool
 	MainOtelExporterEndpoint           string
-	MainOtelExporterTrustedCA          string
 	MainOtelExporterHeaderName         string
 	MainOtelExporterHeaderValue        string
 	MainOtelServiceName                string