From 3a16456c525183bacb668221faba356cd5cc3c25 Mon Sep 17 00:00:00 2001 From: TULCHINSKI LIRAN Date: Tue, 30 Jun 2026 11:37:15 +0300 Subject: [PATCH 01/11] helm: remove unncessary config files --- helm/3d/config/log_format.conf | 50 -------------------------- helm/3d/config/nginx.conf | 36 ------------------- helm/3d/templates/configmap-nginx.yaml | 2 -- helm/3d/values.yaml | 15 +++++++- 4 files changed, 14 insertions(+), 89 deletions(-) delete mode 100644 helm/3d/config/log_format.conf delete mode 100644 helm/3d/config/nginx.conf diff --git a/helm/3d/config/log_format.conf b/helm/3d/config/log_format.conf deleted file mode 100644 index 676d180e..00000000 --- a/helm/3d/config/log_format.conf +++ /dev/null @@ -1,50 +0,0 @@ -{{- $opala := (include "merged.opala" . ) | fromYaml }} - -map $msec $nanosec { - ~(.*)\.(.*) $1$2000000; -} - -log_format json escape=json -'{' - '"Timestamp":$nanosec,' - '"Attributes":{' - '"mapcolonies.time_local":"$time_local",' - {{ if eq $opala.enabled "true" }} - '"mapcolonies.http.auth.token.client_name":"$jwt_payload_sub",' - {{ else }} - '"mapcolonies.http.auth.token.client_name":"NO AUTH",' - {{ end }} - '"http.request.method":"$request_method",' - '"http.request.header.referer":"$http_referer",' - #'"http.request.body.size":$content_length,' - '"http.response.body.size":"$body_bytes_sent",' - '"http.response.header.x_forwarded_for":"$proxy_add_x_forwarded_for",' - '"http.response.status_code":"$status",' - '"user_agent.original":"$http_user_agent",' - '"network.protocol":"$server_protocol",' - '"mapcolonies.request_time":"$request_time",' - '"mapcolonies.http.upstream_connect_time":"$upstream_connect_time",' - '"mapcolonies.http.upstream_response_time":"$upstream_response_time",' - '"mapcolonies.http.upstream_addr":"$upstream_addr",' - '"mapcolonies.http.upstream_status_code":"$upstream_status",' - '"mapcolonies.http.upstream_cache_status":"$upstream_cache_status",' - '"mapcolonies.server":"$hostname",' - '"server.address":"$host",' - '"server.port":"$server_port",' - '"client.address":"$remote_addr",' - '"client.port":"$remote_port",' - '"url.scheme":"$scheme",' - '"url.path":"$uri",' - '"url.full":"$request_uri"' - '},' - '"Resource":{' - '"service.name":"{{ .Values.image.repository }}",' - '"service.version":"{{ .Values.image.tag }}"' - '},' - #'"TraceId":"$opentelemetry_trace_id",' ## this is a byte sequence (hex-encoded in JSON) - #'"SpanId":"$opentelemetry_span_id",' - '"SeverityText":"INFO",' - '"SeverityNumber":"9",' - '"InstrumentationScope":"access.log",' - '"Body":"$request"' -'}'; diff --git a/helm/3d/config/nginx.conf b/helm/3d/config/nginx.conf deleted file mode 100644 index 9a8f2a46..00000000 --- a/helm/3d/config/nginx.conf +++ /dev/null @@ -1,36 +0,0 @@ -{{- $opala := (include "merged.opala" . ) | fromYaml }} - -#user nginx; -worker_processes 4; - -error_log /var/log/nginx/error.log notice; -pid /tmp/nginx.pid; -load_module modules/ngx_http_js_module.so; -load_module /otel/otel_ngx_module.so; - -events { - worker_connections 1024; -} - -http { - opentelemetry_config /otel/otel-nginx.toml; - include /etc/nginx/mime.types; - default_type application/octet-stream; - - {{ if eq $opala.enabled "true" }} - js_import auth from /etc/nginx/auth.js; - js_set $jwt_payload_sub auth.jwtPayloadSub; - {{ end }} - - include /etc/nginx/log_format.conf; - access_log /var/log/nginx/access.log json; - - sendfile on; - #tcp_nopush on; - - keepalive_timeout 65; - - #gzip on; - - include /etc/nginx/conf.d/*.conf; -} diff --git a/helm/3d/templates/configmap-nginx.yaml b/helm/3d/templates/configmap-nginx.yaml index cb4878da..ae8120c4 100644 --- a/helm/3d/templates/configmap-nginx.yaml +++ b/helm/3d/templates/configmap-nginx.yaml @@ -5,5 +5,3 @@ metadata: name: {{ $fullName }}-nginx-configmap data: default.conf: {{ tpl (.Files.Get "config/default.conf") . | quote }} - nginx.conf: {{ tpl (.Files.Get "config/nginx.conf") . | quote }} - log_format.conf: {{ tpl (.Files.Get "config/log_format.conf") . | quote }} diff --git a/helm/3d/values.yaml b/helm/3d/values.yaml index c94c93db..4195be99 100644 --- a/helm/3d/values.yaml +++ b/helm/3d/values.yaml @@ -95,6 +95,16 @@ extraVolumes: {} extraVolumeMounts: {} +opentelemetry: + serviceName: nginx + samplerMethod: AlwaysOff + exporterHost: otel-collector + exporterPort: 4317 + ratio: 10 + +prometheusExporter: + enabled: true + sidecars: {} podAnnotations: {} @@ -176,6 +186,9 @@ ingress: nginx: enabled: false + extensions: + location: + enabled: true nameOverride: replicaCount: 1 environment: development @@ -189,7 +202,7 @@ nginx: uwsgiExporter: image: - repository: "timonwong/uwsgi-exporter" + repository: "timonwong/uwsgi-exp`orter" tag: "latest" env: logLevel: info # one of [debug, info, warn, error] From 0c5d91422bd5832f1beee08f9edcab20bcff50e0 Mon Sep 17 00:00:00 2001 From: TULCHINSKI LIRAN Date: Tue, 30 Jun 2026 11:56:18 +0300 Subject: [PATCH 02/11] helm: remove unncessary config files --- helm/3d/Chart.yaml | 4 ++-- helm/3d/values.yaml | 5 +---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/helm/3d/Chart.yaml b/helm/3d/Chart.yaml index bfd980fc..e3a0639a 100644 --- a/helm/3d/Chart.yaml +++ b/helm/3d/Chart.yaml @@ -2,8 +2,8 @@ apiVersion: v2 name: pycsw description: A Helm chart for 3d pycsw deployment type: application -version: 6.6.1 -appVersion: 6.6.1 +version: 1.1.1 +appVersion: 1.1.1 dependencies: - name: nginx version: 2.2.1 diff --git a/helm/3d/values.yaml b/helm/3d/values.yaml index 4195be99..60e5045f 100644 --- a/helm/3d/values.yaml +++ b/helm/3d/values.yaml @@ -186,9 +186,6 @@ ingress: nginx: enabled: false - extensions: - location: - enabled: true nameOverride: replicaCount: 1 environment: development @@ -202,7 +199,7 @@ nginx: uwsgiExporter: image: - repository: "timonwong/uwsgi-exp`orter" + repository: "timonwong/uwsgi-exporter" tag: "latest" env: logLevel: info # one of [debug, info, warn, error] From 31c6de4fe2909b777516760d86c7615314df857e Mon Sep 17 00:00:00 2001 From: TULCHINSKI LIRAN Date: Tue, 30 Jun 2026 11:56:47 +0300 Subject: [PATCH 03/11] helm: remove unncessary config files --- helm/3d/Chart.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/helm/3d/Chart.yaml b/helm/3d/Chart.yaml index e3a0639a..bfd980fc 100644 --- a/helm/3d/Chart.yaml +++ b/helm/3d/Chart.yaml @@ -2,8 +2,8 @@ apiVersion: v2 name: pycsw description: A Helm chart for 3d pycsw deployment type: application -version: 1.1.1 -appVersion: 1.1.1 +version: 6.6.1 +appVersion: 6.6.1 dependencies: - name: nginx version: 2.2.1 From b756c6c43cba212a732f2c43c0e37ad18cf03294 Mon Sep 17 00:00:00 2001 From: TULCHINSKI LIRAN Date: Wed, 1 Jul 2026 13:59:11 +0300 Subject: [PATCH 04/11] chore: added lcoation instead of default --- helm/3d/Chart.yaml | 4 +- helm/3d/config/default.conf | 58 -------------------------- helm/3d/config/location.conf | 10 +++++ helm/3d/config/pycswWsgi.ini | 3 +- helm/3d/templates/configmap-nginx.yaml | 2 +- helm/3d/values.yaml | 28 +++++++++++-- 6 files changed, 38 insertions(+), 67 deletions(-) delete mode 100644 helm/3d/config/default.conf create mode 100644 helm/3d/config/location.conf diff --git a/helm/3d/Chart.yaml b/helm/3d/Chart.yaml index bfd980fc..e3a0639a 100644 --- a/helm/3d/Chart.yaml +++ b/helm/3d/Chart.yaml @@ -2,8 +2,8 @@ apiVersion: v2 name: pycsw description: A Helm chart for 3d pycsw deployment type: application -version: 6.6.1 -appVersion: 6.6.1 +version: 1.1.1 +appVersion: 1.1.1 dependencies: - name: nginx version: 2.2.1 diff --git a/helm/3d/config/default.conf b/helm/3d/config/default.conf deleted file mode 100644 index b53ed345..00000000 --- a/helm/3d/config/default.conf +++ /dev/null @@ -1,58 +0,0 @@ -{{- $chartName := include "pycsw.name" . -}} -{{- $fullName := include "pycsw.fullname" . -}} -{{- $opala := (include "merged.opala" . ) | fromYaml }} - -upstream pycsw { - server {{ $fullName }}:{{ .Values.env.port }}; -} - -server { - listen {{ .Values.nginx.targetPort }}; - # the domain name it will serve for - server_name pycsw; - # max upload size, adjust to taste - 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 - fastcgi_read_timeout 300; - location /liveness { - access_log off; - log_not_found off; - return 200 "I'm alive\n"; - } - location / { - set $original_method $request_method; - set $original_args $args; - - {{ if eq $opala.enabled "true" }} - set $domain {{ $opala.domain }}; - auth_request /_validate_jwt; - {{ end }} - - include uwsgi_params; - uwsgi_pass pycsw; - uwsgi_hide_header Set-Cookie; # ensures the header will not be passed back to the client - uwsgi_param HTTP_Cookie ""; # ensures that a client cannot pass any prior cookies to the webapp and spoil your cache - } - - {{ if eq $opala.enabled "true" }} - location = /_validate_jwt { - internal; - - js_content auth.opaAuth; - } - - location = /opa { - internal; - - proxy_set_header Content-Type application/json; - proxy_pass {{ $opala.url }}; - } - {{ end }} -} diff --git a/helm/3d/config/location.conf b/helm/3d/config/location.conf new file mode 100644 index 00000000..0473236a --- /dev/null +++ b/helm/3d/config/location.conf @@ -0,0 +1,10 @@ +if ($request_method = 'POST') { + add_header 'Access-Control-Allow-Origin' {{ .Values.nginx.allowedOrigins | default "*" | squote }} always; + add_header 'Access-Control-Allow-Methods' 'POST, OPTIONS' always; + add_header 'Access-Control-Allow-Headers' {{ .Values.nginx.allowedHeaders | default "*" | squote }} always; + add_header 'Access-Control-Max-Age' {{ .Values.nginx.maxAge | default "3600" | squote }}; +} + +proxy_hide_header Set-Cookie; # ensures the header will not be passed back to the client +proxy_ignore_headers Set-Cookie; # ensures that the header will not automatically disable caching within nginx +proxy_set_header Cookie ""; # ensures that a client cannot pass any prior cookies to the webapp and spoil your cacheCollapse comment diff --git a/helm/3d/config/pycswWsgi.ini b/helm/3d/config/pycswWsgi.ini index 3726419b..891ab8ce 100644 --- a/helm/3d/config/pycswWsgi.ini +++ b/helm/3d/config/pycswWsgi.ini @@ -3,7 +3,6 @@ chdir = /home/pycsw/pycsw wsgi-file = cors.py pidfile = /tmp/pycsw.pid -socket = :{{ .Values.env.targetPort }} processes = {{ .Values.env.uwsgi.processes }} ; Maximum number of workers allowed cheaper = 2 ; Minimum number of workers allowed enable-threads = true @@ -32,7 +31,7 @@ cheaper-busyness-backlog-step = 2 ; How many emergency workers to create if t chmod-socket = 664 uid = 1000 gid = 0 -http-socket = :8080 +http-socket = :{{ .Values.env.targetPort }} stats = :{{ .Values.env.uwsgi.statsServer.stats }} stats-http = {{ .Values.env.uwsgi.statsServer.enabled }} stats-min = {{ .Values.env.uwsgi.statsServer.statsMinify }} diff --git a/helm/3d/templates/configmap-nginx.yaml b/helm/3d/templates/configmap-nginx.yaml index ae8120c4..1dd3e84f 100644 --- a/helm/3d/templates/configmap-nginx.yaml +++ b/helm/3d/templates/configmap-nginx.yaml @@ -4,4 +4,4 @@ kind: ConfigMap metadata: name: {{ $fullName }}-nginx-configmap data: - default.conf: {{ tpl (.Files.Get "config/default.conf") . | quote }} + location.conf: {{ tpl (.Files.Get "config/location.conf") . | quote }} diff --git a/helm/3d/values.yaml b/helm/3d/values.yaml index 60e5045f..3f751250 100644 --- a/helm/3d/values.yaml +++ b/helm/3d/values.yaml @@ -94,6 +94,8 @@ ca: extraVolumes: {} extraVolumeMounts: {} +prometheusExporter: + enabled: true opentelemetry: serviceName: nginx @@ -102,9 +104,6 @@ opentelemetry: exporterPort: 4317 ratio: 10 -prometheusExporter: - enabled: true - sidecars: {} podAnnotations: {} @@ -123,7 +122,7 @@ opala: env: port: 8080 - targetPort: 8000 + targetPort: 8080 protocol: TCP logLevel: WARNING maxRecords: 50 @@ -185,6 +184,27 @@ ingress: origin: '*' nginx: + mclabels: + partOf: serving + owner: 3d + gisDomain: 3d + nginx: + extensions: + location: + enabled: true + fileName: location.conf + extraVolumes: + - name: nginx-config + configMap: + name: "{{ .Release.Name }}-nginx-configmap" + extraVolumeMounts: + - name: nginx-config + mountPath: "/etc/nginx/conf.d/extensions/location.conf" + subPath: location.conf + backend: + enabled: true + host: "" # set per deployment to the release name + port: 8080 enabled: false nameOverride: replicaCount: 1 From e4a02ffeb0e0761f6d92f847fac04b16ff5cb937 Mon Sep 17 00:00:00 2001 From: TULCHINSKI LIRAN Date: Wed, 1 Jul 2026 14:00:02 +0300 Subject: [PATCH 05/11] chore: added lcoation instead of default --- helm/3d/Chart.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/helm/3d/Chart.yaml b/helm/3d/Chart.yaml index e3a0639a..bfd980fc 100644 --- a/helm/3d/Chart.yaml +++ b/helm/3d/Chart.yaml @@ -2,8 +2,8 @@ apiVersion: v2 name: pycsw description: A Helm chart for 3d pycsw deployment type: application -version: 1.1.1 -appVersion: 1.1.1 +version: 6.6.1 +appVersion: 6.6.1 dependencies: - name: nginx version: 2.2.1 From 53596008b320287315fef3069f834e8dcdba9981 Mon Sep 17 00:00:00 2001 From: TULCHINSKI LIRAN Date: Wed, 1 Jul 2026 14:04:32 +0300 Subject: [PATCH 06/11] chore: added lcoation instead of default --- helm/3d/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helm/3d/values.yaml b/helm/3d/values.yaml index 3f751250..4ccc9bf9 100644 --- a/helm/3d/values.yaml +++ b/helm/3d/values.yaml @@ -203,7 +203,7 @@ nginx: subPath: location.conf backend: enabled: true - host: "" # set per deployment to the release name + host: "" port: 8080 enabled: false nameOverride: From 0f77ebca3c39c5c7425d9f14889e30cba748d577 Mon Sep 17 00:00:00 2001 From: TULCHINSKI LIRAN Date: Thu, 2 Jul 2026 15:50:14 +0300 Subject: [PATCH 07/11] chore: added lcoation instead of default --- helm/3d/config/location.conf | 14 ++++---------- helm/3d/config/pycswWsgi.ini | 1 + helm/3d/templates/configmap-nginx.yaml | 1 + helm/3d/templates/service.yaml | 2 +- helm/3d/values.yaml | 12 +++++++++--- 5 files changed, 16 insertions(+), 14 deletions(-) diff --git a/helm/3d/config/location.conf b/helm/3d/config/location.conf index 0473236a..9080b5b0 100644 --- a/helm/3d/config/location.conf +++ b/helm/3d/config/location.conf @@ -1,10 +1,4 @@ -if ($request_method = 'POST') { - add_header 'Access-Control-Allow-Origin' {{ .Values.nginx.allowedOrigins | default "*" | squote }} always; - add_header 'Access-Control-Allow-Methods' 'POST, OPTIONS' always; - add_header 'Access-Control-Allow-Headers' {{ .Values.nginx.allowedHeaders | default "*" | squote }} always; - add_header 'Access-Control-Max-Age' {{ .Values.nginx.maxAge | default "3600" | squote }}; -} - -proxy_hide_header Set-Cookie; # ensures the header will not be passed back to the client -proxy_ignore_headers Set-Cookie; # ensures that the header will not automatically disable caching within nginx -proxy_set_header Cookie ""; # ensures that a client cannot pass any prior cookies to the webapp and spoil your cacheCollapse comment +uwsgi_pass {{ include "pycsw.fullname" . }}:{{ .Values.env.port }}; +include uwsgi_params; +uwsgi_hide_header Set-Cookie; +uwsgi_param HTTP_Cookie ""; diff --git a/helm/3d/config/pycswWsgi.ini b/helm/3d/config/pycswWsgi.ini index 891ab8ce..5b4b9a55 100644 --- a/helm/3d/config/pycswWsgi.ini +++ b/helm/3d/config/pycswWsgi.ini @@ -31,6 +31,7 @@ cheaper-busyness-backlog-step = 2 ; How many emergency workers to create if t chmod-socket = 664 uid = 1000 gid = 0 +socket = :{{ .Values.env.pycswPort }} http-socket = :{{ .Values.env.targetPort }} stats = :{{ .Values.env.uwsgi.statsServer.stats }} stats-http = {{ .Values.env.uwsgi.statsServer.enabled }} diff --git a/helm/3d/templates/configmap-nginx.yaml b/helm/3d/templates/configmap-nginx.yaml index 1dd3e84f..2f5c85fa 100644 --- a/helm/3d/templates/configmap-nginx.yaml +++ b/helm/3d/templates/configmap-nginx.yaml @@ -5,3 +5,4 @@ metadata: name: {{ $fullName }}-nginx-configmap data: location.conf: {{ tpl (.Files.Get "config/location.conf") . | quote }} + server.conf: {{ tpl (.Files.Get "config/server.conf") . | quote }} diff --git a/helm/3d/templates/service.yaml b/helm/3d/templates/service.yaml index e4419c4a..aadf1f9e 100644 --- a/helm/3d/templates/service.yaml +++ b/helm/3d/templates/service.yaml @@ -18,7 +18,7 @@ spec: {{- end }} ports: - port: {{ .Values.env.port }} - targetPort: {{ .Values.env.targetPort }} + targetPort: {{ .Values.env.pycswPort }} protocol: {{ .Values.env.protocol }} {{- if eq $cloudProviderFlavor "minikube" }} nodePort: {{ .Values.nodePort }} diff --git a/helm/3d/values.yaml b/helm/3d/values.yaml index 4ccc9bf9..798d37bb 100644 --- a/helm/3d/values.yaml +++ b/helm/3d/values.yaml @@ -122,6 +122,7 @@ opala: env: port: 8080 + pycswPort: 8000 targetPort: 8080 protocol: TCP logLevel: WARNING @@ -193,6 +194,9 @@ nginx: location: enabled: true fileName: location.conf + server: + enabled: true + fileName: server.conf extraVolumes: - name: nginx-config configMap: @@ -201,10 +205,12 @@ nginx: - name: nginx-config mountPath: "/etc/nginx/conf.d/extensions/location.conf" subPath: location.conf + - name: nginx-config + mountPath: "/etc/nginx/conf.d/extensions/server.conf" + subPath: server.conf backend: - enabled: true - host: "" - port: 8080 + enabled: false + enabled: false nameOverride: replicaCount: 1 From b87e07e4713e4cf950cac2dcb49ba89e24512d6c Mon Sep 17 00:00:00 2001 From: TULCHINSKI LIRAN Date: Thu, 2 Jul 2026 16:56:07 +0300 Subject: [PATCH 08/11] chore: added lcoation instead of default --- helm/3d/config/server.conf | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 helm/3d/config/server.conf diff --git a/helm/3d/config/server.conf b/helm/3d/config/server.conf new file mode 100644 index 00000000..ed865a8d --- /dev/null +++ b/helm/3d/config/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 From 66b9b75e7e531fd7e78addc6f0353d94707998ba Mon Sep 17 00:00:00 2001 From: TULCHINSKI LIRAN Date: Sun, 5 Jul 2026 15:17:54 +0300 Subject: [PATCH 09/11] chore: renmae pycswPort and oreder ports --- helm/3d/config/pycswWsgi.ini | 4 ++-- helm/3d/templates/deployment.yaml | 2 +- helm/3d/templates/service.yaml | 2 +- helm/3d/values.yaml | 3 +-- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/helm/3d/config/pycswWsgi.ini b/helm/3d/config/pycswWsgi.ini index 5b4b9a55..d00faba3 100644 --- a/helm/3d/config/pycswWsgi.ini +++ b/helm/3d/config/pycswWsgi.ini @@ -31,8 +31,8 @@ cheaper-busyness-backlog-step = 2 ; How many emergency workers to create if t chmod-socket = 664 uid = 1000 gid = 0 -socket = :{{ .Values.env.pycswPort }} -http-socket = :{{ .Values.env.targetPort }} +socket = :{{ .Values.env.pycswUwsgiPort }} +http-socket = :{{ .Values.env.port }} stats = :{{ .Values.env.uwsgi.statsServer.stats }} stats-http = {{ .Values.env.uwsgi.statsServer.enabled }} stats-min = {{ .Values.env.uwsgi.statsServer.statsMinify }} diff --git a/helm/3d/templates/deployment.yaml b/helm/3d/templates/deployment.yaml index a2c27598..bd71779e 100644 --- a/helm/3d/templates/deployment.yaml +++ b/helm/3d/templates/deployment.yaml @@ -126,7 +126,7 @@ spec: name: {{ $fullName }} ports: - name: http - containerPort: {{ .Values.env.targetPort }} + containerPort: {{ .Values.env.pycswUwsgiPort }} protocol: {{ .Values.env.protocol }} {{- if .Values.livenessProbe.enabled }} livenessProbe: diff --git a/helm/3d/templates/service.yaml b/helm/3d/templates/service.yaml index aadf1f9e..6fa7ba3f 100644 --- a/helm/3d/templates/service.yaml +++ b/helm/3d/templates/service.yaml @@ -18,7 +18,7 @@ spec: {{- end }} ports: - port: {{ .Values.env.port }} - targetPort: {{ .Values.env.pycswPort }} + targetPort: {{ .Values.env.pycswUwsgiPort }} protocol: {{ .Values.env.protocol }} {{- if eq $cloudProviderFlavor "minikube" }} nodePort: {{ .Values.nodePort }} diff --git a/helm/3d/values.yaml b/helm/3d/values.yaml index 798d37bb..5f145343 100644 --- a/helm/3d/values.yaml +++ b/helm/3d/values.yaml @@ -122,8 +122,7 @@ opala: env: port: 8080 - pycswPort: 8000 - targetPort: 8080 + pycswUwsgiPort: 8000 protocol: TCP logLevel: WARNING maxRecords: 50 From c9a2964d884346fde1b92aea623a082870a29add Mon Sep 17 00:00:00 2001 From: TULCHINSKI LIRAN Date: Mon, 6 Jul 2026 11:22:30 +0300 Subject: [PATCH 10/11] chore: reposition opentelemetry --- helm/3d/values.yaml | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/helm/3d/values.yaml b/helm/3d/values.yaml index 5f145343..f7146192 100644 --- a/helm/3d/values.yaml +++ b/helm/3d/values.yaml @@ -94,15 +94,6 @@ ca: extraVolumes: {} extraVolumeMounts: {} -prometheusExporter: - enabled: true - -opentelemetry: - serviceName: nginx - samplerMethod: AlwaysOff - exporterHost: otel-collector - exporterPort: 4317 - ratio: 10 sidecars: {} @@ -210,6 +201,16 @@ nginx: backend: enabled: false + prometheusExporter: + enabled: true + + opentelemetry: + serviceName: nginx + samplerMethod: AlwaysOff + exporterHost: otel-collector + exporterPort: 4317 + ratio: 10 + enabled: false nameOverride: replicaCount: 1 @@ -220,7 +221,7 @@ nginx: servicePort: 8080 nodePort: 30001 route: - enabled: + enabled: uwsgiExporter: image: From af10f15b20bfb12348a8430fc23dfe5635f7815e Mon Sep 17 00:00:00 2001 From: TULCHINSKI LIRAN Date: Tue, 7 Jul 2026 14:19:29 +0300 Subject: [PATCH 11/11] chore: change service_name for grafana --- helm/3d/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helm/3d/values.yaml b/helm/3d/values.yaml index f7146192..766ebe47 100644 --- a/helm/3d/values.yaml +++ b/helm/3d/values.yaml @@ -212,7 +212,7 @@ nginx: ratio: 10 enabled: false - nameOverride: + nameOverride: "3d-pycsw-nginx" replicaCount: 1 environment: development port: 8080