Merge pull request #54594 from tamalsaha/log-o

Automatic merge from submit-queue (batch tested with PRs 54081, 54271, 51783, 54600, 54594). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Add go flags to go-to-protobuf Reopened from code-generator repo. cc: @sttts

Merge pull request #54594 from tamalsaha/log-o
58fd063a · Kubernetes Submit Queue · GitHub · 3f5f9c3d · 0b0300cf · 58fd063a
Commit 58fd063a authored Oct 26, 2017 by Kubernetes Submit Queue Committed by GitHub Oct 26, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

main.go staging/src/k8s.io/code-generator/cmd/go-to-protobuf/main.go +3 -1

No files found.
--- a/staging/src/k8s.io/code-generator/cmd/go-to-protobuf/main.go
+++ b/staging/src/k8s.io/code-generator/cmd/go-to-protobuf/main.go
@@ -19,15 +19,17 @@ limitations under the License.
 package main

 import (
-	"k8s.io/code-generator/cmd/go-to-protobuf/protobuf"
+	goflag "flag"

 	flag "github.com/spf13/pflag"
+	"k8s.io/code-generator/cmd/go-to-protobuf/protobuf"
 )

 var g = protobuf.New()

 func init() {
 	g.BindFlags(flag.CommandLine)
+	flag.CommandLine.AddGoFlagSet(goflag.CommandLine)
 }

 func main() {