Skip to content

Commit 6badebf

Browse files
Merge dev to dev-to-kube-1.32
2 parents 953bdc2 + 6e651ed commit 6badebf

File tree

5 files changed

+5
-5
lines changed

5 files changed

+5
-5
lines changed

cluster/config-defaults.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ karpenter_in_transit_support_required: "false"
5252
karpenter_instance_family_t_enabled: "false"
5353

5454
# ALB config created by kube-aws-ingress-controller
55-
kube_aws_ingress_controller_ssl_policy: "ELBSecurityPolicy-TLS-1-2-2017-01"
55+
kube_aws_ingress_controller_ssl_policy: "ELBSecurityPolicy-TLS13-1-2-2021-06"
5656
kube_aws_ingress_controller_idle_timeout: "1m"
5757
kube_aws_ingress_controller_deregistration_delay_timeout: "10s"
5858
# allow using NLBs for ingress

cluster/manifests/flannel/daemonset.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ spec:
3939
memory: 50Mi
4040
containers:
4141
- name: delayed-install-cni
42-
image: container-registry.zalando.net/teapot/flannel-awaiter:master-16
42+
image: container-registry.zalando.net/teapot/flannel-awaiter:master-19
4343
env:
4444
- name: NODE_NAME
4545
valueFrom:

cluster/manifests/kube-node-ready-controller/daemonset.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ spec:
3939
dnsPolicy: Default
4040
containers:
4141
- name: controller
42-
image: container-registry.zalando.net/teapot/kube-node-ready-controller:master-31
42+
image: container-registry.zalando.net/teapot/kube-node-ready-controller:master-33
4343
resources:
4444
requests:
4545
cpu: {{.Cluster.ConfigItems.kube_node_ready_controller_cpu}}

cluster/manifests/kubelet-summary-metrics/deployment.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ spec:
2727
serviceAccountName: kubelet-summary-metrics
2828
containers:
2929
- name: proxy
30-
image: container-registry.zalando.net/teapot/kubelet-summary-metrics:main-12
30+
image: container-registry.zalando.net/teapot/kubelet-summary-metrics:main-14
3131
resources:
3232
limits:
3333
cpu: "{{.Cluster.ConfigItems.kubelet_summary_metrics_cpu}}"

cluster/manifests/kubernetes-lifecycle-metrics/deployment.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ spec:
3232
serviceAccountName: kubernetes-lifecycle-metrics
3333
containers:
3434
- name: kubernetes-lifecycle-metrics
35-
image: "container-registry.zalando.net/teapot/kubernetes-lifecycle-metrics:master-28"
35+
image: "container-registry.zalando.net/teapot/kubernetes-lifecycle-metrics:master-29"
3636
ports:
3737
- containerPort: 9090
3838
protocol: TCP

0 commit comments

Comments
 (0)