Skip to content

Commit

Permalink
Revert kubetest2 integration (#17)
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
astaticvoid authored Oct 8, 2021
1 parent 9642045 commit 2158517
Show file tree
Hide file tree
Showing 7 changed files with 2 additions and 65 deletions.
5 changes: 1 addition & 4 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,5 @@ jobs:
with:
go-version: 1.17

- name: Run unit tests
- name: make test
run: make test

- name: Run acceptance tests
run: make e2e-test
5 changes: 1 addition & 4 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,5 @@ cover.out
# OSX trash
.DS_Store

# mocks generated by mockgen
#mocks generated by mockgen
mocks/

# e2e test artifacts
_artifacts/
15 changes: 0 additions & 15 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -58,18 +58,6 @@ test: manifests generate generate-mocks fmt vet ## Run tests.
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
source ${ENVTEST_ASSETS_DIR}/setup-envtest.sh; fetch_envtest_tools $(ENVTEST_ASSETS_DIR); setup_envtest_env $(ENVTEST_ASSETS_DIR); go test ./... -coverprofile cover.out

KUBECTL=$(ENVTEST_ASSETS_DIR)/bin/kubectl
TEST_CONFIG=$(shell pwd)/testconfig
E2E_CLUSTER=aws-cloudmap-mcs-e2e
e2e-test: manifests kustomize kubetest2 fmt vet
$(KUBETEST2-KIND) --cluster-name $(E2E_CLUSTER) --up
$(KUSTOMIZE) build config/crd | $(KUBECTL) apply -f -
$(KUBECTL) create namespace aws-cloudmap-mcs-e2e
$(KUBECTL) apply -f $(TEST_CONFIG)/e2e-deployment.yaml
$(KUBECTL) apply -f $(TEST_CONFIG)/e2e-service-one.yaml
$(KUBECTL) apply -f $(TEST_CONFIG)/e2e-export.yaml
$(KUBETEST2-KIND) --cluster-name $(E2E_CLUSTER) --down

##@ Build

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

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

# go-get-tool will 'go get' any package $2 and install it to $1.
PROJECT_DIR := $(shell dirname $(abspath $(lastword $(MAKEFILE_LIST))))
Expand Down
1 change: 0 additions & 1 deletion pkg/api/v1alpha1/zz_generated.deepcopy.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

22 changes: 0 additions & 22 deletions testconfig/e2e-deployment.yaml

This file was deleted.

7 changes: 0 additions & 7 deletions testconfig/e2e-export.yaml

This file was deleted.

12 changes: 0 additions & 12 deletions testconfig/e2e-service-one.yaml

This file was deleted.

0 comments on commit 2158517

Please sign in to comment.