helm: split server and telemetry values and fix default values (MAPCO-11633) - #53
Open
CL-SHLOMIKONCHA wants to merge 5 commits into
Open
CL-SHLOMIKONCHA wants to merge 5 commits into
CL-SHLOMIKONCHA wants to merge 5 commits into
Conversation
…1633) Align the chart with ts-server-boilerplate: - replace the flat env block with a server scope (port, targetPort, protocol, requestPayloadLimit, responseCompressionEnabled) and a telemetry scope (logger, tracing); the cache-seeder specific keys (httpRetry, queue, mapproxy, seed*, mapproxyCmdCommand, refreshBeforeYearsOffset, invalidBbox*) stay under env unchanged - rename logger keys to level and prettyPrint to match the config schema - export OPENTELEMETRY_LOGGING_ENABLED, OTLP_LOGGER_ENDPOINT_URL and OTEL_RESOURCE_ATTRIBUTES (key=value,key=value), the names the boilerplate schema and the OpenTelemetry SDK read, and map them in config/custom-environment-variables.json - always export the enabled flags, urls only when enabled - move global overrides under global.telemetry; only the tracing and otlp logger urls are overridable from global and take precedence over chart values, enabled flags stay chart-level - drop the metrics values (nothing reads them, Prometheus annotations come from mclabels), the metricsUrl helper and the merged telemetry helpers Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
Resolves the raster-ingestion umbrella / site-values TODO override. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
…MAPCO-11633) Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
almog8k
approved these changes
Sep 14, 2026
Aligns with ts-server-boilerplate#477: loggerConfig already carries prettyPrint, so spreading it is enough. 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
2 participants
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-ingestion umbrella chart TODOs (
helm-charts-new→charts/raster-ingestion/values.yaml,site-values→raster/ingestion/*), MapColonies/ts-server-boilerplate#476 (MAPCO-11622)Further information:
Defaults (resolve the raster-ingestion / site-values
# TODOoverrides for cache-seeder)image.pullPolicyAlwaysIfNotPresentenv.seedConcurrency525Server / telemetry split (mirrors ts-server-boilerplate#476)
envblock is replaced by aserverscope (port,targetPort,protocol,requestPayloadLimit,responseCompressionEnabled) and atelemetryscope (logger,tracing). The cache-seeder specific keys (httpRetry,queue,mapproxy,seedAttempts,seedConcurrency,mapproxyCmdCommand,refreshBeforeYearsOffset,invalidBboxInitialBufferMeters,invalidBboxRetryLimit) stay underenvunchanged.level/prettyPrint;logger.opentelemetryOptionsholdsenabled,urland optionalresourceAttributes. The top-leveltracingblock moves totelemetry.tracing.OPENTELEMETRY_LOGGING_ENABLED,OTLP_LOGGER_ENDPOINT_URLandOTEL_RESOURCE_ATTRIBUTES(key=value,key=value), the names the boilerplate schema and the OpenTelemetry SDK read. The previousOPENTELEMETRY_LOGGING_URL/OPENTELEMETRY_RESOURCE_ATTRIBUTESnames were not consumed by the schema.config/custom-environment-variables.jsonmaps the same names. Enabled flags are always exported, urls only when enabled.global.telemetrywith the same hierarchy. Only the tracing and OTLP logger urls are overridable from global and take precedence over chart values; enabled flags stay chart-level.global.tracing,global.openTelemetryOptionsandglobal.metricsare removed.metricsvalues are removed (nothing in the chart or service reads them; Prometheus scrape annotations come frommclabels.prometheus), together with themetricsUrl,common.tracing.merged,common.metrics.mergedandcommon.openTelemetryOptions.mergedhelpers.Breaking for consumers: umbrella charts and site values setting
env.port/env.targetPort/env.protocol/env.requestPayloadLimit/env.responseCompressionEnabled/env.logLevel/env.logPrettyPrintEnabled/env.openTelemetryOptions, top-leveltracing/metrics, orglobal.tracing.*/global.openTelemetryOptions.*/global.metrics.*must move toserver.*,telemetry.*andglobal.telemetry.*.env.httpRetry,env.queue,env.mapproxy,env.seed*and the other cache-seeder keys remain valid paths.cache-seeder.image.pullPolicyinraster-ingestion/values.yamlandraster/ingestion/qa.yaml, andcache-seeder.env.seedConcurrency: 25inraster-ingestion/values.yaml, can be dropped since the defaults now match.🤖 Generated with Claude Code