mirror of https://github.com/kubernetes/kops.git
Revert "Migrade kube-proxy manifest to use go-runner for logging"
This reverts commit b0e585c751
.
This commit is contained in:
parent
67be37e4cb
commit
3442f95d59
|
@ -210,21 +210,13 @@ func (b *KubeProxyBuilder) buildPod() (*v1.Pod, error) {
|
||||||
addHostPathMapping(pod, container, "logfile", "/var/log/kube-proxy.log").ReadOnly = false
|
addHostPathMapping(pod, container, "logfile", "/var/log/kube-proxy.log").ReadOnly = false
|
||||||
// We use lighter containers that don't include shells
|
// We use lighter containers that don't include shells
|
||||||
// But they have richer logging support via klog
|
// But they have richer logging support via klog
|
||||||
if b.IsKubernetesGTE("1.23") {
|
container.Command = []string{"/usr/local/bin/kube-proxy"}
|
||||||
container.Command = []string{"/go-runner"}
|
container.Args = append(
|
||||||
container.Args = []string{
|
sortedStrings(flags),
|
||||||
"--log-file=/var/log/kube-proxy.log",
|
"--logtostderr=false", //https://github.com/kubernetes/klog/issues/60
|
||||||
"/usr/local/bin/kube-proxy",
|
"--alsologtostderr",
|
||||||
}
|
"--log-file=/var/log/kube-proxy.log")
|
||||||
container.Args = append(container.Args, sortedStrings(flags)...)
|
|
||||||
} else {
|
|
||||||
container.Command = []string{"/usr/local/bin/kube-proxy"}
|
|
||||||
container.Args = append(
|
|
||||||
sortedStrings(flags),
|
|
||||||
"--logtostderr=false", //https://github.com/kubernetes/klog/issues/60
|
|
||||||
"--alsologtostderr",
|
|
||||||
"--log-file=/var/log/kube-proxy.log")
|
|
||||||
}
|
|
||||||
{
|
{
|
||||||
addHostPathMapping(pod, container, "kubeconfig", "/var/lib/kube-proxy/kubeconfig")
|
addHostPathMapping(pod, container, "kubeconfig", "/var/lib/kube-proxy/kubeconfig")
|
||||||
// @note: mapping the host modules directory to fix the missing ipvs kernel module
|
// @note: mapping the host modules directory to fix the missing ipvs kernel module
|
||||||
|
|
|
@ -11,8 +11,6 @@ contents: |
|
||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
- args:
|
- args:
|
||||||
- --log-file=/var/log/kube-proxy.log
|
|
||||||
- /usr/local/bin/kube-proxy
|
|
||||||
- --cluster-cidr=100.96.0.0/11
|
- --cluster-cidr=100.96.0.0/11
|
||||||
- --conntrack-max-per-core=131072
|
- --conntrack-max-per-core=131072
|
||||||
- --hostname-override=@aws
|
- --hostname-override=@aws
|
||||||
|
@ -20,8 +18,11 @@ contents: |
|
||||||
- --master=https://127.0.0.1
|
- --master=https://127.0.0.1
|
||||||
- --oom-score-adj=-998
|
- --oom-score-adj=-998
|
||||||
- --v=2
|
- --v=2
|
||||||
|
- --logtostderr=false
|
||||||
|
- --alsologtostderr
|
||||||
|
- --log-file=/var/log/kube-proxy.log
|
||||||
command:
|
command:
|
||||||
- /go-runner
|
- /usr/local/bin/kube-proxy
|
||||||
image: k8s.gcr.io/kube-proxy:v1.23.0
|
image: k8s.gcr.io/kube-proxy:v1.23.0
|
||||||
name: kube-proxy
|
name: kube-proxy
|
||||||
resources:
|
resources:
|
||||||
|
|
Loading…
Reference in New Issue