From a6af8cb6609a3ca76188db255c891f18ffe1e0cf Mon Sep 17 00:00:00 2001 From: Phillip Wittrock Date: Fri, 25 Aug 2017 15:48:28 -0700 Subject: [PATCH] Fix bugs with `apiserver-boot init glide` `--commit` flag --- cmd/apiserver-boot/boot/init_repo/glide.go | 2 +- cmd/apiserver-builder-release/main.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cmd/apiserver-boot/boot/init_repo/glide.go b/cmd/apiserver-boot/boot/init_repo/glide.go index 43340b1787..e408ca1b56 100644 --- a/cmd/apiserver-boot/boot/init_repo/glide.go +++ b/cmd/apiserver-boot/boot/init_repo/glide.go @@ -111,7 +111,7 @@ var glideTemplate = ` package: {{.Repo}} import: {{ if .BuilderCommit -}} -- name: github.com/kubernetes-incubator/apiserver-builder +- package: github.com/kubernetes-incubator/apiserver-builder version: {{ .BuilderCommit }} {{ end -}} - package: k8s.io/api diff --git a/cmd/apiserver-builder-release/main.go b/cmd/apiserver-builder-release/main.go index e0adf72b14..1eb3b69cf8 100644 --- a/cmd/apiserver-builder-release/main.go +++ b/cmd/apiserver-builder-release/main.go @@ -49,12 +49,12 @@ func main() { buildCmd.Flags().StringVar(&output, "output", "apiserver-builder", "value name of the tar file to build") buildCmd.Flags().StringVar(&version, "version", "", "version name") - buildCmd.Flags().StringVar(&commit, "commit", "", "apiserver-builder commit") buildCmd.Flags().BoolVar(&dovendor, "vendor", true, "if true, fetch packages to vendor") buildCmd.Flags().BoolVar(&test, "test", true, "if true, run tests") cmd.AddCommand(buildCmd) + vendorCmd.Flags().StringVar(&commit, "commit", "", "apiserver-builder commit") vendorCmd.Flags().StringVar(&version, "version", "", "version name") vendorCmd.Flags().StringVar(&cachevendordir, "vendordir", "", "if specified, use this directory for setting up vendor instead of creating a tmp directory.")