Skip to content

Commit b440d6d

Browse files
committed
Fix Helm values names
1 parent 819b5b0 commit b440d6d

File tree

2 files changed

+14
-21
lines changed

2 files changed

+14
-21
lines changed

charts/sourcegraph/templates/otel-collector/otel-agent.DaemonSet.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,13 +71,13 @@ spec:
7171
ports:
7272
- name: grpc-otlp
7373
containerPort: 4317
74-
hostPort: {{ toYaml .Values.openTelemetry.agent.hostPorts.grpc-otlp }}
74+
hostPort: {{ toYaml .Values.openTelemetry.agent.hostPorts.grpcOtlp }}
7575
- name: http-otlp
7676
containerPort: 4318
77-
hostPort: {{ toYaml .Values.openTelemetry.agent.hostPorts.http-otlp }}
77+
hostPort: {{ toYaml .Values.openTelemetry.agent.hostPorts.httpOtlp }}
7878
- name: http-zpages
7979
containerPort: 55679
80-
hostPort: {{ toYaml .Values.openTelemetry.agent.hostPorts.http-zpages }}
80+
hostPort: {{ toYaml .Values.openTelemetry.agent.hostPorts.httpZpages }}
8181
volumeMounts:
8282
- name: config
8383
mountPath: /etc/otel-agent

charts/sourcegraph/values.yaml

Lines changed: 11 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,8 @@ sourcegraph:
8585
# # Toggle deployment of applications on/off. Applies to databases and third-party applications
8686
# enabled: true
8787

88-
alpine: # Used in init containers
88+
alpine:
89+
# Used in init containers
8990
image:
9091
# -- Docker image tag for the `alpine` image
9192
defaultTag: 6.9.0@sha256:47ddeb68cfdb767949b4e7f6e2306fa20a1ee5a2619efbe56bf06cb5a62e7729
@@ -167,7 +168,7 @@ codeInsightsDB:
167168
# -- Sets codeinsights-db port
168169
port: "5432"
169170
# -- Sets codeinsights-db SSL mode
170-
sslmode: "disable" # set to "require" to enable SSL
171+
sslmode: "disable" # set to "require" to enable SSL
171172
# -- Environment variables for the `codeinsights-db` container
172173
env: {}
173174
# -- Name of existing ConfigMap for `codeinsights-db`. It must contain a `postgresql.conf` key.
@@ -242,7 +243,7 @@ codeIntelDB:
242243
# -- Sets codeintel-db port
243244
port: "5432"
244245
# -- Sets codeintel-db SSL mode
245-
sslmode: "disable" # set to "require" to enable SSL
246+
sslmode: "disable" # set to "require" to enable SSL
246247
# -- Name of existing ConfigMap for `codeintel-db`. It must contain a `postgresql.conf` key
247248
existingConfig: ""
248249
# -- Additional PostgreSQL configuration. This will override or extend our default configuration.
@@ -643,9 +644,9 @@ openTelemetry:
643644
# -- Resource requests & limits for the `otel-agent` container,
644645
# learn more from the [Kubernetes documentation](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/)
645646
hostPorts:
646-
grpc-otlp: 4317
647-
http-otlp: 4318
648-
http-zpages: 55679
647+
grpcOtlp: 4317
648+
httpOtlp: 4318
649+
httpZpages: 55679
649650
resources:
650651
limits:
651652
cpu: "500m"
@@ -730,9 +731,9 @@ pgsql:
730731
# -- Sets postgres port
731732
port: "5432"
732733
# -- Sets postgres SSL mode
733-
sslmode: "disable" # set to "require" to enable SSL
734+
sslmode: "disable" # set to "require" to enable SSL
734735
# -- Name of existing ConfigMap for `pgsql`. It must contain a `postgresql.conf` key
735-
existingConfig: "" # Name of an existing configmap
736+
existingConfig: "" # Name of an existing configmap
736737
# -- Additional PostgreSQL configuration. This will override or extend our default configuration.
737738
# Notes: This is expecting a multiline string.
738739
# Learn more from our [recommended PostgreSQL configuration](https://docs.sourcegraph.com/admin/config/postgres-conf) and [PostgreSQL documentation](https://www.postgresql.org/docs/12/config-setting.html)
@@ -1159,14 +1160,7 @@ jaeger:
11591160
# -- Name used by resources. Does not affect service names or PVCs.
11601161
name: "jaeger"
11611162
# -- Default args passed to the `jaeger` binary
1162-
args:
1163-
[
1164-
"--memory.max-traces=20000",
1165-
"--sampling.strategies-file=/etc/jaeger/sampling_strategies.json",
1166-
"--collector.otlp.enabled",
1167-
"--collector.otlp.grpc.host-port=:4320",
1168-
"--collector.otlp.http.host-port=:4321",
1169-
]
1163+
args: [ "--memory.max-traces=20000", "--sampling.strategies-file=/etc/jaeger/sampling_strategies.json", "--collector.otlp.enabled", "--collector.otlp.grpc.host-port=:4320", "--collector.otlp.http.host-port=:4321" ]
11701164
# -- Security context for the `jaeger` container,
11711165
# learn more from the [Kubernetes documentation](https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-container)
11721166
containerSecurityContext:
@@ -1233,8 +1227,7 @@ worker:
12331227
# -- Scale worker horizontally by configuring additional replicas dedicated to specific jobs.
12341228
# for each replica, configure the dedicated jobs to run on this replica.
12351229
# learn more from https://sourcegraph.com/docs/admin/workers#3-split-jobs-and-scale-independently
1236-
replicas:
1237-
[]
1230+
replicas: []
12381231
# - jobs: []
12391232
# resources:
12401233
# limits:

0 commit comments

Comments
 (0)