Merge pull request #226 from Liujingfang1/refactor

Move the e2e test library and existing projects to test folder

Author: Liujingfang1

test.sh

@@ -535,7 +535,7 @@ function test_crd_validation {
   kubebuilder generate
   header_text "generating and testing CRD..."
   kubebuilder create config --crds --output crd-validation.yaml
-  diff crd-validation.yaml $kb_orig/test/resource/expected/crd-expected.yaml
+  diff crd-validation.yaml $kb_orig/test/data/resource/expected/crd-expected.yaml
 
   kubebuilder create config --controller-image myimage:v1 --name myextensionname --output install.yaml
   kubebuilder create controller --group got --version v1beta1 --kind House
@@ -568,9 +568,9 @@ function test_vendor_update {
 function test_docs {
   header_text "building docs"
   kubebuilder docs --docs-copyright "Hello" --title "World" --cleanup=false --brodocs=false
-  diff docs/reference/includes "$kb_orig/test/docs/expected/includes"
-  diff docs/reference/manifest.json "$kb_orig/test/docs/expected/manifest.json"
-  diff docs/reference/config.yaml "$kb_orig/test/docs/expected/config.yaml"
+  diff docs/reference/includes "$kb_orig/test/data/docs/expected/includes"
+  diff docs/reference/manifest.json "$kb_orig/test/data/docs/expected/manifest.json"
+  diff docs/reference/config.yaml "$kb_orig/test/data/docs/expected/config.yaml"
 
   header_text "testing doc annotations"
   sed -i -e '/type Bee struct/ i \
@@ -579,7 +579,7 @@ function test_docs {
   ' pkg/apis/insect/v1beta1/bee_types.go
 
   kubebuilder docs --brodocs=false --cleanup=false
-  diff docs/reference/config.yaml "$kb_orig/test/docs/expected/config-annotated.yaml"
+  diff docs/reference/config.yaml "$kb_orig/test/data/docs/expected/config-annotated.yaml"
 }
 
 function generate_controller {

test/docs/expected/config-annotated.yaml renamed to test/data/docs/expected/config-annotated.yaml

@@ -0,0 +1,18 @@
+/*
+Copyright 2018 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+// The signals package contains e2e tests for kubebuilder
+package e2e

test/docs/expected/config.yaml renamed to test/data/docs/expected/config.yaml

@@ -17,7 +17,7 @@ RUN chmod +x $TEST_ASSET_KUBE_APISERVER
 RUN chmod +x $TEST_ASSET_KUBECTL
 
 # Copy in the go src
-WORKDIR /go/src/github.com/kubernetes-sigs/kubebuilder/samples/memcached-api-server
+WORKDIR /go/src/github.com/kubernetes-sigs/kubebuilder/test/projects/memcached-api-server
 COPY pkg/    pkg/
 COPY cmd/    cmd/
 COPY vendor/ vendor/
@@ -30,6 +30,6 @@ RUN go test ./pkg/... ./cmd/...
 FROM ubuntu:latest
 # RUN apk --no-cache add ca-certificates
 WORKDIR /root/
-COPY --from=builder /go/src/github.com/kubernetes-sigs/kubebuilder/samples/memcached-api-server/controller-manager .
+COPY --from=builder /go/src/github.com/kubernetes-sigs/kubebuilder/test/projects/memcached-api-server/controller-manager .
 ENTRYPOINT ["./controller-manager"]
 CMD ["--install-crds=false"]

test/docs/expected/includes/_ant.md renamed to test/data/docs/expected/includes/_ant.md

@@ -13,8 +13,8 @@ import (
 	"github.com/kubernetes-sigs/kubebuilder/pkg/signals"
 	extensionsv1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"
 
-	"github.com/kubernetes-sigs/kubebuilder/samples/memcached-api-server/pkg/inject"
-	"github.com/kubernetes-sigs/kubebuilder/samples/memcached-api-server/pkg/inject/args"
+	"github.com/kubernetes-sigs/kubebuilder/test/projects/memcached-api-server/pkg/inject"
+	"github.com/kubernetes-sigs/kubebuilder/test/projects/memcached-api-server/pkg/inject/args"
 )
 
 var installCRDs = flag.Bool("install-crds", true, "install the CRDs used by the controller as part of startup")

samples/memcached-api-server/test/docs/reference/includes/_definitions.md renamed to test/data/docs/expected/includes/_definitions.md

@@ -5,7 +5,7 @@ import (
 	"path/filepath"
 	"runtime"
 	"testing"
-	"github.com/kubernetes-sigs/kubebuilder/samples/internal/test/e2e"
+	"github.com/kubernetes-sigs/kubebuilder/test/internal/e2e"
 )
 
 var kubebuilderTest *e2e.KubebuilderTest

test/docs/expected/includes/_generated_ant_v1beta1_ant_concept.md renamed to test/data/docs/expected/includes/_generated_ant_v1beta1_ant_concept.md

@@ -1,6 +1,3 @@
-
-
-
 //
 // +domain=memcached.example.com
 

test/docs/expected/includes/_generated_bee_v1beta1_insect_concept.md renamed to test/data/docs/expected/includes/_generated_bee_v1beta1_insect_concept.md

@@ -1,7 +1,3 @@
-
-
-
-
 // +k8s:deepcopy-gen=package,register
 // +groupName=myapps.memcached.example.com
 

samples/memcached-api-server/test/docs/reference/includes/_generated_initializer_v1_meta_definition.md renamed to test/data/docs/expected/includes/_generated_initializer_v1_meta_definition.md

@@ -4,7 +4,7 @@
 
 // +k8s:openapi-gen=true
 // +k8s:deepcopy-gen=package,register
-// +k8s:conversion-gen=github.com/kubernetes-sigs/kubebuilder/samples/memcached-api-server/pkg/apis/myapps
+// +k8s:conversion-gen=github.com/kubernetes-sigs/kubebuilder/test/projects/memcached-api-server/pkg/apis/myapps
 // +k8s:defaulter-gen=TypeMeta
 // +groupName=myapps.memcached.example.com
-package v1alpha1 // import "github.com/kubernetes-sigs/kubebuilder/samples/memcached-api-server/pkg/apis/myapps/v1alpha1"
+package v1alpha1 // import "github.com/kubernetes-sigs/kubebuilder/test/projects/memcached-api-server/pkg/apis/myapps/v1alpha1"

samples/memcached-api-server/test/docs/reference/includes/_generated_initializers_v1_meta_definition.md renamed to test/data/docs/expected/includes/_generated_initializers_v1_meta_definition.md

@@ -6,8 +6,8 @@ import (
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
-	. "github.com/kubernetes-sigs/kubebuilder/samples/memcached-api-server/pkg/apis/myapps/v1alpha1"
-	. "github.com/kubernetes-sigs/kubebuilder/samples/memcached-api-server/pkg/client/clientset/versioned/typed/myapps/v1alpha1"
+	. "github.com/kubernetes-sigs/kubebuilder/test/projects/memcached-api-server/pkg/apis/myapps/v1alpha1"
+	. "github.com/kubernetes-sigs/kubebuilder/test/projects/memcached-api-server/pkg/client/clientset/versioned/typed/myapps/v1alpha1"
 )
 
 // EDIT THIS FILE!

samples/memcached-api-server/test/docs/reference/includes/_generated_listmeta_v1_meta_definition.md renamed to test/data/docs/expected/includes/_generated_listmeta_v1_meta_definition.md

@@ -8,8 +8,8 @@ import (
 	. "github.com/onsi/gomega"
 	"k8s.io/client-go/rest"
 
-	"github.com/kubernetes-sigs/kubebuilder/samples/memcached-api-server/pkg/client/clientset/versioned"
-	"github.com/kubernetes-sigs/kubebuilder/samples/memcached-api-server/pkg/inject"
+	"github.com/kubernetes-sigs/kubebuilder/test/projects/memcached-api-server/pkg/client/clientset/versioned"
+	"github.com/kubernetes-sigs/kubebuilder/test/projects/memcached-api-server/pkg/inject"
 )
 
 var testenv *test.TestEnvironment

test/docs/expected/includes/_generated_objectmeta_v1_meta_definition.md renamed to test/data/docs/expected/includes/_generated_objectmeta_v1_meta_definition.md

@@ -7,11 +7,11 @@ import (
 	"github.com/kubernetes-sigs/kubebuilder/pkg/controller"
 	"github.com/kubernetes-sigs/kubebuilder/pkg/controller/types"
 
-	myappsv1alpha1 "github.com/kubernetes-sigs/kubebuilder/samples/memcached-api-server/pkg/apis/myapps/v1alpha1"
-	myappsv1alpha1client "github.com/kubernetes-sigs/kubebuilder/samples/memcached-api-server/pkg/client/clientset/versioned/typed/myapps/v1alpha1"
-	myappsv1alpha1informer "github.com/kubernetes-sigs/kubebuilder/samples/memcached-api-server/pkg/client/informers/externalversions/myapps/v1alpha1"
-	myappsv1alpha1lister "github.com/kubernetes-sigs/kubebuilder/samples/memcached-api-server/pkg/client/listers/myapps/v1alpha1"
-	"github.com/kubernetes-sigs/kubebuilder/samples/memcached-api-server/pkg/inject/args"
+	myappsv1alpha1 "github.com/kubernetes-sigs/kubebuilder/test/projects/memcached-api-server/pkg/apis/myapps/v1alpha1"
+	myappsv1alpha1client "github.com/kubernetes-sigs/kubebuilder/test/projects/memcached-api-server/pkg/client/clientset/versioned/typed/myapps/v1alpha1"
+	myappsv1alpha1informer "github.com/kubernetes-sigs/kubebuilder/test/projects/memcached-api-server/pkg/client/informers/externalversions/myapps/v1alpha1"
+	myappsv1alpha1lister "github.com/kubernetes-sigs/kubebuilder/test/projects/memcached-api-server/pkg/client/listers/myapps/v1alpha1"
+	"github.com/kubernetes-sigs/kubebuilder/test/projects/memcached-api-server/pkg/inject/args"
 	"github.com/kubernetes-sigs/kubebuilder/pkg/controller/eventhandlers"
 	appsv1 "k8s.io/api/apps/v1"
 	"k8s.io/api/core/v1"

samples/memcached-api-server/test/docs/reference/includes/_generated_ownerreference_v1_meta_definition.md renamed to test/data/docs/expected/includes/_generated_ownerreference_v1_meta_definition.md

@@ -7,8 +7,8 @@ import (
 	"github.com/kubernetes-sigs/kubebuilder/pkg/controller/types"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
-	. "github.com/kubernetes-sigs/kubebuilder/samples/memcached-api-server/pkg/apis/myapps/v1alpha1"
-	. "github.com/kubernetes-sigs/kubebuilder/samples/memcached-api-server/pkg/client/clientset/versioned/typed/myapps/v1alpha1"
+	. "github.com/kubernetes-sigs/kubebuilder/test/projects/memcached-api-server/pkg/apis/myapps/v1alpha1"
+	. "github.com/kubernetes-sigs/kubebuilder/test/projects/memcached-api-server/pkg/client/clientset/versioned/typed/myapps/v1alpha1"
 )
 
 // EDIT THIS FILE!

samples/memcached-api-server/test/docs/reference/includes/_generated_status_v1_meta_definition.md renamed to test/data/docs/expected/includes/_generated_status_v1_meta_definition.md

@@ -11,9 +11,9 @@ import (
 	"k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/rest"
 
-	"github.com/kubernetes-sigs/kubebuilder/samples/memcached-api-server/pkg/client/clientset/versioned"
-	"github.com/kubernetes-sigs/kubebuilder/samples/memcached-api-server/pkg/inject"
-	"github.com/kubernetes-sigs/kubebuilder/samples/memcached-api-server/pkg/inject/args"
+	"github.com/kubernetes-sigs/kubebuilder/test/projects/memcached-api-server/pkg/client/clientset/versioned"
+	"github.com/kubernetes-sigs/kubebuilder/test/projects/memcached-api-server/pkg/inject"
+	"github.com/kubernetes-sigs/kubebuilder/test/projects/memcached-api-server/pkg/inject/args"
 )
 
 var (

samples/memcached-api-server/test/docs/reference/includes/_generated_statuscause_v1_meta_definition.md renamed to test/data/docs/expected/includes/_generated_statuscause_v1_meta_definition.md

@@ -6,8 +6,8 @@ import (
 	"github.com/kubernetes-sigs/kubebuilder/pkg/inject/args"
 	"k8s.io/client-go/rest"
 
-	"github.com/kubernetes-sigs/kubebuilder/samples/memcached-api-server/pkg/client/clientset/versioned"
-	"github.com/kubernetes-sigs/kubebuilder/samples/memcached-api-server/pkg/client/informers/externalversions"
+	"github.com/kubernetes-sigs/kubebuilder/test/projects/memcached-api-server/pkg/client/clientset/versioned"
+	"github.com/kubernetes-sigs/kubebuilder/test/projects/memcached-api-server/pkg/client/informers/externalversions"
 )
 
 // InjectArgs are the arguments need to initialize controllers

samples/memcached-api-server/test/docs/reference/includes/_generated_statusdetails_v1_meta_definition.md renamed to test/data/docs/expected/includes/_generated_statusdetails_v1_meta_definition.md

@@ -4,7 +4,7 @@ import (
 	injectargs "github.com/kubernetes-sigs/kubebuilder/pkg/inject/args"
 	"github.com/kubernetes-sigs/kubebuilder/pkg/inject/run"
 
-	"github.com/kubernetes-sigs/kubebuilder/samples/memcached-api-server/pkg/inject/args"
+	"github.com/kubernetes-sigs/kubebuilder/test/projects/memcached-api-server/pkg/inject/args"
 )
 
 var (

samples/memcached-api-server/test/docs/reference/includes/_generated_time_v1_meta_definition.md renamed to test/data/docs/expected/includes/_generated_time_v1_meta_definition.md

@@ -14,4 +14,4 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-go test -v ./samples/memcached-api-server
+go test -v ./test/projects/memcached-api-server