clientset_generated/clientset -> clientset

kubernetes-sigs · Mar 16, 2018 · ca3aac7 · ca3aac7
1 parent fd2f696
commit ca3aac7
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 13 deletions.
diff --git a/cmd/kubebuilder-gen/internal/controllergen/inject.go b/cmd/kubebuilder-gen/internal/controllergen/inject.go
@@ -47,11 +47,11 @@ func (d *injectGenerator) Imports(c *generator.Context) []string {
 		"github.com/kubernetes-sigs/kubebuilder/pkg/controller",
 		"k8s.io/client-go/rest",
 		repo + "/pkg/controller/sharedinformers",
-		repo + "/pkg/client/informers_generated/externalversions",
+		repo + "/pkg/client/informers/externalversions",
 		repo + "/pkg/inject/args",
 		"rbacv1 \"k8s.io/api/rbac/v1\"",
 		"k8s.io/client-go/kubernetes/scheme",
-		"rscheme " + "\"" + repo + "/pkg/client/clientset_generated/clientset/scheme\"",
+		"rscheme " + "\"" + repo + "/pkg/client/clientset/scheme\"",
 	}
 
 	// Import package for each controller

diff --git a/cmd/kubebuilder/build/generate.go b/cmd/kubebuilder/build/generate.go
@@ -70,8 +70,8 @@ var generateCleanCmd = &cobra.Command{
 
 func RunCleanGenerate(cmd *cobra.Command, args []string) {
 	os.RemoveAll(filepath.Join("pkg", "client", "clientset_generated"))
-	os.RemoveAll(filepath.Join("pkg", "client", "informers_generated"))
-	os.RemoveAll(filepath.Join("pkg", "client", "listers_generated"))
+	os.RemoveAll(filepath.Join("pkg", "client", "informers"))
+	os.RemoveAll(filepath.Join("pkg", "client", "listers"))
 
 	filepath.Walk("pkg", func(path string, info os.FileInfo, err error) error {
 		if !info.IsDir() && strings.HasPrefix(info.Name(), "zz_generated.") {

diff --git a/cmd/kubebuilder/create/resource/controller.go b/cmd/kubebuilder/create/resource/controller.go
@@ -42,10 +42,10 @@ import (
     "github.com/kubernetes-sigs/kubebuilder/pkg/controller"
     "github.com/kubernetes-sigs/kubebuilder/pkg/controller/types"
 
-    {{.Group}}{{.Version}}client "{{.Repo}}/pkg/client/clientset_generated/clientset/typed/{{.Group}}/{{.Version}}"
-    {{.Group}}{{.Version}}lister "{{.Repo}}/pkg/client/listers_generated/{{.Group}}/{{.Version}}"
+    {{.Group}}{{.Version}}client "{{.Repo}}/pkg/client/clientset/typed/{{.Group}}/{{.Version}}"
+    {{.Group}}{{.Version}}lister "{{.Repo}}/pkg/client/listers/{{.Group}}/{{.Version}}"
     {{.Group}}{{.Version}} "{{.Repo}}/pkg/apis/{{.Group}}/{{.Version}}"
-    {{.Group}}{{.Version}}informer "{{.Repo}}/pkg/client/informers_generated/externalversions/{{.Group}}/{{.Version}}"
+    {{.Group}}{{.Version}}informer "{{.Repo}}/pkg/client/informers/externalversions/{{.Group}}/{{.Version}}"
     "{{.Repo}}/pkg/inject/args"
 )
 

diff --git a/cmd/kubebuilder/create/resource/controllertest.go b/cmd/kubebuilder/create/resource/controllertest.go
@@ -53,7 +53,7 @@ import (
     "k8s.io/client-go/kubernetes"
     "k8s.io/client-go/rest"
 
-    "{{ .Repo }}/pkg/client/clientset_generated/clientset"
+    "{{ .Repo }}/pkg/client/clientset"
     "{{ .Repo }}/pkg/inject"
     "{{ .Repo }}/pkg/inject/args"
 )
@@ -114,7 +114,7 @@ import (
     metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
     . "{{ .Repo }}/pkg/apis/{{ .Group }}/{{ .Version }}"
-    . "{{ .Repo }}/pkg/client/clientset_generated/clientset/typed/{{ .Group }}/{{ .Version }}"
+    . "{{ .Repo }}/pkg/client/clientset/typed/{{ .Group }}/{{ .Version }}"
 )
 
 // EDIT THIS FILE!

diff --git a/cmd/kubebuilder/create/resource/resourcetest.go b/cmd/kubebuilder/create/resource/resourcetest.go
@@ -52,7 +52,7 @@ import (
     "k8s.io/client-go/rest"
 
     "{{ .Repo }}/pkg/inject"
-    "{{ .Repo }}/pkg/client/clientset_generated/clientset"
+    "{{ .Repo }}/pkg/client/clientset"
 )
 
 var testenv *test.TestEnvironment
@@ -91,7 +91,7 @@ import (
     metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
     . "{{.Repo}}/pkg/apis/{{.Group}}/{{.Version}}"
-    . "{{.Repo}}/pkg/client/clientset_generated/clientset/typed/{{.Group}}/{{.Version}}"
+    . "{{.Repo}}/pkg/client/clientset/typed/{{.Group}}/{{.Version}}"
 )
 
 // EDIT THIS FILE!

diff --git a/cmd/kubebuilder/initproject/inject.go b/cmd/kubebuilder/initproject/inject.go
@@ -88,8 +88,8 @@ import (
 	"github.com/kubernetes-sigs/kubebuilder/pkg/inject/args"
     "k8s.io/client-go/rest"
 
-    "{{.Repo}}/pkg/client/clientset_generated/clientset"
-    "{{.Repo}}/pkg/client/informers_generated/externalversions"
+    "{{.Repo}}/pkg/client/clientset"
+    "{{.Repo}}/pkg/client/informers/externalversions"
 )
 
 // InjectArgs are the arguments need to initialize controllers