Merge pull request #3109 from RolandMa1986/fix-e2e

fix e2e build issue

Makefile

@@ -45,11 +45,11 @@ controller-manager: fmt vet
 	hack/gobuild.sh cmd/controller-manager
 
 # Run go fmt against code 
-fmt: generate
+fmt:
 	gofmt -w ./pkg ./cmd ./tools ./api
 
 # Run go vet against code
-vet: generate
+vet:
 	go vet ./pkg/... ./cmd/...
 
 # Generate manifests e.g. CRD, RBAC etc.
@@ -60,11 +60,6 @@ deploy: manifests
 	kubectl apply -f config/crds
 	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 -package=openpitrix -source=pkg/simple/client/openpitrix/openpitrix.go -destination=pkg/simple/client/openpitrix/mock.go
 

test/e2e/e2e_test.go

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