Skip to content

Commit 26a96cb

Browse files
authored
Merge pull request #9726 from zalando-incubator/dev-to-alpha
dev to alpha
2 parents 279a933 + dafe2dc commit 26a96cb

File tree

4 files changed

+17
-4
lines changed

4 files changed

+17
-4
lines changed

cluster/cluster.yaml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,19 @@ Resources:
143143
IpProtocol: tcp
144144
SourceSecurityGroupId: !Ref EKSWorkerSecurityGroup
145145
ToPort: 443
146+
EKSEFSSecurityGroupIngressFromEKSWorkerSecurityGroup:
147+
Properties:
148+
FromPort: 2049
149+
GroupId: !Ref EKSEFSWorkerSecurityGroup
150+
IpProtocol: tcp
151+
SourceSecurityGroupId: !Ref EKSWorkerSecurityGroup
152+
ToPort: 2049
153+
Type: 'AWS::EC2::SecurityGroupIngress'
154+
EKSEFSWorkerSecurityGroup:
155+
Properties:
156+
GroupDescription: EKS worker to EFS sg
157+
VpcId: "{{.Cluster.ConfigItems.vpc_id}}"
158+
Type: 'AWS::EC2::SecurityGroup'
146159
EKSCluster:
147160
Type: AWS::EKS::Cluster
148161
Properties:

cluster/config-defaults.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -380,7 +380,7 @@ skipper_open_policy_agent_styra_response_header_timeout: "2"
380380
# Decision logging use event buffer type
381381
skipper_open_policy_agent_decision_logs_buffer_type_event_enable: "false"
382382
# 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"
383+
skipper_open_policy_agent_decision_logs_buffer_type_event_limit: "10000"
384384

385385
#
386386
# FabricGateway controller config

cluster/manifests/prometheus/statefulset.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ spec:
5757
mountPath: /prometheus
5858
containers:
5959
- name: prometheus
60-
image: container-registry.zalando.net/teapot/prometheus:v3.4.1-master-64
60+
image: container-registry.zalando.net/teapot/prometheus:v3.4.1-master-67
6161
args:
6262
- "--config.file=/prometheus/prometheus.yaml"
6363
- "--storage.tsdb.path=/prometheus/"

cluster/manifests/skipper/hostname-credentials-controller.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# {{ if eq .Cluster.ConfigItems.skipper_oauth2_ui_login "true" }}
2-
# {{ $image := "container-registry.zalando.net/gwproxy/hostname-credentials-controller:main-27" }}
2+
# {{ $image := "container-registry.zalando.net/gwproxy/hostname-credentials-controller:main-28" }}
33
# {{ $version := index (split $image ":") 1 }}
44
apiVersion: v1
55
kind: ServiceAccount
@@ -109,7 +109,7 @@ spec:
109109
jobTemplate:
110110
spec:
111111
activeDeadlineSeconds: 30
112-
backoffLimit: 1
112+
backoffLimit: 0
113113
template:
114114
metadata:
115115
labels:

0 commit comments

Comments
 (0)