From cd0057550199d8ff9f6bd5469d2bb097575ce9a9 Mon Sep 17 00:00:00 2001 From: Jeroen Schepens Date: Fri, 6 Apr 2018 00:05:50 +0200 Subject: [PATCH] Add LogSeverityScreen property to Calico spec. --- pkg/apis/kops/networking.go | 2 ++ pkg/apis/kops/v1alpha1/networking.go | 2 ++ pkg/apis/kops/v1alpha1/zz_generated.conversion.go | 2 ++ pkg/apis/kops/v1alpha2/networking.go | 2 ++ pkg/apis/kops/v1alpha2/zz_generated.conversion.go | 2 ++ .../addons/networking.projectcalico.org/k8s-1.6.yaml.template | 4 ++-- .../addons/networking.projectcalico.org/k8s-1.7.yaml.template | 4 ++-- 7 files changed, 14 insertions(+), 4 deletions(-) diff --git a/pkg/apis/kops/networking.go b/pkg/apis/kops/networking.go index 6982caff89..90bab2f016 100644 --- a/pkg/apis/kops/networking.go +++ b/pkg/apis/kops/networking.go @@ -71,6 +71,8 @@ type FlannelNetworkingSpec struct { // CalicoNetworkingSpec declares that we want Calico networking type CalicoNetworkingSpec struct { CrossSubnet bool `json:"crossSubnet,omitempty"` // Enables Calico's cross-subnet mode when set to true + // LogSeverityScreen lets us set the desired log level. (Default: info) + LogSeverityScreen string `json:"logSeverityScreen,omitempty"` // PrometheusMetricsEnabled can be set to enable the experimental Prometheus // metrics server (default: false) PrometheusMetricsEnabled bool `json:"prometheusMetricsEnabled,omitempty"` diff --git a/pkg/apis/kops/v1alpha1/networking.go b/pkg/apis/kops/v1alpha1/networking.go index e11fb10130..af46d01391 100644 --- a/pkg/apis/kops/v1alpha1/networking.go +++ b/pkg/apis/kops/v1alpha1/networking.go @@ -71,6 +71,8 @@ type FlannelNetworkingSpec struct { // CalicoNetworkingSpec declares that we want Calico networking type CalicoNetworkingSpec struct { CrossSubnet bool `json:"crossSubnet,omitempty"` // Enables Calico's cross-subnet mode when set to true + // LogSeverityScreen lets us set the desired log level. (Default: info) + LogSeverityScreen string `json:"logSeverityScreen,omitempty"` // PrometheusMetricsEnabled can be set to enable the experimental Prometheus // metrics server (default: false) PrometheusMetricsEnabled bool `json:"prometheusMetricsEnabled,omitempty"` diff --git a/pkg/apis/kops/v1alpha1/zz_generated.conversion.go b/pkg/apis/kops/v1alpha1/zz_generated.conversion.go index ad5f2894a4..3b376355e7 100644 --- a/pkg/apis/kops/v1alpha1/zz_generated.conversion.go +++ b/pkg/apis/kops/v1alpha1/zz_generated.conversion.go @@ -394,6 +394,7 @@ func Convert_kops_CNINetworkingSpec_To_v1alpha1_CNINetworkingSpec(in *kops.CNINe func autoConvert_v1alpha1_CalicoNetworkingSpec_To_kops_CalicoNetworkingSpec(in *CalicoNetworkingSpec, out *kops.CalicoNetworkingSpec, s conversion.Scope) error { out.CrossSubnet = in.CrossSubnet + out.LogSeverityScreen = in.LogSeverityScreen out.PrometheusMetricsEnabled = in.PrometheusMetricsEnabled out.PrometheusMetricsPort = in.PrometheusMetricsPort out.PrometheusGoMetricsEnabled = in.PrometheusGoMetricsEnabled @@ -408,6 +409,7 @@ func Convert_v1alpha1_CalicoNetworkingSpec_To_kops_CalicoNetworkingSpec(in *Cali func autoConvert_kops_CalicoNetworkingSpec_To_v1alpha1_CalicoNetworkingSpec(in *kops.CalicoNetworkingSpec, out *CalicoNetworkingSpec, s conversion.Scope) error { out.CrossSubnet = in.CrossSubnet + out.LogSeverityScreen = in.LogSeverityScreen out.PrometheusMetricsEnabled = in.PrometheusMetricsEnabled out.PrometheusMetricsPort = in.PrometheusMetricsPort out.PrometheusGoMetricsEnabled = in.PrometheusGoMetricsEnabled diff --git a/pkg/apis/kops/v1alpha2/networking.go b/pkg/apis/kops/v1alpha2/networking.go index 84a2c4b8be..a08eadffbd 100644 --- a/pkg/apis/kops/v1alpha2/networking.go +++ b/pkg/apis/kops/v1alpha2/networking.go @@ -71,6 +71,8 @@ type FlannelNetworkingSpec struct { // CalicoNetworkingSpec declares that we want Calico networking type CalicoNetworkingSpec struct { CrossSubnet bool `json:"crossSubnet,omitempty"` // Enables Calico's cross-subnet mode when set to true + // LogSeverityScreen lets us set the desired log level. (Default: info) + LogSeverityScreen string `json:"logSeverityScreen,omitempty"` // PrometheusMetricsEnabled can be set to enable the experimental Prometheus // metrics server (default: false) PrometheusMetricsEnabled bool `json:"prometheusMetricsEnabled,omitempty"` diff --git a/pkg/apis/kops/v1alpha2/zz_generated.conversion.go b/pkg/apis/kops/v1alpha2/zz_generated.conversion.go index 0bee099397..0442fca982 100644 --- a/pkg/apis/kops/v1alpha2/zz_generated.conversion.go +++ b/pkg/apis/kops/v1alpha2/zz_generated.conversion.go @@ -430,6 +430,7 @@ func Convert_kops_CNINetworkingSpec_To_v1alpha2_CNINetworkingSpec(in *kops.CNINe func autoConvert_v1alpha2_CalicoNetworkingSpec_To_kops_CalicoNetworkingSpec(in *CalicoNetworkingSpec, out *kops.CalicoNetworkingSpec, s conversion.Scope) error { out.CrossSubnet = in.CrossSubnet + out.LogSeverityScreen = in.LogSeverityScreen out.PrometheusMetricsEnabled = in.PrometheusMetricsEnabled out.PrometheusMetricsPort = in.PrometheusMetricsPort out.PrometheusGoMetricsEnabled = in.PrometheusGoMetricsEnabled @@ -444,6 +445,7 @@ func Convert_v1alpha2_CalicoNetworkingSpec_To_kops_CalicoNetworkingSpec(in *Cali func autoConvert_kops_CalicoNetworkingSpec_To_v1alpha2_CalicoNetworkingSpec(in *kops.CalicoNetworkingSpec, out *CalicoNetworkingSpec, s conversion.Scope) error { out.CrossSubnet = in.CrossSubnet + out.LogSeverityScreen = in.LogSeverityScreen out.PrometheusMetricsEnabled = in.PrometheusMetricsEnabled out.PrometheusMetricsPort = in.PrometheusMetricsPort out.PrometheusGoMetricsEnabled = in.PrometheusGoMetricsEnabled diff --git a/upup/models/cloudup/resources/addons/networking.projectcalico.org/k8s-1.6.yaml.template b/upup/models/cloudup/resources/addons/networking.projectcalico.org/k8s-1.6.yaml.template index 0a37da49bb..0a641b3af0 100644 --- a/upup/models/cloudup/resources/addons/networking.projectcalico.org/k8s-1.6.yaml.template +++ b/upup/models/cloudup/resources/addons/networking.projectcalico.org/k8s-1.6.yaml.template @@ -188,9 +188,9 @@ spec: # Disable IPv6 on Kubernetes. - name: FELIX_IPV6SUPPORT value: "false" - # Set Felix logging to "info" + # Set Felix logging to the desired level - name: FELIX_LOGSEVERITYSCREEN - value: "info" + value: "{{- or .Networking.Calico.LogSeverityScreen "info" }}" # Set to enable the experimental Prometheus metrics server - name: FELIX_PROMETHEUSMETRICSENABLED value: "{{- or .Networking.Calico.PrometheusMetricsEnabled "false" }}" diff --git a/upup/models/cloudup/resources/addons/networking.projectcalico.org/k8s-1.7.yaml.template b/upup/models/cloudup/resources/addons/networking.projectcalico.org/k8s-1.7.yaml.template index 559f6d6757..bb020370c3 100644 --- a/upup/models/cloudup/resources/addons/networking.projectcalico.org/k8s-1.7.yaml.template +++ b/upup/models/cloudup/resources/addons/networking.projectcalico.org/k8s-1.7.yaml.template @@ -199,9 +199,9 @@ spec: # Disable IPv6 on Kubernetes. - name: FELIX_IPV6SUPPORT value: "false" - # Set Felix logging to "info" + # Set Felix logging to the desired level - name: FELIX_LOGSEVERITYSCREEN - value: "info" + value: "{{- or .Networking.Calico.LogSeverityScreen "info" }}" # Set to enable the experimental Prometheus metrics server - name: FELIX_PROMETHEUSMETRICSENABLED value: "{{- or .Networking.Calico.PrometheusMetricsEnabled "false" }}"