Skip to content

Commit 4a8165f

Browse files
committed
add toggle to drop lightstep envar injection in admission-controller
Signed-off-by: Noor Malik <noor.malik@zalando.de>
1 parent a363284 commit 4a8165f

2 files changed

Lines changed: 3 additions & 0 deletions

File tree

cluster/config-defaults.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -701,6 +701,7 @@ teapot_admission_controller_max_ephemeral_storage_request: "5Gi"
701701
teapot_admission_controller_application_min_creation_time: "2019-06-03T12:00:00Z"
702702
teapot_admission_controller_ndots: "2"
703703
teapot_admission_controller_inject_environment_variables: "true"
704+
teapot_admission_controller_inject_lightstep_variables: "true"
704705
{{ if eq .Cluster.Environment "test" }}
705706
teapot_admission_controller_inject_node_options_environment_variable: "true"
706707
{{ else }}

cluster/manifests/02-admission-control/config.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,11 @@ data:
3838
pod.env-inject.variable._PLATFORM_ACCOUNT: "{{ .Cluster.Alias }}"
3939
pod.env-inject.variable._PLATFORM_CLUSTER_ID: "{{ .Cluster.ID }}"
4040
pod.env-inject.variable._PLATFORM_OPENTRACING_TAG_ACCOUNT: "{{ .Cluster.Alias }}"
41+
{{- if eq .Cluster.ConfigItems.teapot_admission_controller_inject_lightstep_variables "true" }}
4142
pod.env-inject.variable._PLATFORM_OPENTRACING_LIGHTSTEP_COLLECTOR_PORT: "8443"
4243
pod.env-inject.variable._PLATFORM_OPENTRACING_LIGHTSTEP_COLLECTOR_HOST: "{{ .Cluster.ConfigItems.tracing_collector_host }}"
4344
pod.env-inject.variable._PLATFORM_OPENTRACING_LIGHTSTEP_ACCESS_TOKEN: "{{ .Cluster.ConfigItems.lightstep_token }}"
45+
{{- end }}
4446
pod.env-inject.variable._PLATFORM_OBSERVABILITY_COLLECTOR_ENDPOINT: "{{ .Cluster.ConfigItems.observability_collector_endpoint }}"
4547
pod.env-inject.variable._PLATFORM_OBSERVABILITY_COLLECTOR_PORT: "{{ .Cluster.ConfigItems.observability_collector_port }}"
4648
pod.env-inject.variable._PLATFORM_OBSERVABILITY_COLLECTOR_SCHEME: "{{ .Cluster.ConfigItems.observability_collector_scheme }}"

0 commit comments

Comments
 (0)