Merge pull request #436 from mengqiy/cleanup

cleanup kubebulder-gen
kubernetes-sigs · Oct 12, 2018 · d1fc6f7 · d1fc6f7
2 parents c1beac4 + c4a61e0
commit d1fc6f7
Show file tree

Hide file tree

Showing 38 changed files with 19 additions and 3,174 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -22,7 +22,7 @@ install:
   -
 
 script:
-- TRACE=1 ./testv1.sh
+- TRACE=1 ./test.sh
 
 # TBD. Suppressing for now.
 notifications:

diff --git a/build/.goreleaser.yml b/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

diff --git a/cmd/kubebuilder/alpha.go → cmd/alpha.go b/cmd/kubebuilder/alpha.go → cmd/alpha.go
diff --git a/cmd/kubebuilder/api.go → cmd/api.go b/cmd/kubebuilder/api.go → cmd/api.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"

diff --git a/cmd/kubebuilder/docs.go → cmd/docs.go b/cmd/kubebuilder/docs.go → cmd/docs.go
diff --git a/cmd/kubebuilder/init_project.go → cmd/init_project.go b/cmd/kubebuilder/init_project.go → cmd/init_project.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"

diff --git a/cmd/internal/codegen/parse/apis.go b/cmd/internal/codegen/parse/apis.go
diff --git a/cmd/internal/codegen/parse/context.go b/cmd/internal/codegen/parse/context.go