From 77772b64414d1924412b02a73bc5e975b03e176c Mon Sep 17 00:00:00 2001 From: Ciprian Hacman Date: Sun, 24 Oct 2021 08:40:14 +0300 Subject: [PATCH] Move FELIX_LOGSEVERITYSCREEN to custom section for Canal --- .../k8s-1.22.yaml.template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/upup/models/cloudup/resources/addons/networking.projectcalico.org.canal/k8s-1.22.yaml.template b/upup/models/cloudup/resources/addons/networking.projectcalico.org.canal/k8s-1.22.yaml.template index db757bfe7d..44fd9da36e 100644 --- a/upup/models/cloudup/resources/addons/networking.projectcalico.org.canal/k8s-1.22.yaml.template +++ b/upup/models/cloudup/resources/addons/networking.projectcalico.org.canal/k8s-1.22.yaml.template @@ -4017,9 +4017,6 @@ spec: # Disable IPv6 on Kubernetes. - name: FELIX_IPV6SUPPORT value: "false" - # Set Felix logging to "info" - - name: FELIX_LOGSEVERITYSCREEN - value: "{{- or .Networking.Canal.LogSeveritySys "info" }}" - name: FELIX_HEALTHENABLED value: "true" @@ -4030,6 +4027,9 @@ spec: # Set Felix iptables binary variant, Legacy or NFT - name: FELIX_IPTABLESBACKEND value: "{{- or .Networking.Canal.IptablesBackend "Auto" }}" + # Controls the log level + - name: FELIX_LOGSEVERITYSCREEN + value: "{{- or .Networking.Canal.LogSeveritySys "info" }}" # Set to enable the experimental Prometheus metrics server - name: FELIX_PROMETHEUSMETRICSENABLED value: "{{- or .Networking.Canal.PrometheusMetricsEnabled "false" }}"