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

Set default log level to "info" for containerd

This commit is contained in:
Ciprian Hacman 2020-03-22 20:53:58 +02:00
parent 51e8563bd5
commit 5c8cc493af
6 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
k8s/crds/kops.k8s.io_clusters.yaml
View File

@ -378,7 +378,7 @@ spec:
type: string type: string
logLevel: logLevel:
description: Logging level [trace, debug, info, warn, error, fatal, description: Logging level [trace, debug, info, warn, error, fatal,
panic] (default "warn") panic] (default "info")
type: string type: string
root: root:
description: Directory for persistent data (default "/var/lib/containerd") description: Directory for persistent data (default "/var/lib/containerd")

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

@ -22,7 +22,7 @@ type ContainerdConfig struct {
Address *string `json:"address,omitempty" flag:"address"` Address *string `json:"address,omitempty" flag:"address"`
// Complete containerd config file provided by the user // Complete containerd config file provided by the user
ConfigOverride *string `json:"configOverride,omitempty"` ConfigOverride *string `json:"configOverride,omitempty"`
// Logging level [trace, debug, info, warn, error, fatal, panic] (default "warn") // Logging level [trace, debug, info, warn, error, fatal, panic] (default "info")
LogLevel *string `json:"logLevel,omitempty" flag:"log-level"` LogLevel *string `json:"logLevel,omitempty" flag:"log-level"`
// Directory for persistent data (default "/var/lib/containerd") // Directory for persistent data (default "/var/lib/containerd")
Root *string `json:"root,omitempty" flag:"root"` Root *string `json:"root,omitempty" flag:"root"`

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

@ -22,7 +22,7 @@ type ContainerdConfig struct {
Address *string `json:"address,omitempty" flag:"address"` Address *string `json:"address,omitempty" flag:"address"`
// Complete containerd config file provided by the user // Complete containerd config file provided by the user
ConfigOverride *string `json:"configOverride,omitempty"` ConfigOverride *string `json:"configOverride,omitempty"`
// Logging level [trace, debug, info, warn, error, fatal, panic] (default "warn") // Logging level [trace, debug, info, warn, error, fatal, panic] (default "info")
LogLevel *string `json:"logLevel,omitempty" flag:"log-level"` LogLevel *string `json:"logLevel,omitempty" flag:"log-level"`
// Directory for persistent data (default "/var/lib/containerd") // Directory for persistent data (default "/var/lib/containerd")
Root *string `json:"root,omitempty" flag:"root"` Root *string `json:"root,omitempty" flag:"root"`

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

@ -22,7 +22,7 @@ type ContainerdConfig struct {
Address *string `json:"address,omitempty" flag:"address"` Address *string `json:"address,omitempty" flag:"address"`
// Complete containerd config file provided by the user // Complete containerd config file provided by the user
ConfigOverride *string `json:"configOverride,omitempty"` ConfigOverride *string `json:"configOverride,omitempty"`
// Logging level [trace, debug, info, warn, error, fatal, panic] (default "warn") // Logging level [trace, debug, info, warn, error, fatal, panic] (default "info")
LogLevel *string `json:"logLevel,omitempty" flag:"log-level"` LogLevel *string `json:"logLevel,omitempty" flag:"log-level"`
// Directory for persistent data (default "/var/lib/containerd") // Directory for persistent data (default "/var/lib/containerd")
Root *string `json:"root,omitempty" flag:"root"` Root *string `json:"root,omitempty" flag:"root"`

4
pkg/model/components/containerd.go
View File

@ -61,7 +61,7 @@ func (b *ContainerdOptionsBuilder) BuildOptions(o interface{}) error {
} }
// Apply defaults for containerd running in container runtime mode // Apply defaults for containerd running in container runtime mode
containerd.LogLevel = fi.String("warn") containerd.LogLevel = fi.String("info")
containerd.ConfigOverride = fi.String("") containerd.ConfigOverride = fi.String("")
} else if clusterSpec.ContainerRuntime == "docker" { } else if clusterSpec.ContainerRuntime == "docker" {
@ -89,7 +89,7 @@ func (b *ContainerdOptionsBuilder) BuildOptions(o interface{}) error {
} }
// Apply defaults for containerd running in Docker mode // Apply defaults for containerd running in Docker mode
containerd.LogLevel = fi.String("warn") containerd.LogLevel = fi.String("info")
containerd.ConfigOverride = fi.String("disabled_plugins = [\"cri\"]\n") containerd.ConfigOverride = fi.String("disabled_plugins = [\"cri\"]\n")
} else { } else {

4
tests/integration/update_cluster/containerd-cloudformation/cloudformation.json.extracted.yaml
View File

@ -138,7 +138,7 @@ Resources.AWSAutoScalingLaunchConfigurationmasterustest1amasterscontainerdexampl
containerRuntime: containerd containerRuntime: containerd
containerd: containerd:
configOverride: "" configOverride: ""
logLevel: warn logLevel: info
version: 1.2.10 version: 1.2.10
docker: docker:
skipInstall: true skipInstall: true
@ -426,7 +426,7 @@ Resources.AWSAutoScalingLaunchConfigurationnodescontainerdexamplecom.Properties.
containerRuntime: containerd containerRuntime: containerd
containerd: containerd:
configOverride: "" configOverride: ""
logLevel: warn logLevel: info
version: 1.2.10 version: 1.2.10
docker: docker:
skipInstall: true skipInstall: true