Skip to content

Commit e74c087

Browse files
authored
Merge pull request #9346 from zalando-incubator/dev-to-kube-1.32
dev to kube-1.32
2 parents 91fc88c + 9cf37a6 commit e74c087

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

cluster/cluster.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -614,7 +614,7 @@ Resources:
614614
Properties:
615615
AlpnPolicy:
616616
- {{ if eq .Cluster.ConfigItems.experimental_nlb_alpn_h2_enabled "true" }}HTTP2Preferred{{else}}None{{end}}
617-
SslPolicy: "ELBSecurityPolicy-TLS-1-2-2017-01"
617+
SslPolicy: "ELBSecurityPolicy-TLS13-1-2-2021-06"
618618
Certificates:
619619
- CertificateArn: "{{.Values.load_balancer_certificate}}"
620620
DefaultActions:
@@ -681,7 +681,7 @@ Resources:
681681
Properties:
682682
AlpnPolicy:
683683
- {{ if eq .Cluster.ConfigItems.experimental_nlb_alpn_h2_enabled "true" }}HTTP2Preferred{{else}}None{{end}}
684-
SslPolicy: "ELBSecurityPolicy-TLS-1-2-2017-01"
684+
SslPolicy: "ELBSecurityPolicy-TLS13-1-2-2021-06"
685685
Certificates:
686686
- CertificateArn: "{{.Values.load_balancer_certificate}}"
687687
DefaultActions:

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.4-16-g3acdacf
30+
image: container-registry.zalando.net/teapot/kube-metrics-adapter:v0.2.4-19-g30dcc24
3131
env:
3232
- name: AWS_REGION
3333
value: {{ .Cluster.Region }}

cluster/manifests/skipper/deployment.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{{/* image-updater-bot detects *image variables so use print to disable it for main image */}}
22

3-
{{ $main_image := print "container-registry.zalando.net/teapot/skipper-internal:" "v0.22.7-1117" }}
3+
{{ $main_image := print "container-registry.zalando.net/teapot/skipper-internal:" "v0.22.21-1130" }}
44
{{ $canary_image := "container-registry.zalando.net/teapot/skipper-internal:v0.22.21-1130" }}
55

66
{{/* Optional canary arguments separated by "[cf724afc]" to allow whitespaces, e.g. "-foo=has a whitespace[cf724afc]-baz=qux" */}}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,7 @@ write_files:
257257
name: admission-controller-kubeconfig
258258
readOnly: true
259259
- name: skipper-admission-webhook
260-
image: 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/teapot/skipper:v0.22.22
260+
image: 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/teapot/skipper:v0.22.24
261261
args:
262262
- webhook
263263
- --address=:9085
@@ -434,7 +434,7 @@ write_files:
434434
value: {{ .Cluster.ConfigItems.apiserver_business_partner_ids }}
435435
{{ end }}
436436
- name: skipper-proxy
437-
image: 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/teapot/skipper:v0.22.22
437+
image: 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/teapot/skipper:v0.22.24
438438
args:
439439
- skipper
440440
- -access-log-strip-query
@@ -485,7 +485,7 @@ write_files:
485485
name: ssl-certs-kubernetes
486486
readOnly: true
487487
- name: skipper-metrics
488-
image: 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/teapot/skipper:v0.22.22
488+
image: 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/teapot/skipper:v0.22.24
489489
args:
490490
- skipper
491491
- -access-log-strip-query

0 commit comments

Comments
 (0)