Merge pull request #97 from fanzhangio/refactor

Refactor pkg/generate
kubernetes-sigs · Dec 13, 2018 · 80e23c9 · 80e23c9
2 parents 106db12 + c530c3b
commit 80e23c9
Show file tree

Hide file tree

Showing 11 changed files with 3 additions and 21 deletions.
diff --git a/cmd/controller-gen/main.go b/cmd/controller-gen/main.go
@@ -23,8 +23,8 @@ import (
 
 	"github.com/spf13/cobra"
 	crdgenerator "sigs.k8s.io/controller-tools/pkg/crd/generator"
-	"sigs.k8s.io/controller-tools/pkg/generate/rbac"
-	"sigs.k8s.io/controller-tools/pkg/generate/webhook"
+	"sigs.k8s.io/controller-tools/pkg/rbac"
+	"sigs.k8s.io/controller-tools/pkg/webhook"
 )
 
 func main() {

diff --git a/pkg/generate/doc.go b/pkg/generate/doc.go
diff --git a/pkg/generate/rbac/manifests.go → pkg/rbac/manifests.go b/pkg/generate/rbac/manifests.go → pkg/rbac/manifests.go
diff --git a/pkg/generate/rbac/parser.go → pkg/rbac/parser.go b/pkg/generate/rbac/parser.go → pkg/rbac/parser.go
diff --git a/pkg/generate/rbac/parser_test.go → pkg/rbac/parser_test.go b/pkg/generate/rbac/parser_test.go → pkg/rbac/parser_test.go
diff --git a/pkg/generate/webhook/internal/client.go → pkg/webhook/internal/client.go b/pkg/generate/webhook/internal/client.go → pkg/webhook/internal/client.go
diff --git a/pkg/generate/webhook/internal/client_test.go → pkg/webhook/internal/client_test.go b/pkg/generate/webhook/internal/client_test.go → pkg/webhook/internal/client_test.go
diff --git a/pkg/generate/webhook/internal/manager.go → pkg/webhook/internal/manager.go b/pkg/generate/webhook/internal/manager.go → pkg/webhook/internal/manager.go
diff --git a/pkg/generate/webhook/manifests.go → pkg/webhook/manifests.go b/pkg/generate/webhook/manifests.go → pkg/webhook/manifests.go
@@ -29,8 +29,8 @@ import (
 	"github.com/ghodss/yaml"
 
 	"sigs.k8s.io/controller-runtime/pkg/webhook"
-	"sigs.k8s.io/controller-tools/pkg/generate/webhook/internal"
 	generateinteral "sigs.k8s.io/controller-tools/pkg/internal/general"
+	"sigs.k8s.io/controller-tools/pkg/webhook/internal"
 )
 
 // ManifestOptions represent options for generating the webhook manifests.

diff --git a/pkg/generate/webhook/parser.go → pkg/webhook/parser.go b/pkg/generate/webhook/parser.go → pkg/webhook/parser.go
diff --git a/pkg/generate/webhook/parser_test.go → pkg/webhook/parser_test.go b/pkg/generate/webhook/parser_test.go → pkg/webhook/parser_test.go