helm: upgrade nginx version and refactor configuration files tosupport nginx extensions( MAPCO-10120)

helm/raster/Chart.yaml

@@ -6,8 +6,8 @@ version: 6.4.1
 appVersion: 6.4.1
 dependencies:
   - name: nginx
-    version: 1.1.0
-    repository: oci://acrarolibotnonprod.azurecr.io/helm
+    version: 2.1.6
+    repository: oci://acrarolibotnonprod.azurecr.io/helm/common
   - name: mclabels
     version: 1.0.1
     repository: oci://acrarolibotnonprod.azurecr.io/helm/infra

helm/raster/config/log_format.conf

@@ -2,7 +2,7 @@ map $msec $nanosec {
     ~(.*)\.(.*) $1$2000000;
 }
 
-log_format json escape=json
+log_format main escape=json
        '{'
         '"Timestamp": $nanosec,'
         '"Attributes": {'
@@ -67,8 +67,8 @@ log_format json escape=json
             '"uid_reset": "$uid_reset",'
             '"uid_set": "$uid_set"'
         '},'
-        '"TraceId": "$opentelemetry_trace_id",' ## this is a byte sequence (hex-encoded in JSON)
-        '"SpanId": "$opentelemetry_span_id",'
+        '"TraceId": "$otel_trace_id",' ## this is a byte sequence (hex-encoded in JSON)
+        '"SpanId": "$otel_span_id",'
         {{ if .Values.nginx.authorization.enabled }}
         '"TokenUser": "$jwt_payload_sub",'
         {{ else }}
@@ -78,4 +78,4 @@ log_format json escape=json
         '"SeverityNumber": 9,'
         '"RequestBody": "$request_body",'
         '"Body": "$request"'
-    '}';
+    '}';

helm/raster/config/pycsw-location.conf

@@ -0,0 +1,6 @@
+
+# pycsw custom uwsgi settings injected into root location
+uwsgi_pass {{ include "service.fullname" . }}:{{ .Values.servicePort }}; 
+include uwsgi_params;
+uwsgi_hide_header Set-Cookie;
+uwsgi_param HTTP_Cookie "";

helm/raster/config/pycsw-server.conf

@@ -0,0 +1,10 @@
+# pycsw server-level settings
+keepalive_timeout 500;
+proxy_connect_timeout 600;
+proxy_send_timeout 600;
+send_timeout 600;
+client_max_body_size 5000;
+client_header_timeout 600;
+client_body_timeout 600;
+client_header_buffer_size 12288; # 12K
+large_client_header_buffers 4 12288; # 12K

helm/raster/templates/nginx/nginx-configmap.yaml

@@ -12,7 +12,7 @@ metadata:
     environment: {{ .Values.environment }}
     release: {{ $releaseName }}
 data:
-  default.conf: {{ tpl (.Files.Get "config/default.conf") . | quote }}
-  nginx.conf: {{ tpl (.Files.Get "config/nginx.conf") . | quote }}
+  pycsw-location.conf: {{ tpl (.Files.Get "config/pycsw-location.conf") . | quote }}
+  pycsw-server.conf: {{ tpl (.Files.Get "config/pycsw-server.conf") . | quote }}
   log_format.conf: {{ tpl (.Files.Get "config/log_format.conf") . | quote }}
 {{- end }}

helm/raster/values.yaml

@@ -131,14 +131,47 @@ nginx:
   fullnameOverride: ""
   replicaCount: 2
   image:
-    repository: nginx-otel-unprivileged
-    tag: "v1.0.0"
-
+    repository: common/nginx
+    tag: "v2.1.6"
+  nginx:
+    extensions:
+      server:
+        enabled: true
+        fileName: pycsw-server.conf
+      location:
+        enabled: true
+        fileName: pycsw-location.conf
   port: 8080
   internalServicePort: 80
-  nginxTargetPort: 8080
   targetPort: 8080
   nodePort: 30003
+  clientMaxBodySize: 5000
+
+  opentelemetry:
+    serviceName: pycsw-nginx
+    exporterHost: infra-otel.infra-services
+    exporterPort: 4317
+    samplerMethod: "AlwaysOff"
+    ratio: 10
+
+  backend:
+    enabled: false
+
+  prometheusExporter:
+    enabled: true
+    image:
+      repository: common/nginx/nginx-prometheus-exporter
+      tag: latest
+      pullPolicy: IfNotPresent
+    resources:
+      enabled: true
+      value:
+        limits:
+          cpu: 100m
+          memory: 128Mi
+        requests:
+          cpu: 100m
+          memory: 128Mi
 
   authorization:
     enabled: true
@@ -148,20 +181,17 @@ nginx:
       queryName: token
 
   extraVolumes:
-  - name: nginx-config
-    configMap:
-      name: "{{ .Release.Name }}-pycsw-nginx-configmap"
+    - name: nginx-config
+      configMap:
+        name: "{{ .Release.Name }}-pycsw-nginx-configmap"
 
   extraVolumeMounts:
-  - name: nginx-config
-    mountPath: "/etc/nginx/conf.d/default.conf"
-    subPath: default.conf
-  - mountPath: "/etc/nginx/nginx.conf"
-    name: nginx-config
-    subPath: nginx.conf
-  - name: nginx-config
-    mountPath: "/etc/nginx/log_format.conf"
-    subPath: log_format.conf
+    - name: nginx-config
+      mountPath: "/etc/nginx/conf.d/extensions/pycsw-location.conf"
+      subPath: pycsw-location.conf
+    - name: nginx-config
+      mountPath: "/etc/nginx/conf.d/extensions/pycsw-server.conf"
+      subPath: pycsw-server.conf
 
   resources:
     enabled: true
@@ -175,8 +205,9 @@ nginx:
 
   route:
     enabled: true
-    path: /api/raster/v1
-    host:
+    routesMapping:
+      - path: /api/raster/v1
+        host:
     timeout:
       enabled: false # defaults to 30s by openshift
       duration: 60s # supported units (us, ms, s, m, h, d)
@@ -189,8 +220,11 @@ nginx:
 
   ingress:
     enabled: false
-    path: /api/raster/v1
-    host: "localhost"
+    ingressClassName: ""
+    ingressMapping:
+      - host: "localhost"
+        path: /api/raster/v1
+        pathType: Prefix
     tls:
       enabled: true
       useExternal: ""