admin/kubesphere
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix e2e build issue

Browse Source 
Signed-off-by: Roland.Ma <rolandma@yunify.com>
This commit is contained in:
Roland.Ma
2020-11-13 02:26:07 +00:00
parent b14081ce9f
commit 37abb4f313
2 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Makefile
View File

@@ -45,11 +45,11 @@ controller-manager: fmt vet
hack/gobuild.sh cmd/controller-manager hack/gobuild.sh cmd/controller-manager
# Run go fmt against code # Run go fmt against code
fmt: generate fmt:
gofmt -w ./pkg ./cmd ./tools ./api gofmt -w ./pkg ./cmd ./tools ./api
# Run go vet against code # Run go vet against code
vet: generate vet:
go vet ./pkg/... ./cmd/... go vet ./pkg/... ./cmd/...
# Generate manifests e.g. CRD, RBAC etc. # Generate manifests e.g. CRD, RBAC etc.
@@ -60,11 +60,6 @@ deploy: manifests
kubectl apply -f config/crds kubectl apply -f config/crds
kustomize build config/default | kubectl apply -f - kustomize build config/default | kubectl apply -f -
# generate will generate crds' deepcopy & go openapi structs
# Futher more about go:genreate . https://blog.golang.org/generate
generate:
go generate ./pkg/... ./cmd/...
mockgen: mockgen:
mockgen -package=openpitrix -source=pkg/simple/client/openpitrix/openpitrix.go -destination=pkg/simple/client/openpitrix/mock.go mockgen -package=openpitrix -source=pkg/simple/client/openpitrix/openpitrix.go -destination=pkg/simple/client/openpitrix/mock.go

4
test/e2e/e2e_test.go
View File

@@ -145,10 +145,10 @@ var _ = Describe("E2e for network policy", func() {
job := obj.(*batchv1.Job) job := obj.(*batchv1.Job)
selector, _ := labels.Parse("app=nginx") selector, _ := labels.Parse("app=nginx")
podlist := &corev1.PodList{} podlist := &corev1.PodList{}
Expect(ctx.Client.List(context.TODO(), &client.ListOptions{ Expect(ctx.Client.List(context.TODO(), podlist, &client.ListOptions{
Namespace: deploy.Namespace, Namespace: deploy.Namespace,
LabelSelector: selector, LabelSelector: selector,
}, podlist)).ShouldNot(HaveOccurred()) })).ShouldNot(HaveOccurred())
Expect(podlist.Items).To(HaveLen(int(*deploy.Spec.Replicas))) Expect(podlist.Items).To(HaveLen(int(*deploy.Spec.Replicas)))
podip := podlist.Items[0].Status.PodIP podip := podlist.Items[0].Status.PodIP
job.Spec.Template.Spec.Containers[0].Command = []string{"ping", "-c", "4", podip} job.Spec.Template.Spec.Containers[0].Command = []string{"ping", "-c", "4", podip}