github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
pull/6/head
Kubernetes Submit Queue 2017-10-26 02:43:55 -07:00 committed by GitHub
parent 3f5f9c3df9 0b0300cfe6
commit 58fd063a6c
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
staging/src/k8s.io/code-generator/cmd/go-to-protobuf/main.go
View File

@ -19,15 +19,17 @@ limitations under the License.
package main package main
import ( import (
"k8s.io/code-generator/cmd/go-to-protobuf/protobuf" goflag "flag"
flag "github.com/spf13/pflag" flag "github.com/spf13/pflag"
"k8s.io/code-generator/cmd/go-to-protobuf/protobuf"
) )
var g = protobuf.New() var g = protobuf.New()
func init() { func init() {
g.BindFlags(flag.CommandLine) g.BindFlags(flag.CommandLine)
flag.CommandLine.AddGoFlagSet(goflag.CommandLine)
} }
func main() { func main() {