kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add LogSeverityScreen property to Calico spec.

This commit is contained in:
Jeroen Schepens 2018-04-06 00:05:50 +02:00
parent f30a8dbcce
commit cd00575501
7 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/apis/kops/networking.go
View File

@ -71,6 +71,8 @@ type FlannelNetworkingSpec struct {
// CalicoNetworkingSpec declares that we want Calico networking // CalicoNetworkingSpec declares that we want Calico networking
type CalicoNetworkingSpec struct { type CalicoNetworkingSpec struct {
CrossSubnet bool `json:"crossSubnet,omitempty"` // Enables Calico's cross-subnet mode when set to true 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 // PrometheusMetricsEnabled can be set to enable the experimental Prometheus
// metrics server (default: false) // metrics server (default: false)
PrometheusMetricsEnabled bool `json:"prometheusMetricsEnabled,omitempty"` PrometheusMetricsEnabled bool `json:"prometheusMetricsEnabled,omitempty"`

2
pkg/apis/kops/v1alpha1/networking.go
View File

@ -71,6 +71,8 @@ type FlannelNetworkingSpec struct {
// CalicoNetworkingSpec declares that we want Calico networking // CalicoNetworkingSpec declares that we want Calico networking
type CalicoNetworkingSpec struct { type CalicoNetworkingSpec struct {
CrossSubnet bool `json:"crossSubnet,omitempty"` // Enables Calico's cross-subnet mode when set to true 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 // PrometheusMetricsEnabled can be set to enable the experimental Prometheus
// metrics server (default: false) // metrics server (default: false)
PrometheusMetricsEnabled bool `json:"prometheusMetricsEnabled,omitempty"` PrometheusMetricsEnabled bool `json:"prometheusMetricsEnabled,omitempty"`

2
pkg/apis/kops/v1alpha1/zz_generated.conversion.go
View File

@ -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 { func autoConvert_v1alpha1_CalicoNetworkingSpec_To_kops_CalicoNetworkingSpec(in *CalicoNetworkingSpec, out *kops.CalicoNetworkingSpec, s conversion.Scope) error {
out.CrossSubnet = in.CrossSubnet out.CrossSubnet = in.CrossSubnet
out.LogSeverityScreen = in.LogSeverityScreen
out.PrometheusMetricsEnabled = in.PrometheusMetricsEnabled out.PrometheusMetricsEnabled = in.PrometheusMetricsEnabled
out.PrometheusMetricsPort = in.PrometheusMetricsPort out.PrometheusMetricsPort = in.PrometheusMetricsPort
out.PrometheusGoMetricsEnabled = in.PrometheusGoMetricsEnabled 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 { func autoConvert_kops_CalicoNetworkingSpec_To_v1alpha1_CalicoNetworkingSpec(in *kops.CalicoNetworkingSpec, out *CalicoNetworkingSpec, s conversion.Scope) error {
out.CrossSubnet = in.CrossSubnet out.CrossSubnet = in.CrossSubnet
out.LogSeverityScreen = in.LogSeverityScreen
out.PrometheusMetricsEnabled = in.PrometheusMetricsEnabled out.PrometheusMetricsEnabled = in.PrometheusMetricsEnabled
out.PrometheusMetricsPort = in.PrometheusMetricsPort out.PrometheusMetricsPort = in.PrometheusMetricsPort
out.PrometheusGoMetricsEnabled = in.PrometheusGoMetricsEnabled out.PrometheusGoMetricsEnabled = in.PrometheusGoMetricsEnabled

2
pkg/apis/kops/v1alpha2/networking.go
View File

@ -71,6 +71,8 @@ type FlannelNetworkingSpec struct {
// CalicoNetworkingSpec declares that we want Calico networking // CalicoNetworkingSpec declares that we want Calico networking
type CalicoNetworkingSpec struct { type CalicoNetworkingSpec struct {
CrossSubnet bool `json:"crossSubnet,omitempty"` // Enables Calico's cross-subnet mode when set to true 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 // PrometheusMetricsEnabled can be set to enable the experimental Prometheus
// metrics server (default: false) // metrics server (default: false)
PrometheusMetricsEnabled bool `json:"prometheusMetricsEnabled,omitempty"` PrometheusMetricsEnabled bool `json:"prometheusMetricsEnabled,omitempty"`

2
pkg/apis/kops/v1alpha2/zz_generated.conversion.go
View File

@ -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 { func autoConvert_v1alpha2_CalicoNetworkingSpec_To_kops_CalicoNetworkingSpec(in *CalicoNetworkingSpec, out *kops.CalicoNetworkingSpec, s conversion.Scope) error {
out.CrossSubnet = in.CrossSubnet out.CrossSubnet = in.CrossSubnet
out.LogSeverityScreen = in.LogSeverityScreen
out.PrometheusMetricsEnabled = in.PrometheusMetricsEnabled out.PrometheusMetricsEnabled = in.PrometheusMetricsEnabled
out.PrometheusMetricsPort = in.PrometheusMetricsPort out.PrometheusMetricsPort = in.PrometheusMetricsPort
out.PrometheusGoMetricsEnabled = in.PrometheusGoMetricsEnabled 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 { func autoConvert_kops_CalicoNetworkingSpec_To_v1alpha2_CalicoNetworkingSpec(in *kops.CalicoNetworkingSpec, out *CalicoNetworkingSpec, s conversion.Scope) error {
out.CrossSubnet = in.CrossSubnet out.CrossSubnet = in.CrossSubnet
out.LogSeverityScreen = in.LogSeverityScreen
out.PrometheusMetricsEnabled = in.PrometheusMetricsEnabled out.PrometheusMetricsEnabled = in.PrometheusMetricsEnabled
out.PrometheusMetricsPort = in.PrometheusMetricsPort out.PrometheusMetricsPort = in.PrometheusMetricsPort
out.PrometheusGoMetricsEnabled = in.PrometheusGoMetricsEnabled out.PrometheusGoMetricsEnabled = in.PrometheusGoMetricsEnabled

4
upup/models/cloudup/resources/addons/networking.projectcalico.org/k8s-1.6.yaml.template
View File

@ -188,9 +188,9 @@ spec:
# Disable IPv6 on Kubernetes. # Disable IPv6 on Kubernetes.
- name: FELIX_IPV6SUPPORT - name: FELIX_IPV6SUPPORT
value: "false" value: "false"
# Set Felix logging to "info" # Set Felix logging to the desired level
- name: FELIX_LOGSEVERITYSCREEN - name: FELIX_LOGSEVERITYSCREEN
value: "info" value: "{{- or .Networking.Calico.LogSeverityScreen "info" }}"
# Set to enable the experimental Prometheus metrics server # Set to enable the experimental Prometheus metrics server
- name: FELIX_PROMETHEUSMETRICSENABLED - name: FELIX_PROMETHEUSMETRICSENABLED
value: "{{- or .Networking.Calico.PrometheusMetricsEnabled "false" }}" value: "{{- or .Networking.Calico.PrometheusMetricsEnabled "false" }}"

4
upup/models/cloudup/resources/addons/networking.projectcalico.org/k8s-1.7.yaml.template
View File

@ -199,9 +199,9 @@ spec:
# Disable IPv6 on Kubernetes. # Disable IPv6 on Kubernetes.
- name: FELIX_IPV6SUPPORT - name: FELIX_IPV6SUPPORT
value: "false" value: "false"
# Set Felix logging to "info" # Set Felix logging to the desired level
- name: FELIX_LOGSEVERITYSCREEN - name: FELIX_LOGSEVERITYSCREEN
value: "info" value: "{{- or .Networking.Calico.LogSeverityScreen "info" }}"
# Set to enable the experimental Prometheus metrics server # Set to enable the experimental Prometheus metrics server
- name: FELIX_PROMETHEUSMETRICSENABLED - name: FELIX_PROMETHEUSMETRICSENABLED
value: "{{- or .Networking.Calico.PrometheusMetricsEnabled "false" }}" value: "{{- or .Networking.Calico.PrometheusMetricsEnabled "false" }}"