Skip to content

Commit 006b873

Browse files
authored
Merge pull request #9691 from zalando-incubator/dev-to-alpha
dev to alpha
2 parents d29a06e + b1b8465 commit 006b873

File tree

5 files changed

+14
-3
lines changed

5 files changed

+14
-3
lines changed

cluster/config-defaults.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -377,6 +377,11 @@ skipper_open_policy_agent_data_preprocessing_optimization_enabled: "false"
377377
# Default timeout value in seconds for outgoing http calls from Open Policy Agent in a skipper filter
378378
skipper_open_policy_agent_styra_response_header_timeout: "2"
379379

380+
# Decision logging use event buffer type
381+
skipper_open_policy_agent_decision_logs_buffer_type_event_enable: "false"
382+
# Decision logging sets the maximum number of decision log events that can be buffered before being dropped
383+
skipper_open_policy_agent_decision_logs_buffer_type_event_limit: "1000"
384+
380385
#
381386
# FabricGateway controller config
382387
#

cluster/manifests/deployment-service/controller-statefulset.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ spec:
2929
terminationGracePeriodSeconds: 300
3030
containers:
3131
- name: "deployment-service-controller"
32-
image: "container-registry.zalando.net/teapot/deployment-controller:master-266"
32+
image: "container-registry.zalando.net/teapot/deployment-controller:master-268"
3333
args:
3434
- "--config-namespace=kube-system"
3535
- "--decrypt-kms-alias-arn=arn:aws:kms:{{ .Cluster.Region }}:{{ .Cluster.InfrastructureAccountID }}:alias/deployment-secret"

cluster/manifests/deployment-service/status-service-deployment.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# {{ $image := "container-registry.zalando.net/teapot/deployment-status-service:master-266" }}
1+
# {{ $image := "container-registry.zalando.net/teapot/deployment-status-service:master-268" }}
22
# {{ $version := index (split $image ":") 1 }}
33

44
apiVersion: apps/v1

cluster/manifests/sandbox-controller/30-deployment.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# {{ $image := "container-registry.zalando.net/gwproxy/sandbox-controller:main-13" }}
1+
# {{ $image := "container-registry.zalando.net/gwproxy/sandbox-controller:main-16" }}
22
# {{ $version := index (split $image ":") 1 }}
33

44
{{ if eq .Cluster.ConfigItems.sandbox_controller_enabled "true" }}

cluster/manifests/skipper/configmap-open-policy-agent.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,12 @@ data:
3131
session_name: open-policy-agent-instance
3232
name: styra-bundles
3333
url: "{{ .Cluster.ConfigItems.skipper_open_policy_agent_bundles_url }}"
34+
{{ if eq .Cluster.ConfigItems.skipper_open_policy_agent_decision_logs_buffer_type_event_enable "true" }}
35+
decision_logs:
36+
reporting:
37+
buffer_type: "event"
38+
buffer_size_limit_events: {{ .Cluster.ConfigItems.skipper_open_policy_agent_decision_logs_buffer_type_event_limit }}
39+
{{ end }}
3440
envoymetadata.json: |-
3541
{
3642
"filter_metadata": {

0 commit comments

Comments
 (0)