github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-25 20:29:56 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #22939 from resouer/util-sub-dir

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2016-03-23 03:34:33 -07:00
parent 2777cd7e75 f19d59cf35
commit 76369c42be
20 changed files with 42 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/kubemark/hollow-node.go
View File

@@ -32,7 +32,7 @@ import (
"k8s.io/kubernetes/pkg/kubelet/dockertools"
"k8s.io/kubernetes/pkg/kubemark"
proxyconfig "k8s.io/kubernetes/pkg/proxy/config"
"k8s.io/kubernetes/pkg/util"
"k8s.io/kubernetes/pkg/util/flag"
fakeiptables "k8s.io/kubernetes/pkg/util/iptables/testing"
"k8s.io/kubernetes/pkg/util/sets"
@@ -85,7 +85,7 @@ func main() {
config := HollowNodeConfig{}
config.addFlags(pflag.CommandLine)
util.InitFlags()
flag.InitFlags()
if !knownMorphs.Has(config.Morph) {
glog.Fatalf("Unknown morph: %v. Allowed values: %v", config.Morph, knownMorphs.List())