Skip to content

Commit 3b2f041

Browse files
committed
removing defaults make target
1 parent b938a58 commit 3b2f041

File tree

1 file changed

+5
-26
lines changed

1 file changed

+5
-26
lines changed

Makefile

+5-26
Original file line numberDiff line numberDiff line change
@@ -125,27 +125,6 @@ help: ## Display this help.
125125

126126
##@ Development
127127

128-
DEFAULTS_TEST_FILE := test/support/defaults.go
129-
130-
.PHONY: defaults
131-
defaults:
132-
$(info Regenerating $(DEFAULTS_TEST_FILE))
133-
@echo "package support" > $(DEFAULTS_TEST_FILE)
134-
@echo "" >> $(DEFAULTS_TEST_FILE)
135-
@echo "// ***********************" >> $(DEFAULTS_TEST_FILE)
136-
@echo "// DO NOT EDIT THIS FILE" >> $(DEFAULTS_TEST_FILE)
137-
@echo "// ***********************" >> $(DEFAULTS_TEST_FILE)
138-
@echo "" >> $(DEFAULTS_TEST_FILE)
139-
@echo "const (" >> $(DEFAULTS_TEST_FILE)
140-
@echo " CodeFlareSDKVersion = \"$(CODEFLARE_SDK_VERSION)\"" >> $(DEFAULTS_TEST_FILE)
141-
@echo " RayVersion = \"$(RAY_VERSION)\"" >> $(DEFAULTS_TEST_FILE)
142-
@echo " RayImage = \"$(RAY_IMAGE)\"" >> $(DEFAULTS_TEST_FILE)
143-
@echo "" >> $(DEFAULTS_TEST_FILE)
144-
@echo ")" >> $(DEFAULTS_TEST_FILE)
145-
@echo "" >> $(DEFAULTS_TEST_FILE)
146-
147-
gofmt -w $(DEFAULTS_TEST_FILE)
148-
149128
# this encounters sed issues on MacOS, quick fix is to use gsed or to escape the parentheses i.e. \( \)
150129
.PHONY: manifests
151130
manifests: controller-gen kustomize ## Generate RBAC objects.
@@ -172,11 +151,11 @@ modules: ## Update Go dependencies.
172151
go mod tidy
173152

174153
.PHONY: build
175-
build: modules defaults fmt vet ## Build manager binary.
154+
build: modules fmt vet ## Build manager binary.
176155
go build -o bin/manager main.go
177156

178157
.PHONY: run
179-
run: modules defaults manifests fmt vet ## Run a controller from your host.
158+
run: modules manifests fmt vet ## Run a controller from your host.
180159
go run ./main.go
181160

182161
.PHONY: image-build
@@ -283,7 +262,7 @@ validate-bundle: install-operator-sdk
283262
$(OPERATOR_SDK) bundle validate ./bundle --select-optional suite=operatorframework
284263

285264
.PHONY: bundle
286-
bundle: defaults manifests kustomize install-operator-sdk ## Generate bundle manifests and metadata, then validate generated files.
265+
bundle: manifests kustomize install-operator-sdk ## Generate bundle manifests and metadata, then validate generated files.
287266
$(OPERATOR_SDK) generate kustomize manifests -q
288267
cd config/manager && $(KUSTOMIZE) edit set image controller=$(IMG)
289268
cd config/manifests && $(KUSTOMIZE) edit add patch --patch '[{"op":"add", "path":"/metadata/annotations/containerImage", "value": "$(IMG)" }]' --kind ClusterServiceVersion
@@ -362,11 +341,11 @@ catalog-push: ## Push a catalog image.
362341
podman push $(CATALOG_IMG) $(CATALOG_PUSH_OPT)
363342

364343
.PHONY: test-unit
365-
test-unit: defaults manifests fmt vet envtest ## Run unit tests.
344+
test-unit: manifests fmt vet envtest ## Run unit tests.
366345
KUBEBUILDER_ASSETS="$(shell $(ENVTEST) use $(ENVTEST_K8S_VERSION) --bin-dir $(LOCALBIN) -p path)" go test $(go list ./... | grep -v /test/) -coverprofile cover.out
367346

368347
.PHONY: test-e2e
369-
test-e2e: defaults manifests fmt vet ## Run e2e tests.
348+
test-e2e: manifests fmt vet ## Run e2e tests.
370349
go test -timeout 30m -v ./test/e2e
371350

372351
.PHONY: kind-e2e

0 commit comments

Comments
 (0)