Skip to content

Commit 896673e

Browse files
Wei WengWei Weng
authored andcommitted
delete v1alpha1 e2e and integration tests
Signed-off-by: Wei Weng <[email protected]>
1 parent ff9a623 commit 896673e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+10
-8055
lines changed

Makefile

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -175,8 +175,7 @@ integration-test: $(ENVTEST) ## Run tests.
175175
export CGO_ENABLED=1 && \
176176
export KUBEBUILDER_ASSETS="$(shell $(ENVTEST) use $(ENVTEST_K8S_VERSION) -p path)" && \
177177
ginkgo -v -p --race --cover --coverpkg=./pkg/scheduler/... ./test/scheduler && \
178-
ginkgo -v -p --race --cover --coverpkg=./... ./test/apis/... && \
179-
go test ./test/integration/... -coverpkg=./... -race -coverprofile=it-coverage.xml -v
178+
ginkgo -v -p --race --cover --coverpkg=./... ./test/apis/... -coverprofile=it-coverage.xml
180179

181180
## local tests & e2e tests
182181

@@ -223,21 +222,12 @@ install-member-agent-helm: install-hub-agent-helm e2e-v1alpha1-hub-kubeconfig-se
223222
# to make sure member-agent reads the token file.
224223
kubectl delete pod --all -n fleet-system
225224

226-
build-e2e-v1alpha1:
227-
go test -c ./test/e2e/v1alpha1
228-
229-
run-e2e-v1alpha1: build-e2e-v1alpha1
230-
KUBECONFIG=$(KUBECONFIG) HUB_SERVER_URL="https://$$(docker inspect $(HUB_KIND_CLUSTER_NAME)-control-plane --format='{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}'):6443" ./v1alpha1.test -test.v -ginkgo.v
231-
232225
.PHONY: create-kind-cluster
233226
create-kind-cluster: create-hub-kind-cluster create-member-kind-cluster install-helm
234227

235228
.PHONY: install-helm
236229
install-helm: load-hub-docker-image load-member-docker-image install-member-agent-helm
237230

238-
.PHONY: e2e-tests-v1alpha1
239-
e2e-tests-v1alpha1: create-kind-cluster run-e2e-v1alpha1
240-
241231
# E2E test label filter (can be overridden)
242232
LABEL_FILTER ?= !custom
243233

@@ -395,11 +385,6 @@ clean-testing-resources:
395385
kind export kubeconfig --name $(MEMBER_KIND_CLUSTER_NAME)
396386
kubectl delete ns fleet-member-kind-member-testing --ignore-not-found
397387

398-
.PHONY: clean-e2e-tests-v1alpha1
399-
clean-e2e-tests-v1alpha1:
400-
kind delete cluster --name $(HUB_KIND_CLUSTER_NAME)
401-
kind delete cluster --name $(MEMBER_KIND_CLUSTER_NAME)
402-
403388
.PHONY: clean-e2e-tests
404389
clean-e2e-tests:
405390
cd ./test/e2e && chmod +x ./stop.sh && ./stop.sh $(MEMBER_CLUSTER_COUNT)

cmd/hubagent/workload/setup.go

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,6 @@ func SetupControllers(ctx context.Context, wg *sync.WaitGroup, mgr ctrl.Manager,
171171
}
172172

173173
rateLimiter := options.DefaultControllerRateLimiter(opts.RateLimiterOpts)
174-
var clusterResourcePlacementControllerV1Alpha1 controller.Controller
175174
var clusterResourcePlacementControllerV1Beta1 controller.Controller
176175
var resourcePlacementController controller.Controller
177176
var memberClusterPlacementController controller.Controller
@@ -492,7 +491,6 @@ func SetupControllers(ctx context.Context, wg *sync.WaitGroup, mgr ctrl.Manager,
492491
Recorder: mgr.GetEventRecorderFor(resourceChangeControllerName),
493492
RestMapper: mgr.GetRESTMapper(),
494493
InformerManager: dynamicInformerManager,
495-
PlacementControllerV1Alpha1: clusterResourcePlacementControllerV1Alpha1,
496494
PlacementControllerV1Beta1: clusterResourcePlacementControllerV1Beta1,
497495
ResourcePlacementController: resourcePlacementController,
498496
}
@@ -502,16 +500,15 @@ func SetupControllers(ctx context.Context, wg *sync.WaitGroup, mgr ctrl.Manager,
502500
resourceChangeDetector := &resourcewatcher.ChangeDetector{
503501
DiscoveryClient: discoverClient,
504502
RESTMapper: mgr.GetRESTMapper(),
505-
ClusterResourcePlacementControllerV1Alpha1: clusterResourcePlacementControllerV1Alpha1,
506-
ClusterResourcePlacementControllerV1Beta1: clusterResourcePlacementControllerV1Beta1,
507-
ResourcePlacementController: resourcePlacementController,
508-
ResourceChangeController: resourceChangeController,
509-
MemberClusterPlacementController: memberClusterPlacementController,
510-
InformerManager: dynamicInformerManager,
511-
ResourceConfig: resourceConfig,
512-
SkippedNamespaces: skippedNamespaces,
513-
ConcurrentPlacementWorker: int(math.Ceil(float64(opts.MaxConcurrentClusterPlacement) / 10)),
514-
ConcurrentResourceChangeWorker: opts.ConcurrentResourceChangeSyncs,
503+
ClusterResourcePlacementControllerV1Beta1: clusterResourcePlacementControllerV1Beta1,
504+
ResourcePlacementController: resourcePlacementController,
505+
ResourceChangeController: resourceChangeController,
506+
MemberClusterPlacementController: memberClusterPlacementController,
507+
InformerManager: dynamicInformerManager,
508+
ResourceConfig: resourceConfig,
509+
SkippedNamespaces: skippedNamespaces,
510+
ConcurrentPlacementWorker: int(math.Ceil(float64(opts.MaxConcurrentClusterPlacement) / 10)),
511+
ConcurrentResourceChangeWorker: opts.ConcurrentResourceChangeSyncs,
515512
}
516513

517514
if err := mgr.Add(resourceChangeDetector); err != nil {

test/e2e/v1alpha1/README.md

Lines changed: 0 additions & 75 deletions
This file was deleted.

0 commit comments

Comments
 (0)