Merge pull request #9814 from caesarxuchao/conversion-tool-v1

update the api conversion tool to default to v1
pull/6/head
Fabio Yeon 2015-06-15 21:02:49 -07:00
commit 96039d2f28
1 changed files with 2 additions and 2 deletions

View File

@ -28,7 +28,7 @@ import (
"runtime"
"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
_ "github.com/GoogleCloudPlatform/kubernetes/pkg/api/v1beta3"
"github.com/GoogleCloudPlatform/kubernetes/pkg/api/latest"
"github.com/GoogleCloudPlatform/kubernetes/pkg/util"
"github.com/ghodss/yaml"
@ -39,7 +39,7 @@ var (
inputSource = flag.StringP("input", "i", "-", "Input source; '-' means stdin")
outputDest = flag.StringP("output", "o", "-", "Output destination; '-' means stdout")
rewrite = flag.StringP("rewrite", "r", "", "If nonempty, use this as both input and output.")
outputVersion = flag.StringP("out-version", "v", "v1beta3", "Version to convert input to")
outputVersion = flag.StringP("out-version", "v", latest.Version, "Version to convert input to")
)
// isYAML determines whether data is JSON or YAML formatted by seeing