diff --git a/test.sh b/test.sh index 032174de034..7fe0cdd3293 100755 --- a/test.sh +++ b/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 { diff --git a/test/docs/expected/config-annotated.yaml b/test/data/docs/expected/config-annotated.yaml similarity index 100% rename from test/docs/expected/config-annotated.yaml rename to test/data/docs/expected/config-annotated.yaml diff --git a/test/docs/expected/config.yaml b/test/data/docs/expected/config.yaml similarity index 100% rename from test/docs/expected/config.yaml rename to test/data/docs/expected/config.yaml diff --git a/test/docs/expected/includes/_ant.md b/test/data/docs/expected/includes/_ant.md similarity index 100% rename from test/docs/expected/includes/_ant.md rename to test/data/docs/expected/includes/_ant.md diff --git a/samples/memcached-api-server/test/docs/reference/includes/_definitions.md b/test/data/docs/expected/includes/_definitions.md similarity index 100% rename from samples/memcached-api-server/test/docs/reference/includes/_definitions.md rename to test/data/docs/expected/includes/_definitions.md diff --git a/test/docs/expected/includes/_generated_ant_v1beta1_ant_concept.md b/test/data/docs/expected/includes/_generated_ant_v1beta1_ant_concept.md similarity index 100% rename from test/docs/expected/includes/_generated_ant_v1beta1_ant_concept.md rename to test/data/docs/expected/includes/_generated_ant_v1beta1_ant_concept.md diff --git a/test/docs/expected/includes/_generated_bee_v1beta1_insect_concept.md b/test/data/docs/expected/includes/_generated_bee_v1beta1_insect_concept.md similarity index 100% rename from test/docs/expected/includes/_generated_bee_v1beta1_insect_concept.md rename to test/data/docs/expected/includes/_generated_bee_v1beta1_insect_concept.md diff --git a/samples/memcached-api-server/test/docs/reference/includes/_generated_initializer_v1_meta_definition.md b/test/data/docs/expected/includes/_generated_initializer_v1_meta_definition.md similarity index 100% rename from samples/memcached-api-server/test/docs/reference/includes/_generated_initializer_v1_meta_definition.md rename to test/data/docs/expected/includes/_generated_initializer_v1_meta_definition.md diff --git a/samples/memcached-api-server/test/docs/reference/includes/_generated_initializers_v1_meta_definition.md b/test/data/docs/expected/includes/_generated_initializers_v1_meta_definition.md similarity index 100% rename from samples/memcached-api-server/test/docs/reference/includes/_generated_initializers_v1_meta_definition.md rename to test/data/docs/expected/includes/_generated_initializers_v1_meta_definition.md diff --git a/samples/memcached-api-server/test/docs/reference/includes/_generated_listmeta_v1_meta_definition.md b/test/data/docs/expected/includes/_generated_listmeta_v1_meta_definition.md similarity index 100% rename from samples/memcached-api-server/test/docs/reference/includes/_generated_listmeta_v1_meta_definition.md rename to test/data/docs/expected/includes/_generated_listmeta_v1_meta_definition.md diff --git a/test/docs/expected/includes/_generated_objectmeta_v1_meta_definition.md b/test/data/docs/expected/includes/_generated_objectmeta_v1_meta_definition.md similarity index 100% rename from test/docs/expected/includes/_generated_objectmeta_v1_meta_definition.md rename to test/data/docs/expected/includes/_generated_objectmeta_v1_meta_definition.md diff --git a/samples/memcached-api-server/test/docs/reference/includes/_generated_ownerreference_v1_meta_definition.md b/test/data/docs/expected/includes/_generated_ownerreference_v1_meta_definition.md similarity index 100% rename from samples/memcached-api-server/test/docs/reference/includes/_generated_ownerreference_v1_meta_definition.md rename to test/data/docs/expected/includes/_generated_ownerreference_v1_meta_definition.md diff --git a/samples/memcached-api-server/test/docs/reference/includes/_generated_status_v1_meta_definition.md b/test/data/docs/expected/includes/_generated_status_v1_meta_definition.md similarity index 100% rename from samples/memcached-api-server/test/docs/reference/includes/_generated_status_v1_meta_definition.md rename to test/data/docs/expected/includes/_generated_status_v1_meta_definition.md diff --git a/samples/memcached-api-server/test/docs/reference/includes/_generated_statuscause_v1_meta_definition.md b/test/data/docs/expected/includes/_generated_statuscause_v1_meta_definition.md similarity index 100% rename from samples/memcached-api-server/test/docs/reference/includes/_generated_statuscause_v1_meta_definition.md rename to test/data/docs/expected/includes/_generated_statuscause_v1_meta_definition.md diff --git a/samples/memcached-api-server/test/docs/reference/includes/_generated_statusdetails_v1_meta_definition.md b/test/data/docs/expected/includes/_generated_statusdetails_v1_meta_definition.md similarity index 100% rename from samples/memcached-api-server/test/docs/reference/includes/_generated_statusdetails_v1_meta_definition.md rename to test/data/docs/expected/includes/_generated_statusdetails_v1_meta_definition.md diff --git a/samples/memcached-api-server/test/docs/reference/includes/_generated_time_v1_meta_definition.md b/test/data/docs/expected/includes/_generated_time_v1_meta_definition.md similarity index 100% rename from samples/memcached-api-server/test/docs/reference/includes/_generated_time_v1_meta_definition.md rename to test/data/docs/expected/includes/_generated_time_v1_meta_definition.md diff --git a/test/docs/expected/includes/_generated_wasp_v1beta1_insect_concept.md b/test/data/docs/expected/includes/_generated_wasp_v1beta1_insect_concept.md similarity index 100% rename from test/docs/expected/includes/_generated_wasp_v1beta1_insect_concept.md rename to test/data/docs/expected/includes/_generated_wasp_v1beta1_insect_concept.md diff --git a/test/docs/expected/includes/_insect.md b/test/data/docs/expected/includes/_insect.md similarity index 100% rename from test/docs/expected/includes/_insect.md rename to test/data/docs/expected/includes/_insect.md diff --git a/samples/memcached-api-server/test/docs/reference/includes/_oldversions.md b/test/data/docs/expected/includes/_oldversions.md similarity index 100% rename from samples/memcached-api-server/test/docs/reference/includes/_oldversions.md rename to test/data/docs/expected/includes/_oldversions.md diff --git a/samples/memcached-api-server/test/docs/reference/includes/_overview.md b/test/data/docs/expected/includes/_overview.md similarity index 100% rename from samples/memcached-api-server/test/docs/reference/includes/_overview.md rename to test/data/docs/expected/includes/_overview.md diff --git a/test/docs/expected/manifest.json b/test/data/docs/expected/manifest.json similarity index 100% rename from test/docs/expected/manifest.json rename to test/data/docs/expected/manifest.json diff --git a/test/resource/expected/crd-expected.yaml b/test/data/resource/expected/crd-expected.yaml similarity index 100% rename from test/resource/expected/crd-expected.yaml rename to test/data/resource/expected/crd-expected.yaml diff --git a/test/e2e/doc.go b/test/e2e/doc.go new file mode 100644 index 00000000000..3aaaacb9650 --- /dev/null +++ b/test/e2e/doc.go @@ -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 diff --git a/samples/internal/test/e2e/kubebuildertest.go b/test/internal/e2e/kubebuildertest.go similarity index 100% rename from samples/internal/test/e2e/kubebuildertest.go rename to test/internal/e2e/kubebuildertest.go diff --git a/samples/README.md b/test/projects/README.md similarity index 100% rename from samples/README.md rename to test/projects/README.md diff --git a/samples/memcached-api-server/Dockerfile.controller b/test/projects/memcached-api-server/Dockerfile.controller similarity index 89% rename from samples/memcached-api-server/Dockerfile.controller rename to test/projects/memcached-api-server/Dockerfile.controller index 5a7d0985c83..f366a6c7e04 100644 --- a/samples/memcached-api-server/Dockerfile.controller +++ b/test/projects/memcached-api-server/Dockerfile.controller @@ -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"] diff --git a/samples/memcached-api-server/Gopkg.lock b/test/projects/memcached-api-server/Gopkg.lock similarity index 100% rename from samples/memcached-api-server/Gopkg.lock rename to test/projects/memcached-api-server/Gopkg.lock diff --git a/samples/memcached-api-server/Gopkg.toml b/test/projects/memcached-api-server/Gopkg.toml similarity index 100% rename from samples/memcached-api-server/Gopkg.toml rename to test/projects/memcached-api-server/Gopkg.toml diff --git a/samples/memcached-api-server/README.md b/test/projects/memcached-api-server/README.md similarity index 100% rename from samples/memcached-api-server/README.md rename to test/projects/memcached-api-server/README.md diff --git a/samples/memcached-api-server/cmd/controller-manager/main.go b/test/projects/memcached-api-server/cmd/controller-manager/main.go similarity index 87% rename from samples/memcached-api-server/cmd/controller-manager/main.go rename to test/projects/memcached-api-server/cmd/controller-manager/main.go index 15825aa3989..291a95213f5 100644 --- a/samples/memcached-api-server/cmd/controller-manager/main.go +++ b/test/projects/memcached-api-server/cmd/controller-manager/main.go @@ -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") diff --git a/samples/memcached-api-server/hack/boilerplate.go.txt b/test/projects/memcached-api-server/hack/boilerplate.go.txt similarity index 100% rename from samples/memcached-api-server/hack/boilerplate.go.txt rename to test/projects/memcached-api-server/hack/boilerplate.go.txt diff --git a/samples/memcached-api-server/hack/doc.go b/test/projects/memcached-api-server/hack/doc.go similarity index 100% rename from samples/memcached-api-server/hack/doc.go rename to test/projects/memcached-api-server/hack/doc.go diff --git a/samples/memcached-api-server/hack/sample/memcached.yaml b/test/projects/memcached-api-server/hack/sample/memcached.yaml similarity index 100% rename from samples/memcached-api-server/hack/sample/memcached.yaml rename to test/projects/memcached-api-server/hack/sample/memcached.yaml diff --git a/samples/memcached-api-server/memcached_test.go b/test/projects/memcached-api-server/memcached_test.go similarity index 96% rename from samples/memcached-api-server/memcached_test.go rename to test/projects/memcached-api-server/memcached_test.go index fe5fbdbc0f9..e79bfcf6a03 100644 --- a/samples/memcached-api-server/memcached_test.go +++ b/test/projects/memcached-api-server/memcached_test.go @@ -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 diff --git a/samples/memcached-api-server/pkg/apis/doc.go b/test/projects/memcached-api-server/pkg/apis/doc.go similarity index 94% rename from samples/memcached-api-server/pkg/apis/doc.go rename to test/projects/memcached-api-server/pkg/apis/doc.go index d81b4396137..ce7a9d87ba3 100644 --- a/samples/memcached-api-server/pkg/apis/doc.go +++ b/test/projects/memcached-api-server/pkg/apis/doc.go @@ -1,6 +1,3 @@ - - - // // +domain=memcached.example.com diff --git a/samples/memcached-api-server/pkg/apis/myapps/doc.go b/test/projects/memcached-api-server/pkg/apis/myapps/doc.go similarity index 97% rename from samples/memcached-api-server/pkg/apis/myapps/doc.go rename to test/projects/memcached-api-server/pkg/apis/myapps/doc.go index 3334790139c..e156c6ef933 100644 --- a/samples/memcached-api-server/pkg/apis/myapps/doc.go +++ b/test/projects/memcached-api-server/pkg/apis/myapps/doc.go @@ -1,7 +1,3 @@ - - - - // +k8s:deepcopy-gen=package,register // +groupName=myapps.memcached.example.com diff --git a/samples/memcached-api-server/pkg/apis/myapps/v1alpha1/doc.go b/test/projects/memcached-api-server/pkg/apis/myapps/v1alpha1/doc.go similarity index 67% rename from samples/memcached-api-server/pkg/apis/myapps/v1alpha1/doc.go rename to test/projects/memcached-api-server/pkg/apis/myapps/v1alpha1/doc.go index 9fb7228c9ee..c7787b030af 100644 --- a/samples/memcached-api-server/pkg/apis/myapps/v1alpha1/doc.go +++ b/test/projects/memcached-api-server/pkg/apis/myapps/v1alpha1/doc.go @@ -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" diff --git a/samples/memcached-api-server/pkg/apis/myapps/v1alpha1/memcached_types.go b/test/projects/memcached-api-server/pkg/apis/myapps/v1alpha1/memcached_types.go similarity index 100% rename from samples/memcached-api-server/pkg/apis/myapps/v1alpha1/memcached_types.go rename to test/projects/memcached-api-server/pkg/apis/myapps/v1alpha1/memcached_types.go diff --git a/samples/memcached-api-server/pkg/apis/myapps/v1alpha1/memcached_types_test.go b/test/projects/memcached-api-server/pkg/apis/myapps/v1alpha1/memcached_types_test.go similarity index 88% rename from samples/memcached-api-server/pkg/apis/myapps/v1alpha1/memcached_types_test.go rename to test/projects/memcached-api-server/pkg/apis/myapps/v1alpha1/memcached_types_test.go index 0360dbe09d2..ef0de6ff324 100644 --- a/samples/memcached-api-server/pkg/apis/myapps/v1alpha1/memcached_types_test.go +++ b/test/projects/memcached-api-server/pkg/apis/myapps/v1alpha1/memcached_types_test.go @@ -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! diff --git a/samples/memcached-api-server/pkg/apis/myapps/v1alpha1/v1alpha1_suite_test.go b/test/projects/memcached-api-server/pkg/apis/myapps/v1alpha1/v1alpha1_suite_test.go similarity index 77% rename from samples/memcached-api-server/pkg/apis/myapps/v1alpha1/v1alpha1_suite_test.go rename to test/projects/memcached-api-server/pkg/apis/myapps/v1alpha1/v1alpha1_suite_test.go index 511c0958d69..f38832359f9 100644 --- a/samples/memcached-api-server/pkg/apis/myapps/v1alpha1/v1alpha1_suite_test.go +++ b/test/projects/memcached-api-server/pkg/apis/myapps/v1alpha1/v1alpha1_suite_test.go @@ -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 diff --git a/samples/memcached-api-server/pkg/controller/doc.go b/test/projects/memcached-api-server/pkg/controller/doc.go similarity index 100% rename from samples/memcached-api-server/pkg/controller/doc.go rename to test/projects/memcached-api-server/pkg/controller/doc.go diff --git a/samples/memcached-api-server/pkg/controller/memcached/controller.go b/test/projects/memcached-api-server/pkg/controller/memcached/controller.go similarity index 92% rename from samples/memcached-api-server/pkg/controller/memcached/controller.go rename to test/projects/memcached-api-server/pkg/controller/memcached/controller.go index c09d7163b91..945d96966ee 100644 --- a/samples/memcached-api-server/pkg/controller/memcached/controller.go +++ b/test/projects/memcached-api-server/pkg/controller/memcached/controller.go @@ -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" diff --git a/samples/memcached-api-server/pkg/controller/memcached/controller_test.go b/test/projects/memcached-api-server/pkg/controller/memcached/controller_test.go similarity index 89% rename from samples/memcached-api-server/pkg/controller/memcached/controller_test.go rename to test/projects/memcached-api-server/pkg/controller/memcached/controller_test.go index 2a9cf06644f..68822dac7d6 100644 --- a/samples/memcached-api-server/pkg/controller/memcached/controller_test.go +++ b/test/projects/memcached-api-server/pkg/controller/memcached/controller_test.go @@ -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! diff --git a/samples/memcached-api-server/pkg/controller/memcached/memcached_suite_test.go b/test/projects/memcached-api-server/pkg/controller/memcached/memcached_suite_test.go similarity index 83% rename from samples/memcached-api-server/pkg/controller/memcached/memcached_suite_test.go rename to test/projects/memcached-api-server/pkg/controller/memcached/memcached_suite_test.go index 9252261b4f4..e014c4bbc08 100644 --- a/samples/memcached-api-server/pkg/controller/memcached/memcached_suite_test.go +++ b/test/projects/memcached-api-server/pkg/controller/memcached/memcached_suite_test.go @@ -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 ( diff --git a/samples/memcached-api-server/pkg/doc.go b/test/projects/memcached-api-server/pkg/doc.go similarity index 100% rename from samples/memcached-api-server/pkg/doc.go rename to test/projects/memcached-api-server/pkg/doc.go diff --git a/samples/memcached-api-server/pkg/inject/args/args.go b/test/projects/memcached-api-server/pkg/inject/args/args.go similarity index 73% rename from samples/memcached-api-server/pkg/inject/args/args.go rename to test/projects/memcached-api-server/pkg/inject/args/args.go index c6332c22e89..11055c4f781 100644 --- a/samples/memcached-api-server/pkg/inject/args/args.go +++ b/test/projects/memcached-api-server/pkg/inject/args/args.go @@ -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 diff --git a/samples/memcached-api-server/pkg/inject/doc.go b/test/projects/memcached-api-server/pkg/inject/doc.go similarity index 100% rename from samples/memcached-api-server/pkg/inject/doc.go rename to test/projects/memcached-api-server/pkg/inject/doc.go diff --git a/samples/memcached-api-server/pkg/inject/inject.go b/test/projects/memcached-api-server/pkg/inject/inject.go similarity index 86% rename from samples/memcached-api-server/pkg/inject/inject.go rename to test/projects/memcached-api-server/pkg/inject/inject.go index adee1f5afed..90cec178bfa 100644 --- a/samples/memcached-api-server/pkg/inject/inject.go +++ b/test/projects/memcached-api-server/pkg/inject/inject.go @@ -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 ( diff --git a/samples/memcached-api-server/test/docs/reference/config.yaml b/test/projects/memcached-api-server/test/docs/reference/config.yaml similarity index 100% rename from samples/memcached-api-server/test/docs/reference/config.yaml rename to test/projects/memcached-api-server/test/docs/reference/config.yaml diff --git a/test/docs/expected/includes/_definitions.md b/test/projects/memcached-api-server/test/docs/reference/includes/_definitions.md similarity index 100% rename from test/docs/expected/includes/_definitions.md rename to test/projects/memcached-api-server/test/docs/reference/includes/_definitions.md diff --git a/test/docs/expected/includes/_generated_initializer_v1_meta_definition.md b/test/projects/memcached-api-server/test/docs/reference/includes/_generated_initializer_v1_meta_definition.md similarity index 100% rename from test/docs/expected/includes/_generated_initializer_v1_meta_definition.md rename to test/projects/memcached-api-server/test/docs/reference/includes/_generated_initializer_v1_meta_definition.md diff --git a/test/docs/expected/includes/_generated_initializers_v1_meta_definition.md b/test/projects/memcached-api-server/test/docs/reference/includes/_generated_initializers_v1_meta_definition.md similarity index 100% rename from test/docs/expected/includes/_generated_initializers_v1_meta_definition.md rename to test/projects/memcached-api-server/test/docs/reference/includes/_generated_initializers_v1_meta_definition.md diff --git a/test/docs/expected/includes/_generated_listmeta_v1_meta_definition.md b/test/projects/memcached-api-server/test/docs/reference/includes/_generated_listmeta_v1_meta_definition.md similarity index 100% rename from test/docs/expected/includes/_generated_listmeta_v1_meta_definition.md rename to test/projects/memcached-api-server/test/docs/reference/includes/_generated_listmeta_v1_meta_definition.md diff --git a/samples/memcached-api-server/test/docs/reference/includes/_generated_memcached_v1alpha1_myapps_concept.md b/test/projects/memcached-api-server/test/docs/reference/includes/_generated_memcached_v1alpha1_myapps_concept.md similarity index 100% rename from samples/memcached-api-server/test/docs/reference/includes/_generated_memcached_v1alpha1_myapps_concept.md rename to test/projects/memcached-api-server/test/docs/reference/includes/_generated_memcached_v1alpha1_myapps_concept.md diff --git a/samples/memcached-api-server/test/docs/reference/includes/_generated_objectmeta_v1_meta_definition.md b/test/projects/memcached-api-server/test/docs/reference/includes/_generated_objectmeta_v1_meta_definition.md similarity index 100% rename from samples/memcached-api-server/test/docs/reference/includes/_generated_objectmeta_v1_meta_definition.md rename to test/projects/memcached-api-server/test/docs/reference/includes/_generated_objectmeta_v1_meta_definition.md diff --git a/test/docs/expected/includes/_generated_ownerreference_v1_meta_definition.md b/test/projects/memcached-api-server/test/docs/reference/includes/_generated_ownerreference_v1_meta_definition.md similarity index 100% rename from test/docs/expected/includes/_generated_ownerreference_v1_meta_definition.md rename to test/projects/memcached-api-server/test/docs/reference/includes/_generated_ownerreference_v1_meta_definition.md diff --git a/test/docs/expected/includes/_generated_status_v1_meta_definition.md b/test/projects/memcached-api-server/test/docs/reference/includes/_generated_status_v1_meta_definition.md similarity index 100% rename from test/docs/expected/includes/_generated_status_v1_meta_definition.md rename to test/projects/memcached-api-server/test/docs/reference/includes/_generated_status_v1_meta_definition.md diff --git a/test/docs/expected/includes/_generated_statuscause_v1_meta_definition.md b/test/projects/memcached-api-server/test/docs/reference/includes/_generated_statuscause_v1_meta_definition.md similarity index 100% rename from test/docs/expected/includes/_generated_statuscause_v1_meta_definition.md rename to test/projects/memcached-api-server/test/docs/reference/includes/_generated_statuscause_v1_meta_definition.md diff --git a/test/docs/expected/includes/_generated_statusdetails_v1_meta_definition.md b/test/projects/memcached-api-server/test/docs/reference/includes/_generated_statusdetails_v1_meta_definition.md similarity index 100% rename from test/docs/expected/includes/_generated_statusdetails_v1_meta_definition.md rename to test/projects/memcached-api-server/test/docs/reference/includes/_generated_statusdetails_v1_meta_definition.md diff --git a/test/docs/expected/includes/_generated_time_v1_meta_definition.md b/test/projects/memcached-api-server/test/docs/reference/includes/_generated_time_v1_meta_definition.md similarity index 100% rename from test/docs/expected/includes/_generated_time_v1_meta_definition.md rename to test/projects/memcached-api-server/test/docs/reference/includes/_generated_time_v1_meta_definition.md diff --git a/samples/memcached-api-server/test/docs/reference/includes/_myapps.md b/test/projects/memcached-api-server/test/docs/reference/includes/_myapps.md similarity index 100% rename from samples/memcached-api-server/test/docs/reference/includes/_myapps.md rename to test/projects/memcached-api-server/test/docs/reference/includes/_myapps.md diff --git a/test/docs/expected/includes/_oldversions.md b/test/projects/memcached-api-server/test/docs/reference/includes/_oldversions.md similarity index 100% rename from test/docs/expected/includes/_oldversions.md rename to test/projects/memcached-api-server/test/docs/reference/includes/_oldversions.md diff --git a/test/docs/expected/includes/_overview.md b/test/projects/memcached-api-server/test/docs/reference/includes/_overview.md similarity index 100% rename from test/docs/expected/includes/_overview.md rename to test/projects/memcached-api-server/test/docs/reference/includes/_overview.md diff --git a/samples/memcached-api-server/test/docs/reference/manifest.json b/test/projects/memcached-api-server/test/docs/reference/manifest.json similarity index 100% rename from samples/memcached-api-server/test/docs/reference/manifest.json rename to test/projects/memcached-api-server/test/docs/reference/manifest.json diff --git a/samples/memcached-api-server/test/hack/install.yaml b/test/projects/memcached-api-server/test/hack/install.yaml similarity index 100% rename from samples/memcached-api-server/test/hack/install.yaml rename to test/projects/memcached-api-server/test/hack/install.yaml diff --git a/test_existing_projects.sh b/test_existing_projects.sh index 46d36f1bfcc..3a02000205b 100755 --- a/test_existing_projects.sh +++ b/test_existing_projects.sh @@ -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