Skip to content

Commit 46f4caf

Browse files
authored
Revert kubetest2 integration (#17)
Remove kubetest2 integration in favour of exploring another e2e framework. * Revert "Update test export API version (#12)" This reverts commit 50cf0a1. * Revert "Create end to end testing deployment (#9)" This reverts commit b5fa92a. * Revert "Add kubetest2-kind for end to end testing (#8)" This reverts commit e0d0ea7.
1 parent 9642045 commit 46f4caf

File tree

7 files changed

+2
-65
lines changed

7 files changed

+2
-65
lines changed

.github/workflows/build.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,5 @@ jobs:
1616
with:
1717
go-version: 1.17
1818

19-
- name: Run unit tests
19+
- name: make test
2020
run: make test
21-
22-
- name: Run acceptance tests
23-
run: make e2e-test

.gitignore

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,5 @@ cover.out
1010
# OSX trash
1111
.DS_Store
1212

13-
# mocks generated by mockgen
13+
#mocks generated by mockgen
1414
mocks/
15-
16-
# e2e test artifacts
17-
_artifacts/

Makefile

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -58,18 +58,6 @@ test: manifests generate generate-mocks fmt vet ## Run tests.
5858
test -f ${ENVTEST_ASSETS_DIR}/setup-envtest.sh || curl -sSLo ${ENVTEST_ASSETS_DIR}/setup-envtest.sh https://raw.githubusercontent.com/kubernetes-sigs/controller-runtime/v0.7.2/hack/setup-envtest.sh
5959
source ${ENVTEST_ASSETS_DIR}/setup-envtest.sh; fetch_envtest_tools $(ENVTEST_ASSETS_DIR); setup_envtest_env $(ENVTEST_ASSETS_DIR); go test ./... -coverprofile cover.out
6060

61-
KUBECTL=$(ENVTEST_ASSETS_DIR)/bin/kubectl
62-
TEST_CONFIG=$(shell pwd)/testconfig
63-
E2E_CLUSTER=aws-cloudmap-mcs-e2e
64-
e2e-test: manifests kustomize kubetest2 fmt vet
65-
$(KUBETEST2-KIND) --cluster-name $(E2E_CLUSTER) --up
66-
$(KUSTOMIZE) build config/crd | $(KUBECTL) apply -f -
67-
$(KUBECTL) create namespace aws-cloudmap-mcs-e2e
68-
$(KUBECTL) apply -f $(TEST_CONFIG)/e2e-deployment.yaml
69-
$(KUBECTL) apply -f $(TEST_CONFIG)/e2e-service-one.yaml
70-
$(KUBECTL) apply -f $(TEST_CONFIG)/e2e-export.yaml
71-
$(KUBETEST2-KIND) --cluster-name $(E2E_CLUSTER) --down
72-
7361
##@ Build
7462

7563
build: manifests generate generate-mocks fmt vet ## Build manager binary.
@@ -118,9 +106,6 @@ MOCKGEN = $(shell pwd)/bin/mockgen
118106
mockgen: ## Download mockgen
119107
$(call go-get-tool,$(MOCKGEN),github.com/golang/mock/[email protected])
120108

121-
KUBETEST2-KIND = $(shell pwd)/bin/kubetest2-kind
122-
kubetest2: ## Download kubetest2
123-
$(call go-get-tool,$(KUBETEST2-KIND),sigs.k8s.io/kubetest2/kubetest2-kind@latest)
124109

125110
# go-get-tool will 'go get' any package $2 and install it to $1.
126111
PROJECT_DIR := $(shell dirname $(abspath $(lastword $(MAKEFILE_LIST))))

pkg/api/v1alpha1/zz_generated.deepcopy.go

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

testconfig/e2e-deployment.yaml

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

testconfig/e2e-export.yaml

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

testconfig/e2e-service-one.yaml

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

0 commit comments

Comments
 (0)