Skip to content
58 changes: 0 additions & 58 deletions helm/3d/config/default.conf

This file was deleted.

4 changes: 4 additions & 0 deletions helm/3d/config/location.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
uwsgi_pass {{ include "pycsw.fullname" . }}:{{ .Values.env.port }};
include uwsgi_params;
uwsgi_hide_header Set-Cookie;
uwsgi_param HTTP_Cookie "";
50 changes: 0 additions & 50 deletions helm/3d/config/log_format.conf

This file was deleted.

36 changes: 0 additions & 36 deletions helm/3d/config/nginx.conf

This file was deleted.

4 changes: 2 additions & 2 deletions helm/3d/config/pycswWsgi.ini
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -32,7 +31,8 @@ cheaper-busyness-backlog-step = 2 ; How many emergency workers to create if t
chmod-socket = 664
uid = 1000
gid = 0
http-socket = :8080
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 }}
10 changes: 10 additions & 0 deletions helm/3d/config/server.conf
Original file line number Diff line number Diff line change
@@ -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
5 changes: 2 additions & 3 deletions helm/3d/templates/configmap-nginx.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,5 @@ kind: ConfigMap
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 }}
location.conf: {{ tpl (.Files.Get "config/location.conf") . | quote }}
server.conf: {{ tpl (.Files.Get "config/server.conf") . | quote }}
2 changes: 1 addition & 1 deletion helm/3d/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion helm/3d/templates/service.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ spec:
{{- end }}
ports:
- port: {{ .Values.env.port }}
targetPort: {{ .Values.env.targetPort }}
targetPort: {{ .Values.env.pycswUwsgiPort }}
protocol: {{ .Values.env.protocol }}
{{- if eq $cloudProviderFlavor "minikube" }}
nodePort: {{ .Values.nodePort }}
Expand Down
42 changes: 39 additions & 3 deletions helm/3d/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ opala:

env:
port: 8080
targetPort: 8000
pycswUwsgiPort: 8000
protocol: TCP
logLevel: WARNING
maxRecords: 50
Expand Down Expand Up @@ -175,8 +175,44 @@ ingress:
origin: '*'

nginx:
mclabels:
partOf: serving
owner: 3d
gisDomain: 3d
nginx:
extensions:
location:
enabled: true
fileName: location.conf
server:
enabled: true
fileName: server.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
- name: nginx-config
mountPath: "/etc/nginx/conf.d/extensions/server.conf"
subPath: server.conf
backend:
enabled: false

prometheusExporter:
enabled: true

opentelemetry:
serviceName: nginx
samplerMethod: AlwaysOff
exporterHost: otel-collector
exporterPort: 4317
ratio: 10

enabled: false
nameOverride:
nameOverride: "3d-pycsw-nginx"
replicaCount: 1
environment: development
port: 8080
Expand All @@ -185,7 +221,7 @@ nginx:
servicePort: 8080
nodePort: 30001
route:
enabled:
enabled:

uwsgiExporter:
image:
Expand Down
Loading