Skip to content

Commit a9138b6

Browse files
nicktrnnicktrn
committed
values tweaks
1 parent 017ba3a commit a9138b6

File tree

3 files changed

+221
-221
lines changed

3 files changed

+221
-221
lines changed

‎hosting/k8s/helm/templates/supervisor.yaml‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -141,67 +141,67 @@ spec:
141141
fieldPath: spec.nodeName
142142
# Kubernetes configuration
143143
- name: KUBERNETES_NAMESPACE
144-
value: {{ default .Release.Namespace .Values.supervisor.config.kubernetesNamespace | quote }}
144+
value: {{ default .Release.Namespace .Values.supervisor.config.kubernetes.namespace | quote }}
145145
- name: KUBERNETES_FORCE_ENABLED
146-
value: {{ .Values.supervisor.config.kubernetesForceEnabled | quote }}
146+
value: {{ .Values.supervisor.config.kubernetes.forceEnabled | quote }}
147147
- name: KUBERNETES_WORKER_NODETYPE_LABEL
148-
value: {{ .Values.supervisor.config.kubernetesWorkerNodetypeLabel | quote }}
148+
value: {{ .Values.supervisor.config.kubernetes.workerNodetypeLabel | quote }}
149149
{{- if or (and .Values.registry.enabled .Values.registry.auth.enabled) (and .Values.registry.external .Values.registry.externalConnection.auth.enabled) }}
150150
- name: KUBERNETES_IMAGE_PULL_SECRETS
151151
value: "{{ include "trigger-v4.fullname" . }}-registry-secret"
152152
{{- end }}
153153
- name: KUBERNETES_EPHEMERAL_STORAGE_SIZE_LIMIT
154-
value: {{ default "10Gi" .Values.supervisor.config.kubernetesEphemeralStorageSizeLimit | quote }}
154+
value: {{ default "10Gi" .Values.supervisor.config.kubernetes.ephemeralStorageSizeLimit | quote }}
155155
- name: KUBERNETES_EPHEMERAL_STORAGE_SIZE_REQUEST
156-
value: {{ default "2Gi" .Values.supervisor.config.kubernetesEphemeralStorageSizeRequest | quote }}
156+
value: {{ default "2Gi" .Values.supervisor.config.kubernetes.ephemeralStorageSizeRequest | quote }}
157157
# Pod cleaner configuration
158158
- name: POD_CLEANER_ENABLED
159-
value: {{ .Values.supervisor.config.podCleanerEnabled | quote }}
159+
value: {{ .Values.supervisor.config.podCleaner.enabled | quote }}
160160
- name: POD_CLEANER_BATCH_SIZE
161-
value: {{ .Values.supervisor.config.podCleanerBatchSize | quote }}
161+
value: {{ .Values.supervisor.config.podCleaner.batchSize | quote }}
162162
- name: POD_CLEANER_INTERVAL_MS
163-
value: {{ .Values.supervisor.config.podCleanerIntervalMs | quote }}
163+
value: {{ .Values.supervisor.config.podCleaner.intervalMs | quote }}
164164
# Failed pod handler
165165
- name: FAILED_POD_HANDLER_ENABLED
166-
value: {{ .Values.supervisor.config.failedPodHandlerEnabled | quote }}
166+
value: {{ .Values.supervisor.config.failedPodHandler.enabled | quote }}
167167
- name: FAILED_POD_HANDLER_RECONNECT_INTERVAL_MS
168-
value: {{ .Values.supervisor.config.failedPodHandlerReconnectIntervalMs | quote }}
168+
value: {{ .Values.supervisor.config.failedPodHandler.reconnectIntervalMs | quote }}
169169
# Workload API configuration
170170
- name: TRIGGER_WORKLOAD_API_PROTOCOL
171-
value: {{ .Values.supervisor.config.workloadApiProtocol | quote }}
171+
value: {{ .Values.supervisor.config.workloadApi.protocol | quote }}
172172
- name: TRIGGER_WORKLOAD_API_DOMAIN
173173
value: "{{ include "trigger-v4.fullname" . }}-supervisor.{{ .Release.Namespace }}.svc.cluster.local"
174174
- name: TRIGGER_WORKLOAD_API_PORT_EXTERNAL
175-
value: {{ .Values.supervisor.config.workloadApiPortExternal | quote }}
175+
value: {{ .Values.supervisor.config.workloadApi.portExternal | quote }}
176176
- name: TRIGGER_WORKLOAD_API_PORT_INTERNAL
177-
value: {{ .Values.supervisor.config.workloadApiPortInternal | quote }}
177+
value: {{ .Values.supervisor.config.workloadApi.portInternal | quote }}
178178
- name: TRIGGER_WORKLOAD_API_HOST_INTERNAL
179-
value: {{ .Values.supervisor.config.workloadApiHostInternal | quote }}
179+
value: {{ .Values.supervisor.config.workloadApi.hostInternal | quote }}
180180
- name: TRIGGER_WORKLOAD_API_ENABLED
181-
value: {{ .Values.supervisor.config.workloadApiEnabled | quote }}
181+
value: {{ .Values.supervisor.config.workloadApi.enabled | quote }}
182182
# Dequeue configuration
183183
- name: TRIGGER_DEQUEUE_ENABLED
184-
value: {{ .Values.supervisor.config.dequeueEnabled | quote }}
184+
value: {{ .Values.supervisor.config.dequeue.enabled | quote }}
185185
- name: TRIGGER_DEQUEUE_INTERVAL_MS
186-
value: {{ .Values.supervisor.config.dequeueIntervalMs | quote }}
186+
value: {{ .Values.supervisor.config.dequeue.intervalMs | quote }}
187187
- name: TRIGGER_DEQUEUE_MAX_RUN_COUNT
188-
value: {{ .Values.supervisor.config.dequeueMaxRunCount | quote }}
188+
value: {{ .Values.supervisor.config.dequeue.maxRunCount | quote }}
189189
- name: TRIGGER_DEQUEUE_IDLE_INTERVAL_MS
190-
value: {{ .Values.supervisor.config.dequeueIdleIntervalMs | quote }}
190+
value: {{ .Values.supervisor.config.dequeue.idleIntervalMs | quote }}
191191
# Heartbeat configuration
192192
- name: RUNNER_HEARTBEAT_INTERVAL_SECONDS
193-
value: {{ .Values.supervisor.config.runnerHeartbeatIntervalSeconds | quote }}
193+
value: {{ .Values.supervisor.config.runner.heartbeatIntervalSeconds | quote }}
194194
- name: RUNNER_SNAPSHOT_POLL_INTERVAL_SECONDS
195-
value: {{ .Values.supervisor.config.runnerSnapshotPollIntervalSeconds | quote }}
195+
value: {{ .Values.supervisor.config.runner.snapshotPollIntervalSeconds | quote }}
196196
# Metrics configuration
197197
- name: METRICS_ENABLED
198-
value: {{ .Values.supervisor.config.metricsEnabled | quote }}
198+
value: {{ .Values.supervisor.config.metrics.enabled | quote }}
199199
- name: METRICS_COLLECT_DEFAULTS
200-
value: {{ .Values.supervisor.config.metricsCollectDefaults | quote }}
200+
value: {{ .Values.supervisor.config.metrics.collectDefaults | quote }}
201201
- name: METRICS_HOST
202-
value: {{ .Values.supervisor.config.metricsHost | quote }}
202+
value: {{ .Values.supervisor.config.metrics.host | quote }}
203203
- name: METRICS_PORT
204-
value: {{ .Values.supervisor.config.metricsPort | quote }}
204+
value: {{ .Values.supervisor.config.metrics.port | quote }}
205205
# Debug
206206
- name: DEBUG
207207
value: {{ .Values.supervisor.config.debug | quote }}

‎hosting/k8s/helm/templates/webapp.yaml‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -161,39 +161,39 @@ spec:
161161
name: {{ include "trigger-v4.secretsName" . }}
162162
key: OBJECT_STORE_SECRET_ACCESS_KEY
163163
{{- end }}
164-
{{- if and .Values.webapp.internal .Values.webapp.internal.otel }}
165-
{{- if .Values.webapp.internal.otel.trace.exporterUrl }}
164+
{{- if .Values.webapp.observability }}
165+
{{- if .Values.webapp.observability.tracing.exporterUrl }}
166166
- name: INTERNAL_OTEL_TRACE_EXPORTER_URL
167-
value: {{ .Values.webapp.internal.otel.trace.exporterUrl | quote }}
167+
value: {{ .Values.webapp.observability.tracing.exporterUrl | quote }}
168168
{{- end }}
169-
{{- if .Values.webapp.internal.otel.trace.exporterAuthHeaders }}
169+
{{- if .Values.webapp.observability.tracing.exporterAuthHeaders }}
170170
- name: INTERNAL_OTEL_TRACE_EXPORTER_AUTH_HEADERS
171-
value: {{ .Values.webapp.internal.otel.trace.exporterAuthHeaders | quote }}
171+
value: {{ .Values.webapp.observability.tracing.exporterAuthHeaders | quote }}
172172
{{- end }}
173173
- name: INTERNAL_OTEL_TRACE_LOGGING_ENABLED
174-
value: {{ .Values.webapp.internal.otel.trace.loggingEnabled | quote }}
174+
value: {{ .Values.webapp.observability.tracing.loggingEnabled | quote }}
175175
- name: INTERNAL_OTEL_TRACE_SAMPLING_RATE
176-
value: {{ .Values.webapp.internal.otel.trace.samplingRate | quote }}
176+
value: {{ .Values.webapp.observability.tracing.samplingRate | quote }}
177177
- name: INTERNAL_OTEL_TRACE_INSTRUMENT_PRISMA_ENABLED
178-
value: {{ .Values.webapp.internal.otel.trace.instrumentPrismaEnabled | quote }}
178+
value: {{ .Values.webapp.observability.tracing.instrumentPrismaEnabled | quote }}
179179
- name: INTERNAL_OTEL_TRACE_DISABLED
180-
value: {{ .Values.webapp.internal.otel.trace.disabled | quote }}
181-
{{- if .Values.webapp.internal.otel.log.exporterUrl }}
180+
value: {{ .Values.webapp.observability.tracing.disabled | quote }}
181+
{{- if .Values.webapp.observability.logging.exporterUrl }}
182182
- name: INTERNAL_OTEL_LOG_EXPORTER_URL
183-
value: {{ .Values.webapp.internal.otel.log.exporterUrl | quote }}
183+
value: {{ .Values.webapp.observability.logging.exporterUrl | quote }}
184184
{{- end }}
185-
{{- if .Values.webapp.internal.otel.metric.exporterUrl }}
185+
{{- if .Values.webapp.observability.metrics.exporterUrl }}
186186
- name: INTERNAL_OTEL_METRIC_EXPORTER_URL
187-
value: {{ .Values.webapp.internal.otel.metric.exporterUrl | quote }}
187+
value: {{ .Values.webapp.observability.metrics.exporterUrl | quote }}
188188
{{- end }}
189-
{{- if .Values.webapp.internal.otel.metric.exporterAuthHeaders }}
189+
{{- if .Values.webapp.observability.metrics.exporterAuthHeaders }}
190190
- name: INTERNAL_OTEL_METRIC_EXPORTER_AUTH_HEADERS
191-
value: {{ .Values.webapp.internal.otel.metric.exporterAuthHeaders | quote }}
191+
value: {{ .Values.webapp.observability.metrics.exporterAuthHeaders | quote }}
192192
{{- end }}
193193
- name: INTERNAL_OTEL_METRIC_EXPORTER_ENABLED
194-
value: {{ .Values.webapp.internal.otel.metric.exporterEnabled | quote }}
194+
value: {{ .Values.webapp.observability.metrics.exporterEnabled | quote }}
195195
- name: INTERNAL_OTEL_METRIC_EXPORTER_INTERVAL_MS
196-
value: {{ .Values.webapp.internal.otel.metric.exporterIntervalMs | quote }}
196+
value: {{ .Values.webapp.observability.metrics.exporterIntervalMs | quote }}
197197
{{- end }}
198198
{{- if .Values.webapp.clickhouse.enabled }}
199199
- name: CLICKHOUSE_URL

0 commit comments

Comments
 (0)