From 4b541e44dce67fd62c1b5106e29521de515988f2 Mon Sep 17 00:00:00 2001 From: Ole Markus With Date: Mon, 27 Dec 2021 14:59:06 +0100 Subject: [PATCH] Kube components log to stdout --- nodeup/pkg/model/kube_apiserver.go | 1 + nodeup/pkg/model/kube_controller_manager.go | 1 + nodeup/pkg/model/kube_proxy.go | 1 + nodeup/pkg/model/kube_scheduler.go | 1 + nodeup/pkg/model/tests/golden/minimal/tasks-kube-apiserver.yaml | 1 + .../tests/golden/minimal/tasks-kube-controller-manager.yaml | 1 + nodeup/pkg/model/tests/golden/minimal/tasks-kube-proxy.yaml | 1 + nodeup/pkg/model/tests/golden/minimal/tasks-kube-scheduler.yaml | 1 + 8 files changed, 8 insertions(+) diff --git a/nodeup/pkg/model/kube_apiserver.go b/nodeup/pkg/model/kube_apiserver.go index ebd6ae7b95..4a1b25406e 100644 --- a/nodeup/pkg/model/kube_apiserver.go +++ b/nodeup/pkg/model/kube_apiserver.go @@ -660,6 +660,7 @@ func (b *KubeAPIServerBuilder) buildPod(kubeAPIServer *kops.KubeAPIServerConfig) container.Command = []string{"/go-runner"} container.Args = []string{ "--log-file=/var/log/kube-apiserver.log", + "--also-stdout", "/usr/local/bin/kube-apiserver", } container.Args = append(container.Args, sortedStrings(flags)...) diff --git a/nodeup/pkg/model/kube_controller_manager.go b/nodeup/pkg/model/kube_controller_manager.go index b6fd7d56a7..99953ec09a 100644 --- a/nodeup/pkg/model/kube_controller_manager.go +++ b/nodeup/pkg/model/kube_controller_manager.go @@ -242,6 +242,7 @@ func (b *KubeControllerManagerBuilder) buildPod(kcm *kops.KubeControllerManagerC container.Command = []string{"/go-runner"} container.Args = []string{ "--log-file=/var/log/kube-controller-manager.log", + "--also-stdout", "/usr/local/bin/kube-controller-manager", } container.Args = append(container.Args, sortedStrings(flags)...) diff --git a/nodeup/pkg/model/kube_proxy.go b/nodeup/pkg/model/kube_proxy.go index 54a33d9a79..1e774ef23e 100644 --- a/nodeup/pkg/model/kube_proxy.go +++ b/nodeup/pkg/model/kube_proxy.go @@ -196,6 +196,7 @@ func (b *KubeProxyBuilder) buildPod() (*v1.Pod, error) { container.Command = []string{"/go-runner"} container.Args = []string{ "--log-file=/var/log/kube-proxy.log", + "--also-stdout", "/usr/local/bin/kube-proxy", } container.Args = append(container.Args, sortedStrings(flags)...) diff --git a/nodeup/pkg/model/kube_scheduler.go b/nodeup/pkg/model/kube_scheduler.go index f1d66d51f4..ea7f1ee9c9 100644 --- a/nodeup/pkg/model/kube_scheduler.go +++ b/nodeup/pkg/model/kube_scheduler.go @@ -256,6 +256,7 @@ func (b *KubeSchedulerBuilder) buildPod(kubeScheduler *kops.KubeSchedulerConfig) container.Command = []string{"/go-runner"} container.Args = []string{ "--log-file=/var/log/kube-scheduler.log", + "--also-stdout", "/usr/local/bin/kube-scheduler", } container.Args = append(container.Args, sortedStrings(flags)...) diff --git a/nodeup/pkg/model/tests/golden/minimal/tasks-kube-apiserver.yaml b/nodeup/pkg/model/tests/golden/minimal/tasks-kube-apiserver.yaml index f6a91e2b4f..408bd11308 100644 --- a/nodeup/pkg/model/tests/golden/minimal/tasks-kube-apiserver.yaml +++ b/nodeup/pkg/model/tests/golden/minimal/tasks-kube-apiserver.yaml @@ -15,6 +15,7 @@ contents: | containers: - args: - --log-file=/var/log/kube-apiserver.log + - --also-stdout - /usr/local/bin/kube-apiserver - --allow-privileged=true - --anonymous-auth=false diff --git a/nodeup/pkg/model/tests/golden/minimal/tasks-kube-controller-manager.yaml b/nodeup/pkg/model/tests/golden/minimal/tasks-kube-controller-manager.yaml index 2e80911796..013c404f72 100644 --- a/nodeup/pkg/model/tests/golden/minimal/tasks-kube-controller-manager.yaml +++ b/nodeup/pkg/model/tests/golden/minimal/tasks-kube-controller-manager.yaml @@ -11,6 +11,7 @@ contents: | containers: - args: - --log-file=/var/log/kube-controller-manager.log + - --also-stdout - /usr/local/bin/kube-controller-manager - --allocate-node-cidrs=true - --attach-detach-reconcile-sync-period=1m0s diff --git a/nodeup/pkg/model/tests/golden/minimal/tasks-kube-proxy.yaml b/nodeup/pkg/model/tests/golden/minimal/tasks-kube-proxy.yaml index 784eb6edd3..676822b3ad 100644 --- a/nodeup/pkg/model/tests/golden/minimal/tasks-kube-proxy.yaml +++ b/nodeup/pkg/model/tests/golden/minimal/tasks-kube-proxy.yaml @@ -12,6 +12,7 @@ contents: | containers: - args: - --log-file=/var/log/kube-proxy.log + - --also-stdout - /usr/local/bin/kube-proxy - --cluster-cidr=100.96.0.0/11 - --conntrack-max-per-core=131072 diff --git a/nodeup/pkg/model/tests/golden/minimal/tasks-kube-scheduler.yaml b/nodeup/pkg/model/tests/golden/minimal/tasks-kube-scheduler.yaml index 408b10bafb..98d5af204c 100644 --- a/nodeup/pkg/model/tests/golden/minimal/tasks-kube-scheduler.yaml +++ b/nodeup/pkg/model/tests/golden/minimal/tasks-kube-scheduler.yaml @@ -11,6 +11,7 @@ contents: | containers: - args: - --log-file=/var/log/kube-scheduler.log + - --also-stdout - /usr/local/bin/kube-scheduler - --authentication-kubeconfig=/var/lib/kube-scheduler/kubeconfig - --authorization-kubeconfig=/var/lib/kube-scheduler/kubeconfig