helm!: create unified chart by shimoncohen · Pull Request #122 · MapColonies/pycsw

shimoncohen · 2026-07-12T12:32:47Z

No description provided.

CL-SHLOMIKONCHA

Also we need it to publish the new "common" pycsw to dedicated common/pycsw docker and helm/common/pycsw helm path by the existing workflows

CL-SHLOMIKONCHA · 2026-07-19T11:57:31Z

@@ -0,0 +1,6 @@
+


delete empty line

CL-SHLOMIKONCHA · 2026-07-19T12:00:11Z

+# pycsw custom uwsgi settings injected into root location
+uwsgi_pass {{ include "pycsw.service.fullname" . }}:{{ .Values.servicePort }}; 
+include uwsgi_params;
+uwsgi_hide_header Set-Cookie;


do we need it
current nginx (2.2.1) includes "blacklist headers"

These strip the Set-Cookie response header and blank the inbound Cookie sent to the uwsgi upstream. Does nginx 2.2.1's blacklist-headers cover both the response Set-Cookie and the request Cookie? If it covers both I'll drop lines 5-6; if it's response-headers only I'll keep uwsgi_param HTTP_Cookie "".

Checked auth.js. Its DENYLIST (incl. cookie) is applied by filterHeaders, which only builds the OPA authz subrequest body (input.headers) — and only on the OPA path. It doesn't strip Cookie from the request forwarded to the pycsw upstream, and touches no response headers at all.

So neither line here is covered by it:

uwsgi_hide_header Set-Cookie; — strips the response header from the upstream; auth.js never touches responses.

uwsgi_param HTTP_Cookie ""; — blanks Cookie to the uwsgi upstream; the denylist only filters what's sent to OPA, not upstream.

Keeping both.

CL-SHLOMIKONCHA · 2026-07-19T12:21:26Z

+Create service name as used by the service name label.
+*/}}
+{{- define "pycsw.service.fullname" -}}
+{{- printf "%s-%s-%s" .Release.Name (include "pycsw.name" .) "service" }}


Can we just replace the "(include "pycsw.name" .) to .Chart.Name for each of those resources?

example:

Suggested change

{{- printf "%s-%s-%s" .Release.Name (include "pycsw.name" .) "service" }}

{{- printf "%s-%s-%s" .Release.Name .Chart.Name "service" }}

Keeping pycsw.name here. This PR adds nameOverride support (see _helpers.tpl:6-8 and the values comment) so multiple aliased instances can deploy in one release without resource-name collisions. .Chart.Name is fixed to pycsw, which would break that. pycsw.name returns .Chart.Name by default and only differs when nameOverride is set.

CL-SHLOMIKONCHA · 2026-07-19T12:24:16Z

+  {{ end }}
+  uwsgi.ini: {{ tpl (.Files.Get "config/pycswWsgi.ini") . | quote }}
+  CORS_ENABLED: {{ .Values.env.cors.enabled | quote }}
+  CORS_ALLOWED_HEADERS: {{ include "pycsw.cors.allowedHeaders" . | default (quote "") }}


does includes works as template? currently were using template for this allowHeaders render

include returns the rendered string, so it can be piped — here into | default (quote ""). template is an action that writes directly to output and can't be piped, so it wouldn't work in this expression. Keeping include.

Why do you need to usetemplate? It should be * by default, today nginx handles the cors.

CL-SHLOMIKONCHA · 2026-07-19T12:27:47Z

+nameOverride: ""
+
+# REQUIRED: name of a ConfigMap provided by the consuming chart, containing the keys:
+#   pycsw.cfg    - the pycsw configuration file


Where will these files be found? (pycsw.cfg + mapping.py)

From the ConfigMap named by existingConfigmap, provided by the consuming chart (documented at values.yaml:41-45). The deployment mounts its pycsw.cfg and mappings.py keys as files (see the volumes in deployment.yaml).

CL-SHLOMIKONCHA · 2026-07-19T12:32:51Z

+the pycsw.cfg and mappings.py keys. The value may itself be a template.
+Fails rendering when not provided.
+*/}}
+{{- define "pycsw.teamConfigmapName" -}}


I would suggest to change this teamConfigmapName same on existingConfigmap

Renamed pycsw.teamConfigmapName → pycsw.existingConfigmapName (helper + the $existingConfigmapName var in deployment.yaml).

CL-SHLOMIKONCHA · 2026-07-19T13:10:07Z

+    repository: common/nginx
+    # defaults to the nginx chart appVersion when empty
+    tag: ""
+  mclabels:


missing logScraping key - default to true

Added logScraping: true under both mclabels and nginx.mclabels.

CL-SHLOMIKONCHA · 2026-07-19T13:13:02Z

+  tracing:
+    enabled: false
+    url: http://localhost:55681/v1/trace
+  metrics:


missing prometheus key under metrics scope:

is that relevant ?

currently, its defined within dem and raster helms

mclabels.prometheus.{enabled,port} (values.yaml:33) already drives the prometheus scrape annotations via mclabels.annotations. The env.metrics.prometheus.{scrape,port} block in raster/dem looks legacy — no pycsw template reads it. Do you want it added for parity, or is the mclabels one sufficient? I lean toward mclabels-only to avoid duplication.

See above — likely redundant with mclabels.prometheus, which already drives the scrape annotations here.

Right, but there it's env.metrics.prometheus, which no pycsw template consumes. mclabels.prometheus covers the same purpose in this chart.

CL-SHLOMIKONCHA · 2026-07-19T13:16:29Z

+    enabled: true
+    # routesMapping must be set by the consuming chart, e.g.
+    # routesMapping:
+    #   - path: /api/raster/v1


avoid mention raster here

Changed the example to /api/<domain>/v1.

CL-SHLOMIKONCHA · 2026-07-19T13:19:28Z

All the path that mentioned a team chart path are irrelevant, actually, i guess you would like to get rid of raster/dem/3d etc.. helm directories in this PR

I wanted to seperate this:
#125
We can approve it and merge to this branch first if you want.

Handled in #125 (helm: remove individual charts), which deletes the 3d/dem/raster dirs and their release-please paths. Merge #125 into this branch first, as noted above.

- remove leading empty line in pycsw-location.conf - rename pycsw.teamConfigmapName helper to pycsw.existingConfigmapName to align with the existingConfigmap value - add logScraping: true to mclabels and nginx.mclabels - genericize routesMapping example (raster -> <domain>) Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>

The nginx config files were renamed config/pycsw-{location,server}.conf -> config/{location,server}.conf but references still pointed at the old names, breaking .Files.Get at render. Update values.yaml (fileName, extraVolumeMounts), nginx-configmap keys/Files.Get, and README. Verified: helm template renders clean; configmap emits location.conf/server.conf.

…b schema example - env.cors.allowedHeaders "x-api-key" -> "*" - comment out nginx.image.tag (falls back to nginx chart appVersion) - genericize env.db.schema example (drop raster-specific name) Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>

1.1.0 requires the new mclabels `criticality` field; set it to `customer` on both the pycsw and nginx mclabels blocks. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>

shimoncohen added 4 commits July 10, 2026 12:37

helm!: create unified chart

f42aac1

helm: change auth url

ebef810

helm: remove nginx custom log format

ef4689b

helm: add mclabels values to nginx

510e7a0

shimoncohen requested review from CL-SHLOMIKONCHA, alebinson and asafMasa July 12, 2026 12:32

shimoncohen self-assigned this Jul 12, 2026

CL-SHLOMIKONCHA requested changes Jul 19, 2026

View reviewed changes

asafmas-rnd requested changes Jul 22, 2026

View reviewed changes

Comment thread helm/pycsw/config/server.conf

Comment thread helm/pycsw/Chart.yaml Outdated

Comment thread helm/pycsw/values.yaml Outdated

Comment thread helm/pycsw/values.yaml Outdated

shimoncohen added 5 commits July 23, 2026 15:57

chore: rename helm nginx config files

44a71f9

helm: update chart version

c017240

helm: remove image tag from values

bbc53bc

helm: use specific version for timonwong/uwsgi-exporter

e8c5daf

asafmas-rnd requested changes Jul 26, 2026

View reviewed changes

Comment thread helm/pycsw/values.yaml Outdated

Comment thread helm/pycsw/values.yaml Outdated

Comment thread helm/pycsw/values.yaml Outdated

Comment thread helm/pycsw/README.md

shimoncohen and others added 2 commits July 29, 2026 17:06

helm: bump mclabels dependency to 1.1.0

d2a04cb

1.1.0 requires the new mclabels `criticality` field; set it to `customer` on both the pycsw and nginx mclabels blocks. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>

asafmas-rnd approved these changes Jul 29, 2026

View reviewed changes

	{{- printf "%s-%s-%s" .Release.Name (include "pycsw.name" .) "service" }}
	{{- printf "%s-%s-%s" .Release.Name .Chart.Name "service" }}

Uh oh!

Conversation

shimoncohen commented Jul 12, 2026

Uh oh!

CL-SHLOMIKONCHA left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

CL-SHLOMIKONCHA Jul 19, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

CL-SHLOMIKONCHA Jul 19, 2026 •

edited

Loading