Skip to content

Commit

Permalink
Merge pull request #226 from Liujingfang1/refactor
Browse files Browse the repository at this point in the history
Move the e2e test library and existing projects to test folder
  • Loading branch information
Liujingfang1 committed May 25, 2018
2 parents 84c6356 + edf884a commit 6fd5269
Show file tree
Hide file tree
Showing 66 changed files with 48 additions and 37 deletions.
10 changes: 5 additions & 5 deletions test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 \
Expand All @@ -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 {
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
18 changes: 18 additions & 0 deletions test/e2e/doc.go
Original file line number Diff line number Diff line change
@@ -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
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand All @@ -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"]
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@



//
// +domain=memcached.example.com

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@




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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Original file line number Diff line number Diff line change
Expand Up @@ -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!
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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!
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion test_existing_projects.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit 6fd5269

Please sign in to comment.