add loggingConfig struct to kubelet config

This commit is contained in:
amash
2020-06-16 15:17:14 +04:30
parent ba8189a4f2
commit ac8d2e8978
12 changed files with 102 additions and 14 deletions

View File

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