Skip to content

Commit 9bd5b96

Browse files
committed
Fix experimental CRD controller-gen code path
1 parent 1715e52 commit 9bd5b96

File tree

1 file changed

+3
-7
lines changed

1 file changed

+3
-7
lines changed

Makefile

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -352,7 +352,7 @@ vet: $(TIMESTAMPS_DIR)/vet ## Run go vet against code
352352
generate: ${GO_SOURCES} ## Generate code
353353
$(CONTROLLER_GEN) object:headerFile="hack/boilerplate.go.txt" paths="./api/..." paths="./internal/controller/..."
354354
ifdef EXPERIMENTAL
355-
$(CONTROLLER_GEN) object:headerFile="hack/boilerplate.go.txt" paths="./internal/nextapi/v1/..."
355+
$(CONTROLLER_GEN) object:headerFile="hack/boilerplate.go.txt" paths="./internal/nextapi/generated/v1/..."
356356
endif
357357
go tool -modfile=tools/toolbox/go.mod mockery
358358
$(MAKE) fmt
@@ -604,14 +604,10 @@ clear-e2e-leftovers: ## Clear the e2e test leftovers quickly
604604
git submodule update helm-charts
605605

606606
.PHONY: install-crds
607-
install-crds: manifests ## Install CRDs in Kubernetes
607+
install-crds: manifests gen-crds ## Install CRDs in Kubernetes
608608
kubectl apply -k config/crd
609609
ifdef EXPERIMENTAL
610-
@if [ -d internal/next-crds ] && find internal/next-crds -maxdepth 1 -name '*.yaml' | grep -q .; then \
611-
kubectl apply -f internal/next-crds/*.yaml; \
612-
else \
613-
echo "No experimental CRDs found, skipping apply."; \
614-
fi
610+
kubectl apply -f config/generated/crd/bases/crds.yaml
615611
endif
616612

617613
.PHONY: set-namespace

0 commit comments

Comments
 (0)