Skip to content

Commit 04b6ba6

Browse files
mikkeloscarmikkeloscar
authored
Merge pull request #11963 from zalando-incubator/alpha-to-beta
alpha to beta
2 parents 908665a + 6b32460 commit 04b6ba6

8 files changed

Lines changed: 77 additions & 13 deletions

File tree

‎cluster/config-defaults.yaml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -410,7 +410,15 @@ skipper_ingress_lightstep_propagators: "lightstep"
410410
# set to "log-events" to enable
411411
skipper_ingress_lightstep_log_events: ""
412412
lightstep_token: ""
413+
# otel collector endpoint
413414
tracing_collector_host: "tracing.platform-infrastructure.zalan.do"
415+
tracing_collector_port: "8443"
416+
# OpenTelemetry
417+
skipper_ingress_open_telemetry_enabled: "true"
418+
skipper_ingress_open_telemetry_bsp_max_queue_size: 2048
419+
skipper_ingress_open_telemetry_bsp_max_export_batch_size: 512
420+
skipper_ingress_open_telemetry_bsp_schedule_delay: "5s"
421+
skipper_ingress_open_telemetry_bsp_export_timeout: "5s"
414422

415423
# skipper_serve_method_metric sets the flag -serve-method-metric. It
416424
# defines if the http method is included in the dimension

‎cluster/manifests/02-vertical-pod-autoscaler/admission-controller-deployment.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ spec:
2626
containers:
2727
- name: admission-controller
2828
{{if eq .Cluster.ConfigItems.vertical_pod_autoscaler_version "new"}}
29-
image: container-registry.zalando.net/teapot/vpa-admission-controller:v1.7.0-main-14-custom
29+
image: container-registry.zalando.net/teapot/vpa-admission-controller:v1.7.1-main-15-custom
3030
{{else if eq .Cluster.ConfigItems.vertical_pod_autoscaler_version "stable"}}
31-
image: container-registry.zalando.net/teapot/vpa-admission-controller:v1.6.0-main-13-custom
31+
image: container-registry.zalando.net/teapot/vpa-admission-controller:v1.7.0-main-14-custom
3232
{{end}}
3333
command:
3434
- /admission-controller

‎cluster/manifests/02-vertical-pod-autoscaler/recommender-deployment.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ spec:
2424
containers:
2525
- name: recommender
2626
{{if eq .Cluster.ConfigItems.vertical_pod_autoscaler_version "new"}}
27-
image: container-registry.zalando.net/teapot/vpa-recommender:v1.7.0-main-14-custom
27+
image: container-registry.zalando.net/teapot/vpa-recommender:v1.7.1-main-15-custom
2828
{{else if eq .Cluster.ConfigItems.vertical_pod_autoscaler_version "stable"}}
29-
image: container-registry.zalando.net/teapot/vpa-recommender:v1.6.0-main-13-custom
29+
image: container-registry.zalando.net/teapot/vpa-recommender:v1.7.0-main-14-custom
3030
{{end}}
3131
args:
3232
- --logtostderr

‎cluster/manifests/02-vertical-pod-autoscaler/updater-deployment.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ spec:
2828
containers:
2929
- name: updater
3030
{{if eq .Cluster.ConfigItems.vertical_pod_autoscaler_version "new"}}
31-
image: container-registry.zalando.net/teapot/vpa-updater:v1.7.0-main-14-custom
31+
image: container-registry.zalando.net/teapot/vpa-updater:v1.7.1-main-15-custom
3232
{{else if eq .Cluster.ConfigItems.vertical_pod_autoscaler_version "stable"}}
33-
image: container-registry.zalando.net/teapot/vpa-updater:v1.6.0-main-13-custom
33+
image: container-registry.zalando.net/teapot/vpa-updater:v1.7.0-main-14-custom
3434
{{end}}
3535
command:
3636
- ./updater

‎cluster/manifests/audittrail-adapter/daemonset.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ spec:
3434
hostNetwork: true
3535
containers:
3636
- name: audittrail-adapter
37-
image: container-registry.zalando.net/teapot/audittrail-adapter:master-125
37+
image: container-registry.zalando.net/teapot/audittrail-adapter:master-126
3838
env:
3939
- name: AWS_REGION
4040
value: "{{ .Cluster.Region }}"

‎cluster/manifests/kube-metrics-adapter/deployment.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ spec:
2727
serviceAccountName: custom-metrics-apiserver
2828
containers:
2929
- name: kube-metrics-adapter
30-
image: container-registry.zalando.net/teapot/kube-metrics-adapter:v0.2.9-29-g700c0d2
30+
image: container-registry.zalando.net/teapot/kube-metrics-adapter:v0.2.9-33-g628a413
3131
env:
3232
- name: AWS_REGION
3333
value: {{ .Cluster.Region }}

‎cluster/manifests/skipper/deployment.yaml‎

Lines changed: 59 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{{/* image-updater-bot detects *image variables so use name with suffix to disable it for the main image */}}
22

3-
{{ $main_image_updated_manually := "container-registry.zalando.net/teapot/skipper-internal:v0.27.39-1491" }}
3+
{{ $main_image_updated_manually := "container-registry.zalando.net/teapot/skipper-internal:v0.27.43-1495" }}
44
{{ $canary_image := "container-registry.zalando.net/teapot/skipper-internal:v0.27.50-1502" }}
55

66
{{/* Allow to override manually canary image by config item */}}
@@ -281,11 +281,38 @@ spec:
281281
{{if ne .Cluster.ConfigItems.skipper_ingress_request_size_buckets ""}}
282282
- "-request-size-buckets={{ .Cluster.ConfigItems.skipper_ingress_request_size_buckets }}"
283283
{{ end }}
284+
{{ if eq .Cluster.ConfigItems.skipper_ingress_open_telemetry_enabled "true" }}
285+
- -open-telemetry
286+
- |
287+
tracesExporter: otlp
288+
exporterOtlp:
289+
protocol: http/protobuf
290+
endpoint: "https://{{ .Cluster.ConfigItems.tracing_collector_host }}:{{ .Cluster.ConfigItems.tracing_collector_port }}"
291+
resourceAttributes:
292+
service.name: skipper-ingress
293+
application: skipper-ingress
294+
component: ingress
295+
account: {{ .Cluster.Alias }}
296+
cluster: {{ .Cluster.Alias }}
297+
k8s.cluster.name: {{ .Cluster.Alias }}
298+
artifact: {{ .image }}
299+
container.image.name: {{ index (split .image ":") 0 }}
300+
container.image.tags: {{ index (split .image ":") 1 }}
301+
k8s.pod.name: $(POD_NAME)
302+
cloud.availability_zone: $(KUBE_NODE_ZONE)
303+
otel-exporter: true
304+
propagators: [tracecontext, ottrace, b3multi, baggage]
305+
batchSpanProcessor:
306+
maxQueueSize: {{ .Cluster.ConfigItems.skipper_ingress_open_telemetry_bsp_max_queue_size }}
307+
maxExportBatchSize: {{ .Cluster.ConfigItems.skipper_ingress_open_telemetry_bsp_max_export_batch_size }}
308+
scheduleDelay: {{ .Cluster.ConfigItems.skipper_ingress_open_telemetry_bsp_schedule_delay }}
309+
exportTimeout: {{ .Cluster.ConfigItems.skipper_ingress_open_telemetry_bsp_export_timeout }}
310+
{{ else }}
284311
- >-
285312
-opentracing=lightstep
286313
component-name=skipper-ingress
287314
token=$(LIGHTSTEP_TOKEN)
288-
collector={{ .Cluster.ConfigItems.tracing_collector_host }}:8444
315+
collector={{ .Cluster.ConfigItems.tracing_collector_host }}:{{ .Cluster.ConfigItems.tracing_collector_port }}
289316
cmd-line=skipper-ingress
290317
tag=application=skipper-ingress
291318
tag=account={{ .Cluster.Alias }}
@@ -305,6 +332,7 @@ spec:
305332
max-logs-per-span={{ .Cluster.ConfigItems.skipper_ingress_lightstep_max_logs_per_span }}
306333
propagators={{ .Cluster.ConfigItems.skipper_ingress_lightstep_propagators }}
307334
{{ .Cluster.ConfigItems.skipper_ingress_lightstep_log_events }}
335+
{{ end }}
308336
- "-opentracing-excluded-proxy-tags={{ .Cluster.ConfigItems.skipper_ingress_opentracing_excluded_proxy_tags }}"
309337
{{ if eq .Cluster.ConfigItems.skipper_ingress_opentracing_client_trace_by_tag "true" }}
310338
- "-opentracing-client-trace-by-tag"
@@ -650,11 +678,38 @@ spec:
650678
- "-forwarded-headers=X-Forwarded-For,X-Forwarded-Proto=https,X-Forwarded-Port=443"
651679
- '-forwarded-headers-exclude-cidrs={{ .cluster_internal_cidrs | join "," }}'
652680
{{ end }}
681+
{{ if eq .Cluster.ConfigItems.skipper_ingress_open_telemetry_enabled "true" }}
682+
- -open-telemetry
683+
- |
684+
tracesExporter: otlp
685+
exporterOtlp:
686+
protocol: http/protobuf
687+
endpoint: "https://{{ .Cluster.ConfigItems.tracing_collector_host }}:{{ .Cluster.ConfigItems.tracing_collector_port }}"
688+
resourceAttributes:
689+
service.name: routesrv
690+
application: skipper-ingress
691+
component: routesrv
692+
account: {{ .Cluster.Alias }}
693+
cluster: {{ .Cluster.Alias }}
694+
k8s.cluster.name: {{ .Cluster.Alias }}
695+
artifact: {{ print .routesrv_image ":" .routesrv_version }}
696+
container.image.name: {{ .routesrv_image }}
697+
container.image.tags: {{ .routesrv_version }}
698+
k8s.pod.name: $(POD_NAME)
699+
cloud.availability_zone: $(KUBE_NODE_ZONE)
700+
otel-exporter: true
701+
propagators: [tracecontext, ottrace, b3multi, baggage]
702+
batchSpanProcessor:
703+
maxQueueSize: {{ .Cluster.ConfigItems.skipper_ingress_open_telemetry_bsp_max_queue_size }}
704+
maxExportBatchSize: {{ .Cluster.ConfigItems.skipper_ingress_open_telemetry_bsp_max_export_batch_size }}
705+
scheduleDelay: {{ .Cluster.ConfigItems.skipper_ingress_open_telemetry_bsp_schedule_delay }}
706+
exportTimeout: {{ .Cluster.ConfigItems.skipper_ingress_open_telemetry_bsp_export_timeout }}
707+
{{ else }}
653708
- >-
654709
-opentracing=lightstep
655710
component-name=routesrv
656711
token=$(LIGHTSTEP_TOKEN)
657-
collector={{ .Cluster.ConfigItems.tracing_collector_host }}:8444
712+
collector={{ .Cluster.ConfigItems.tracing_collector_host }}:{{ .Cluster.ConfigItems.tracing_collector_port }}
658713
cmd-line=routesrv
659714
tag=application=skipper-ingress
660715
tag=component=routesrv
@@ -675,6 +730,7 @@ spec:
675730
max-logs-per-span={{ .Cluster.ConfigItems.skipper_ingress_lightstep_max_logs_per_span }}
676731
propagators={{ .Cluster.ConfigItems.skipper_ingress_lightstep_propagators }}
677732
{{ .Cluster.ConfigItems.skipper_ingress_lightstep_log_events }}
733+
{{ end }}
678734
env:
679735
- name: KUBE_NODE_ZONE
680736
valueFrom:

‎cluster/node-pools/master-default/userdata.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -343,7 +343,7 @@ write_files:
343343
- mountPath: /etc/kubernetes/k8s-authnz-webhook-kubeconfig
344344
name: k8s-authnz-webhook-kubeconfig
345345
readOnly: true
346-
- image: 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/foundation/platform-iam-tokeninfo:master-213
346+
- image: 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/foundation/platform-iam-tokeninfo:master-215
347347
name: tokeninfo
348348
ports:
349349
- containerPort: 9021
@@ -374,7 +374,7 @@ write_files:
374374
value: {{ .Cluster.ConfigItems.apiserver_business_partner_ids }}
375375
{{ if ne .Cluster.Environment "production" }}
376376
- name: tokeninfo-sandbox
377-
image: 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/foundation/platform-iam-tokeninfo:master-213
377+
image: 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/foundation/platform-iam-tokeninfo:master-215
378378
ports:
379379
- containerPort: 9022
380380
lifecycle:

0 commit comments

Comments
 (0)