diff --git a/nodeup/pkg/model/kube_controller_manager.go b/nodeup/pkg/model/kube_controller_manager.go index 693822c797..1f44fb2f72 100644 --- a/nodeup/pkg/model/kube_controller_manager.go +++ b/nodeup/pkg/model/kube_controller_manager.go @@ -252,11 +252,17 @@ func (b *KubeControllerManagerBuilder) buildPod(kcm *kops.KubeControllerManagerC container.Args = append(container.Args, sortedStrings(flags)...) } else { container.Command = []string{"/usr/local/bin/kube-controller-manager"} - container.Args = append( - sortedStrings(flags), - "--logtostderr=false", // https://github.com/kubernetes/klog/issues/60 - "--alsologtostderr", - "--log-file=/var/log/kube-controller-manager.log") + if kcm.LogFormat != "" && kcm.LogFormat != "text" { + // When logging-format is not text, some flags are not accepted. + // https://github.com/kubernetes/kops/issues/14100 + container.Args = sortedStrings(flags) + } else { + container.Args = append( + sortedStrings(flags), + "--logtostderr=false", // https://github.com/kubernetes/klog/issues/60 + "--alsologtostderr", + "--log-file=/var/log/kube-controller-manager.log") + } } for _, path := range b.SSLHostPaths() { name := strings.Replace(path, "/", "", -1) diff --git a/nodeup/pkg/model/kube_scheduler.go b/nodeup/pkg/model/kube_scheduler.go index a65697919f..3c509eb8da 100644 --- a/nodeup/pkg/model/kube_scheduler.go +++ b/nodeup/pkg/model/kube_scheduler.go @@ -264,11 +264,17 @@ func (b *KubeSchedulerBuilder) buildPod(kubeScheduler *kops.KubeSchedulerConfig) container.Args = append(container.Args, sortedStrings(flags)...) } else { container.Command = []string{"/usr/local/bin/kube-scheduler"} - container.Args = append( - sortedStrings(flags), - "--logtostderr=false", // https://github.com/kubernetes/klog/issues/60 - "--alsologtostderr", - "--log-file=/var/log/kube-scheduler.log") + if kubeScheduler.LogFormat != "" && kubeScheduler.LogFormat != "text" { + // When logging-format is not text, some flags are not accepted. + // https://github.com/kubernetes/kops/issues/14100 + container.Args = sortedStrings(flags) + } else { + container.Args = append( + sortedStrings(flags), + "--logtostderr=false", // https://github.com/kubernetes/klog/issues/60 + "--alsologtostderr", + "--log-file=/var/log/kube-scheduler.log") + } } if kubeScheduler.MaxPersistentVolumes != nil {