Skip to content
This repository was archived by the owner on Jun 26, 2023. It is now read-only.

Remove the hack for unserved versions in envtest #1471

Merged
k8s-ci-robot merged 1 commit into from
Apr 12, 2021
+1 −27
Merged

Remove the hack for unserved versions in envtest #1471

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion incubator/hnc/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,6 @@ all: test docker-build

# Run tests
test: build
./hack/crd_patches/ensure-all-served-for-envtest.sh
@echo
@echo "If tests fail due to no matches for kind \"CustomResourceDefinition\" in version \"apiextensions.k8s.io/v1\","
@echo "please remove the old kubebuilder and reinstall it - https://book.kubebuilder.io/quick-start.html#installation"
Expand Down
21 changes: 0 additions & 21 deletions incubator/hnc/hack/crd_patches/ensure-all-served-for-envtest.sh
View file
Open in desktop

This file was deleted.

6 changes: 1 addition & 5 deletions incubator/hnc/internal/reconcilers/suite_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,11 +71,7 @@ var _ = BeforeSuite(func(done Done) {

By("bootstrapping test environment")
testEnv = &envtest.Environment{
// We set path to "../../manifests/envtest/" as a workaround for a known
// envtest bug. We should set it back to "../../config/crd/bases/" after the
// bug is fixed in controller-runtime. See issue -
// https://github.com/kubernetes-sigs/multi-tenancy/issues/1148
CRDDirectoryPaths: []string{filepath.Join("..", "..", "manifests", "envtest")},
CRDDirectoryPaths: []string{filepath.Join("..", "..", "config", "crd", "bases")},
}

var err error
Expand Down