Fix up logging flags for kubectl.

2015-01-14 14:54:39 -08:00
parent 7ee327146a
commit 1d0b6ee5f5
3 changed files with 16 additions and 2 deletions
--- a/pkg/util/pflag_import.go
+++ b/pkg/util/pflag_import.go
@@ -87,3 +87,12 @@ func AddAllFlagsToPFlagSet(fs *pflag.FlagSet) {
 func AddAllFlagsToPFlags() {
 	AddFlagSetToPFlagSet(flag.CommandLine, pflag.CommandLine)
 }
+
+// Merge all of the flags from fsFrom into fsTo.
+func AddPFlagSetToPFlagSet(fsFrom *pflag.FlagSet, fsTo *pflag.FlagSet) {
+	fsFrom.VisitAll(func(f *pflag.Flag) {
+		if fsTo.Lookup(f.Name) == nil {
+			fsTo.AddFlag(f)
+		}
+	})
+}