From e1f06dd40611d7d50eb8ee5630c65002ec7c71a7 Mon Sep 17 00:00:00 2001 From: Tom Stian Berget Date: Mon, 27 Jun 2022 20:00:59 +0200 Subject: [PATCH] Add support for the updated (startup|liveness|readiness)Probe.Port numbers in Cilium (#9031) --- .../network_plugin/cilium/templates/cilium/ds.yml.j2 | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/roles/network_plugin/cilium/templates/cilium/ds.yml.j2 b/roles/network_plugin/cilium/templates/cilium/ds.yml.j2 index 9930458f6..cd603ff5c 100644 --- a/roles/network_plugin/cilium/templates/cilium/ds.yml.j2 +++ b/roles/network_plugin/cilium/templates/cilium/ds.yml.j2 @@ -96,7 +96,11 @@ spec: httpGet: host: '127.0.0.1' path: /healthz +{% if cilium_version | regex_replace('v') is version('1.11.6', '>=') %} + port: 9879 +{% else %} port: 9876 +{% endif %} scheme: HTTP httpHeaders: - name: "brief" @@ -108,7 +112,11 @@ spec: httpGet: host: '127.0.0.1' path: /healthz +{% if cilium_version | regex_replace('v') is version('1.11.6', '>=') %} + port: 9879 +{% else %} port: 9876 +{% endif %} scheme: HTTP httpHeaders: - name: "brief" @@ -121,7 +129,11 @@ spec: httpGet: host: 127.0.0.1 path: /healthz +{% if cilium_version | regex_replace('v') is version('1.11.6', '>=') %} + port: 9879 +{% else %} port: 9876 +{% endif %} scheme: HTTP httpHeaders: - name: "brief"