github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-03 17:30:00 +00:00
Code Issues Projects Releases Wiki Activity

Partial revert to fix local-up-cluster.sh

Browse Source
This commit is contained in:
Davanum Srinivas 2018-02-24 13:35:45 -05:00
parent 829ada8e30
commit fc4426f040
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cmd/kube-proxy/BUILD
View File

@ -22,6 +22,7 @@ go_library(
"//cmd/kube-proxy/app:go_default_library", "//cmd/kube-proxy/app:go_default_library",
"//pkg/client/metrics/prometheus:go_default_library", "//pkg/client/metrics/prometheus:go_default_library",
"//pkg/version/prometheus:go_default_library", "//pkg/version/prometheus:go_default_library",
"//vendor/github.com/spf13/pflag:go_default_library",
"//vendor/k8s.io/apiserver/pkg/util/flag:go_default_library", "//vendor/k8s.io/apiserver/pkg/util/flag:go_default_library",
"//vendor/k8s.io/apiserver/pkg/util/logs:go_default_library", "//vendor/k8s.io/apiserver/pkg/util/logs:go_default_library",
], ],

2
cmd/kube-proxy/app/server.go
View File

@ -354,7 +354,7 @@ with the apiserver API to configure the proxy.`,
glog.Fatalf("unable to create flag defaults: %v", err) glog.Fatalf("unable to create flag defaults: %v", err)
} }
opts.AddFlags(pflag.CommandLine) opts.AddFlags(cmd.Flags())
cmd.MarkFlagFilename("config", "yaml", "yml", "json") cmd.MarkFlagFilename("config", "yaml", "yml", "json")

10
cmd/kube-proxy/proxy.go
View File

@ -17,11 +17,14 @@ limitations under the License.
package main package main
import ( import (
goflag "flag"
"fmt" "fmt"
"math/rand" "math/rand"
"os" "os"
"time" "time"
"github.com/spf13/pflag"
utilflag "k8s.io/apiserver/pkg/util/flag" utilflag "k8s.io/apiserver/pkg/util/flag"
"k8s.io/apiserver/pkg/util/logs" "k8s.io/apiserver/pkg/util/logs"
"k8s.io/kubernetes/cmd/kube-proxy/app" "k8s.io/kubernetes/cmd/kube-proxy/app"
@ -34,7 +37,12 @@ func main() {
command := app.NewProxyCommand() command := app.NewProxyCommand()
utilflag.InitFlags() // TODO: once we switch everything over to Cobra commands, we can go back to calling
// utilflag.InitFlags() (by removing its pflag.Parse() call). For now, we have to set the
// normalize func and add the go flag set by hand.
pflag.CommandLine.SetNormalizeFunc(utilflag.WordSepNormalizeFunc)
pflag.CommandLine.AddGoFlagSet(goflag.CommandLine)
// utilflag.InitFlags()
logs.InitLogs() logs.InitLogs()
defer logs.FlushLogs() defer logs.FlushLogs()