Merge pull request #436 from mengqiy/cleanup

cleanup kubebulder-gen

Author: k8s-ci-robot

.travis.yml

@@ -22,7 +22,7 @@ install:
   -
 
 script:
-- TRACE=1 ./testv1.sh
+- TRACE=1 ./test.sh
 
 # TBD. Suppressing for now.
 notifications:

build/.goreleaser.yml

@@ -1,18 +1,9 @@
 # This is a GoReleaser configuration file for Kubebuilder release.
 # Make sure to check the documentation at http://goreleaser.com
 builds:
-- main: ./cmd/kubebuilder
+- main: ./cmd
   binary: kubebuilder
-  ldflags: -s -X sigs.k8s.io/kubebuilder/cmd/kubebuilder/version.kubeBuilderVersion={{.Version}} -X sigs.k8s.io/kubebuilder/cmd/kubebuilder/version.gitCommit={{.Commit}} -X sigs.k8s.io/kubebuilder/cmd/kubebuilder/version.buildDate={{.Date}} -X sigs.k8s.io/kubebuilder/cmd/kubebuilder/version.kubernetesVendorVersion={{.Env.KUBERNETES_VERSION}}
-  goos:
-   - darwin
-   - linux
-  goarch:
-   - amd64
-  env:
-   - CGO_ENABLED=0
-- main: ./cmd/kubebuilder-gen
-  binary: kubebuilder-gen
+  ldflags: -s -X sigs.k8s.io/kubebuilder/cmd/version.kubeBuilderVersion={{.Version}} -X sigs.k8s.io/kubebuilder/cmd/version.gitCommit={{.Commit}} -X sigs.k8s.io/kubebuilder/cmd/version.buildDate={{.Date}} -X sigs.k8s.io/kubebuilder/cmd/version.kubernetesVendorVersion={{.Env.KUBERNETES_VERSION}}
   goos:
    - darwin
    - linux

cmd/kubebuilder/alpha.go renamed to cmd/alpha.go

@@ -28,7 +28,7 @@ import (
 	"github.com/spf13/cobra"
 	flag "github.com/spf13/pflag"
 
-	"sigs.k8s.io/kubebuilder/cmd/kubebuilder/util"
+	"sigs.k8s.io/kubebuilder/cmd/util"
 	"sigs.k8s.io/kubebuilder/pkg/scaffold"
 	"sigs.k8s.io/kubebuilder/pkg/scaffold/controller"
 	"sigs.k8s.io/kubebuilder/pkg/scaffold/input"

cmd/kubebuilder/api.go renamed to cmd/api.go

@@ -29,7 +29,7 @@ import (
 	"github.com/spf13/cobra"
 	flag "github.com/spf13/pflag"
 
-	"sigs.k8s.io/kubebuilder/cmd/kubebuilder/util"
+	"sigs.k8s.io/kubebuilder/cmd/util"
 	"sigs.k8s.io/kubebuilder/pkg/scaffold"
 	"sigs.k8s.io/kubebuilder/pkg/scaffold/input"
 	"sigs.k8s.io/kubebuilder/pkg/scaffold/manager"