Skip to content

Commit 062ff1e

Browse files
committed
Merge branch 'dev' into eks
2 parents bceb426 + 9210388 commit 062ff1e

File tree

4 files changed

+10
-7
lines changed

4 files changed

+10
-7
lines changed

cluster/manifests/03-kube-aws-iam-controller/deployment.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ spec:
2727
hostNetwork: true
2828
containers:
2929
- name: kube-aws-iam-controller
30-
image: container-registry.zalando.net/teapot/kube-aws-iam-controller:v0.3.0-60-g29433b1
30+
image: container-registry.zalando.net/teapot/kube-aws-iam-controller:v0.3.0-62-gd73875f
3131
env:
3232
- name: AWS_DEFAULT_REGION
3333
value: "{{.Cluster.Region}}"

cluster/manifests/fabric-gateway/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/fabric-gateway:master-305" }}
1+
# {{ $image := "container-registry.zalando.net/gwproxy/fabric-gateway:master-306" }}
22
# {{ $version := index (split $image ":") 1 }}
33
apiVersion: apps/v1
44
kind: Deployment

cluster/manifests/fabric-gateway/fabricgateway_crd.yaml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
---
12
apiVersion: apiextensions.k8s.io/v1
23
kind: CustomResourceDefinition
34
metadata:
@@ -227,7 +228,8 @@ spec:
227228
description: |-
228229
User specific value to apply to the route. If the particular user makes more requests that
229230
value within the defined period, then this user will start getting HTTP 429 responses.
230-
minimum: 1
231+
Setting `rate` to 0 will cause all requests matching the rate limit configuration to be denied.
232+
minimum: 0
231233
type: integer
232234
required:
233235
- headers
@@ -381,7 +383,8 @@ spec:
381383
description: |-
382384
User specific value to apply to the route. If the particular user makes more requests that
383385
value within the defined period, then this user will start getting HTTP 429 responses.
384-
minimum: 1
386+
Setting `rate` to 0 will cause all requests matching the rate limit configuration to be denied.
387+
minimum: 0
385388
type: integer
386389
required:
387390
- headers
@@ -641,8 +644,8 @@ spec:
641644
- spec
642645
type: object
643646
x-kubernetes-validations:
644-
- message: metadata.name may not be longer than 63, see https://fabric.docs.zalando.net/fabric-gateway-troubleshooting/#gateway-troubleshooting
645-
rule: size(self.metadata.name) < 64
647+
- message: metadata.name may not be longer than 63, see https://fabric.docs.zalando.net/fabric-gateway-troubleshooting/#gateway-troubleshooting
648+
rule: size(self.metadata.name) < 64
646649
served: true
647650
storage: true
648651
subresources:

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ write_files:
221221
limits:
222222
memory: {{ .Values.InstanceInfo.MemoryFraction (parseInt64 .Cluster.ConfigItems.apiserver_memory_limit_percent)}}
223223
{{- end }}
224-
- image: 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/teapot/admission-controller:master-244
224+
- image: 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/teapot/admission-controller:master-245
225225
name: admission-controller
226226
lifecycle:
227227
preStop:

0 commit comments

Comments
 (0)