github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-05 15:37:24 +00:00
Code Issues Projects Releases Wiki Activity

add LoggingConfiguration struct to component-base/config

Browse Source
This commit is contained in:
amash
2020-06-26 01:03:27 +04:30
parent ac8d2e8978
commit 3ab25f1876
22 changed files with 102 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/kubelet/apis/config/validation/validation.go
View File

@@ -161,8 +161,8 @@ func ValidateKubeletConfiguration(kc *kubeletconfig.KubeletConfiguration) error
allErrors = append(allErrors, metrics.ValidateShowHiddenMetricsVersion(kc.ShowHiddenMetricsForVersion)...)
logOption := logs.NewOptions()
if kc.LoggingConfig.LoggingFormat != "" {
logOption.LogFormat = kc.LoggingConfig.LoggingFormat
if kc.Logging.Format != "" {
logOption.LogFormat = kc.Logging.Format
}
allErrors = append(allErrors, logOption.Validate()...)