Skip to content

Commit 64f9e7a

Browse files
committed
fix(chart): align cli param for telemetry-collection with GKE allowlist
The new command line parameter for the operator manager process --telemetry-collection-enabled=true/false does not match the current GKE Autopilot workload allowlist, hence we need to choose a parameter name that matches the currently published workload allowlist. The most sensible workaround for now is to prefix the new parameter with --operator-configuration-, even though the new paramater does not only influence the auto-created operator configuration resource. (The allowlist has a pattern matcher for ^--operator-configuration-.*=.*$)
1 parent a959e0a commit 64f9e7a

4 files changed

Lines changed: 6 additions & 6 deletions

File tree

helm-chart/dash0-operator/templates/operator/deployment-and-webhooks.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ spec:
162162
- --operator-configuration-auto-monitor-namespaces-enabled={{ .Values.operator.autoMonitorNamespaces.enabled }}
163163
- --operator-configuration-auto-monitor-namespaces-label-selector={{ .Values.operator.autoMonitorNamespaces.labelSelector }}
164164
{{- end }}{{/*closes "if .Values.operator.dash0Export.enabled" */}}
165-
- --telemetry-collection-enabled={{ .Values.operator.telemetryCollectionEnabled }}
165+
- --operator-configuration-telemetry-collection-enabled={{ .Values.operator.telemetryCollectionEnabled }}
166166
- --force-use-otel-collector-service-url={{ .Values.operator.collectors.forceUseServiceUrl }}
167167
- --gke-autopilot={{ .Values.operator.gke.autopilot.enabled }}
168168
- --disable-otel-collector-host-ports={{ .Values.operator.collectors.disableHostPorts }}

helm-chart/dash0-operator/tests/operator/__snapshot__/deployment-and-webhooks_test.yaml.snap

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ deployment should match snapshot (default values):
4848
- --health-probe-bind-address=:8081
4949
- --metrics-bind-address=127.0.0.1:8080
5050
- --leader-elect
51-
- --telemetry-collection-enabled=true
51+
- --operator-configuration-telemetry-collection-enabled=true
5252
- --force-use-otel-collector-service-url=false
5353
- --gke-autopilot=false
5454
- --disable-otel-collector-host-ports=false
@@ -209,7 +209,7 @@ deployment should match snapshot when using cert-manager:
209209
- --health-probe-bind-address=:8081
210210
- --metrics-bind-address=127.0.0.1:8080
211211
- --leader-elect
212-
- --telemetry-collection-enabled=true
212+
- --operator-configuration-telemetry-collection-enabled=true
213213
- --force-use-otel-collector-service-url=false
214214
- --gke-autopilot=false
215215
- --disable-otel-collector-host-ports=false

helm-chart/dash0-operator/tests/operator/deployment-and-webhooks_test.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -364,7 +364,7 @@ tests:
364364
value: --leader-elect
365365
- equal:
366366
path: spec.template.spec.containers[0].args[3]
367-
value: --telemetry-collection-enabled=true
367+
value: --operator-configuration-telemetry-collection-enabled=true
368368
- equal:
369369
path: spec.template.spec.containers[0].args[4]
370370
value: --force-use-otel-collector-service-url=true
@@ -972,7 +972,7 @@ tests:
972972
asserts:
973973
- equal:
974974
path: spec.template.spec.containers[0].args[3]
975-
value: --telemetry-collection-enabled=false
975+
value: --operator-configuration-telemetry-collection-enabled=false
976976

977977
- it: should render the "dash0.com/cert-digest" label
978978
documentSelector:

internal/startup/operator_manager_startup.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -495,7 +495,7 @@ func defineCommandLineArguments() *commandLineArguments {
495495
)
496496
flag.BoolVar(
497497
&cliArgs.telemetryCollectionEnabled,
498-
"telemetry-collection-enabled",
498+
"operator-configuration-telemetry-collection-enabled",
499499
true,
500500
"The value for telemetryCollection.enabled on the operator configuration resource.",
501501
)

0 commit comments

Comments
 (0)