helm: align telemetry values and fix default values (MAPCO-11633) - #102
Open
CL-SHLOMIKONCHA wants to merge 2 commits into
Open
CL-SHLOMIKONCHA wants to merge 2 commits into
CL-SHLOMIKONCHA wants to merge 2 commits into
Conversation
Move tracing and metrics under a telemetry scope (global.telemetry.tracing.url overrides the chart url), gate metrics on telemetry.metrics.enabled alone, default imagePullPolicy to IfNotPresent and db.schema to MapproxyConfig, and drop the unused mapproxy.db values. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
global.ca.enabled was never a defined value, so REQUESTS_CA_BUNDLE was never set on the init container and the wmts ca guard could never trigger. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Related issues: MAPCO-11633, raster-serving umbrella chart TODOs (
helm-charts-new→charts/raster-serving/values.yaml,site-values→raster/serving/*), MapColonies/ts-server-boilerplate#476 (MAPCO-11622)Further information:
Defaults (resolve the raster-serving / site-values
# TODOoverrides for mapproxy)imagePullPolicyAlwaysIfNotPresentdb.schema''MapproxyConfigmapproxy.db.nameOverride/mapproxy.db.schemaDB_SCHEMAcomes fromdb/global.db)tracing.enabled/global.tracing.*false/ merged from globaltelemetry.tracing.enabled: true, urlhttp://localhost:4317,samplingRatioDenominator: 1000metrics.enabled/metrics.url/global.metrics.*false, url required to enabletelemetry.metrics.enabled: true, no urlTelemetry values (aligned with the boilerplate
telemetryscope)telemetry.tracing(enabled,url,samplingRatioDenominator) replaces the top-leveltracingblock andglobal.tracing. Only the url is overridable fromglobal.telemetry.tracing.urland it takes precedence over the chart url;enabledstays chart-level. New helpermapproxy.tracingUrl;common.tracing.mergedis removed.TELEMETRY_TRACING_ENABLED(always) andTELEMETRY_TRACING_ENDPOINT(when enabled), both quoted;TELEMETRY_TRACING_SAMPLING_RATIO_DENOMINATORis unchanged. The mapproxinator configmap exportsTELEMETRY_TRACING_ENABLED(always) andTELEMETRY_TRACING_URL(when enabled). Both containers receive the same url value, as before.telemetry.metrics.enabledalone gates the uwsgi stats server (container env andmapProxyUwsgi.ini), the uwsgi-exporter sidecar and the mapproxinatorTELEMETRY_METRICS_ENABLEDflag. The formermetrics.urlwas only echoed asTELEMETRY_METRICS_URL, which mapproxinator does not consume, so it is dropped together withglobal.metricsandcommon.metrics.merged. Prometheus scrape annotations keep coming frommclabels.prometheus(port9117, already the default; that umbrella TODO is stale).mapproxy.env.telemetry.*(boto / http / sql / tileCache / traceDebug flags) is unchanged.Fix: the init container gated
REQUESTS_CA_BUNDLEonglobal.ca.enabled, which is not a defined value, so the bundle was never set; it now followsglobal.ca.secretNamelike the other containers. The wmts deployment guard on the same key could never fire and is removed.Breaking for consumers: umbrella charts and site values setting top-level
tracing.*/metrics.*orglobal.tracing.*/global.metrics.*must move totelemetry.tracing.*,telemetry.metrics.enabledandglobal.telemetry.tracing.url. Inraster-serving/values.yaml:mapproxy.metrics(enabled + url) can be dropped (metrics default on, no url needed),mapproxy.imagePullPolicyandmapproxy.db.schemacan be dropped (defaults now match),mapproxy.mclabels.prometheus.port: 9117can be dropped (already the default), andmapproxy.mapproxy.imagePullPolicy/mapproxy.uwsgiExporter.imagePullPolicywere never read by the chart (all containers use the top-levelimagePullPolicy) and can be dropped. Inraster/serving/qa.yaml:mapproxy.imagePullPolicyandmapproxy.mapproxy.imagePullPolicycan be dropped. The nginx subchart's pull policy is owned by the nginx chart.🤖 Generated with Claude Code