From 849361219cf2dd1595d8e60898524384d1a65c1d Mon Sep 17 00:00:00 2001 From: Solly Ross Date: Wed, 15 May 2019 16:39:53 -0700 Subject: [PATCH] Switch default project version to v2 This switches the default scaffolding to v2, since we want people to use this version. --- build/test.sh | 4 ++-- cmd/init_project.go | 2 +- test.sh | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build/test.sh b/build/test.sh index 0928b2a2363..5e2767d3fd7 100755 --- a/build/test.sh +++ b/build/test.sh @@ -29,7 +29,7 @@ export TEST_ASSET_KUBE_APISERVER=/tmp/kubebuilder/bin/kube-apiserver export TEST_ASSET_ETCD=/tmp/kubebuilder/bin/etcd # Run the commands -kubebuilder init repo --domain sample.kubernetes.io +kubebuilder init --project-version 1 repo --domain sample.kubernetes.io kubebuilder create resource --group insect --version v1beta1 --kind Bee kubebuilder create resource --group insect --version v1beta1 --kind Wasp kubebuilder create controller --group apps --version v1beta2 --kind Deployment --core-type @@ -40,4 +40,4 @@ go build ./pkg/... go test ./cmd/... go test ./pkg/... -fi \ No newline at end of file +fi diff --git a/cmd/init_project.go b/cmd/init_project.go index 7a687629a30..54b59c81b97 100644 --- a/cmd/init_project.go +++ b/cmd/init_project.go @@ -106,7 +106,7 @@ func (o *projectOptions) bindCmdlineFlags(cmd *cobra.Command) { cmd.Flags().StringVar(&o.project.Repo, "repo", util.Repo, "name of the github repo. "+ "defaults to the go package of the current working directory.") cmd.Flags().StringVar(&o.project.Domain, "domain", "k8s.io", "domain for groups") - cmd.Flags().StringVar(&o.project.Version, "project-version", project.Version1, "project version") + cmd.Flags().StringVar(&o.project.Version, "project-version", project.Version2, "project version") } func (o *projectOptions) initializeProject() { diff --git a/test.sh b/test.sh index d083d6e507d..ef0f630faef 100755 --- a/test.sh +++ b/test.sh @@ -21,7 +21,7 @@ source common.sh function test_init_project { header_text "performing init project" - kubebuilder init --domain example.com <<< "n" + kubebuilder init --project-version 1 --domain example.com <<< "n" } function test_make_project {