Skip to content

Commit 084f48f

Browse files
committed
fix: Add IPv6 EKS subnets to to Skipper healthz routes
1 parent 7ec4c17 commit 084f48f

File tree

1 file changed

+16
-14
lines changed

1 file changed

+16
-14
lines changed

cluster/manifests/skipper/deployment.yaml

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -323,20 +323,22 @@ spec:
323323
- "-forwarded-headers=X-Forwarded-For,X-Forwarded-Proto=https,X-Forwarded-Port=443"
324324
- '-forwarded-headers-exclude-cidrs={{ .cluster_internal_cidrs | join "," }}'
325325
{{ end }}
326-
- "-inline-routes"
327-
- |
328-
kube__healthz_down: Path("/kube-system/healthz")
329-
&& Shutdown()
330-
&& SourceFromLast("10.0.0.0/8", "192.168.0.0/16", "172.16.0.0/12", "127.0.0.1/8", "fd00::/8", "::1/128")
331-
-> disableAccessLog()
332-
-> status(503)
333-
-> <shunt>;
334-
kube__healthz_up: Path("/kube-system/healthz")
335-
&& SourceFromLast("10.0.0.0/8", "192.168.0.0/16", "172.16.0.0/12", "127.0.0.1/8", "fd00::/8", "::1/128")
336-
-> disableAccessLog()
337-
-> status(200)
338-
-> <shunt>;
339-
{{ .Cluster.ConfigItems.skipper_ingress_inline_routes }};
326+
- >-
327+
-inline-routes=
328+
kube__healthz_down:
329+
Path("/kube-system/healthz") &&
330+
Shutdown() &&
331+
SourceFromLast("10.0.0.0/8", "192.168.0.0/16", "172.16.0.0/12", "127.0.0.1/8", "fd00::/8", "::1/128"{{- if and (eq .Cluster.Provider "zalando-eks") (eq .Cluster.ConfigItems.eks_ip_family "ipv6")}}{{ range $ip := split .Values.subnet_ipv6_cidrs "," }},"{{ $ip }}"{{ end }}{{- end }})
332+
-> disableAccessLog()
333+
-> status(503)
334+
-> <shunt>;
335+
kube__healthz_up:
336+
Path("/kube-system/healthz") &&
337+
SourceFromLast("10.0.0.0/8", "192.168.0.0/16", "172.16.0.0/12", "127.0.0.1/8", "fd00::/8", "::1/128"{{- if and (eq .Cluster.Provider "zalando-eks") (eq .Cluster.ConfigItems.eks_ip_family "ipv6")}}{{ range $ip := split .Values.subnet_ipv6_cidrs "," }},"{{ $ip }}"{{ end }}{{- end }})
338+
-> disableAccessLog()
339+
-> status(200)
340+
-> <shunt>;
341+
{{ .Cluster.ConfigItems.skipper_ingress_inline_routes }}
340342
341343
{{ if .Cluster.ConfigItems.skipper_ingress_health_check_options }}
342344
- "-passive-health-check={{ .Cluster.ConfigItems.skipper_ingress_health_check_options }}"

0 commit comments

Comments
 (0)