Merge pull request #121 from pwittrock/release

Fix bugs with `apiserver-boot init glide` `--commit` flag
kubernetes-sigs · Aug 25, 2017 · 36f0ca1 · 36f0ca1
2 parents 08ae522 + a6af8cb
commit 36f0ca1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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.")