fix(helm): align values with ts-server-boilerplate server/telemetry split - #121
Open
CL-SHLOMIKONCHA wants to merge 3 commits into
Open
CL-SHLOMIKONCHA wants to merge 3 commits into
CL-SHLOMIKONCHA wants to merge 3 commits into
Conversation
Align the chart with ts-server-boilerplate: - move port, targetPort, protocol, requestPayloadLimit and responseCompressionEnabled from env to a server scope; the remaining env keys (httpRetry, disableHttpClientLogs, shapefileReader) stay - add a telemetry scope (logger.level, logger.prettyPrint, logger.opentelemetryOptions, tracing) replacing env.logLevel, env.logPrettyPrintEnabled and env.openTelemetryOptions - global overrides move under global.telemetry; only the tracing and otlp logger urls are overridable from global and take precedence - export the otlp logger url as OTLP_LOGGER_ENDPOINT_URL and resource attributes as OTEL_RESOURCE_ATTRIBUTES (key=value list), the names the config schema and the OpenTelemetry SDK read; map them the same way in custom-environment-variables.json - add tracingUrl, opentelemetryLoggingUrl and otelResourceAttributes helpers, drop the merged tracing/openTelemetryOptions helpers Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
Resolves the raster-export umbrella TODO overrides for exporter-overseer and drops the unused top-level tracing block superseded by telemetry.tracing. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
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
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, MapColonies/ts-server-boilerplate#476 (MAPCO-11622), raster-export umbrella TODOs (
helm-charts-new→charts/raster-export/values.yaml,exporter-overseerblock)Further information:
Default values
image.pullPolicyAlwaysIfNotPresentconfigManagement.offlineModefalsetruetelemetry.logger.opentelemetryOptions.enabledfalse(wasenv.openTelemetryOptions.enabled)truetelemetry.tracing.enabledfalse(wastracing.enabled)trueThese resolve the
# TODO: remove after set this as the default value within serviceoverrides onexporter-overseer.image.pullPolicyandexporter-overseer.configManagement.offlineModein the raster-export umbrella.Server / telemetry split (mirrors ts-server-boilerplate#476)
env.port,env.targetPort,env.protocol,env.requestPayloadLimit,env.responseCompressionEnabledmove to aserverscope.env.logLevel,env.logPrettyPrintEnabled,env.openTelemetryOptionsand the top-leveltracingblock are replaced by atelemetryscope:logger.level,logger.prettyPrint,logger.opentelemetryOptions {enabled, url, resourceAttributes},tracing {enabled, url}.envunchanged:env.httpRetry,env.disableHttpClientLogs,env.shapefileReader.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.OTLP_LOGGER_ENDPOINT_URLand resource attributes asOTEL_RESOURCE_ATTRIBUTES(key=value,key=value), the names thecommonBoilerplateV3schema and the OpenTelemetry SDK read. The previousOPENTELEMETRY_LOGGING_URL/OPENTELEMETRY_RESOURCE_ATTRIBUTESkeys were not consumed.config/custom-environment-variables.jsonmapstelemetry.logger.opentelemetryOptionsfrom the same names.OPENTELEMETRY_LOGGING_ENABLEDandTELEMETRY_TRACING_ENABLEDare always exported with their value; urls only when enabled.common.tracing.mergedandcommon.openTelemetryOptions.mergedhelpers removed;overseer.tracingUrl,overseer.opentelemetryLoggingUrlandoverseer.otelResourceAttributesadded.TELEMETRY_METRICS_BUCKETS(frommclabels.prometheus.buckets) is untouched; the chart has no separate metrics scope.Breaking for consumers: umbrella charts and site-values setting
env.port,env.targetPort,env.protocol,env.requestPayloadLimit,env.responseCompressionEnabled→server.*;env.logLevel→telemetry.logger.level;env.logPrettyPrintEnabled→telemetry.logger.prettyPrint;env.openTelemetryOptions.*→telemetry.logger.opentelemetryOptions.*;tracing.*→telemetry.tracing.*;global.tracing.url→global.telemetry.tracing.url;global.openTelemetryOptions.url→global.telemetry.logger.opentelemetryOptions.url. Known spots: raster-exportexporter-overseer.image.pullPolicyandexporter-overseer.configManagement.offlineModecan be dropped (now defaults); the commented# env: logLevel: infoin site-valuesraster/export/{dev,qa}.yamlwould becometelemetry.logger.levelif uncommented.Note:
helm lintwith bare chart defaults fails on master and on this branch alike, becausedeployment.yamlreadsstorage.fs.ingestionSourcePvc.enabledwhich only site-values provides (global.storage.fs.ingestionSourcePvc.enabled: false). Rendering with that value set lints clean. Not changed here.🤖 Generated with Claude Code