Skip to content

Commit f6e7553

Browse files
Fiona-Watersopenshift-ci[bot]
authored andcommitted
removing defaults make target
1 parent 484a3fa commit f6e7553

File tree

1 file changed

+5
-26
lines changed

1 file changed

+5
-26
lines changed

Makefile

Lines changed: 5 additions & 26 deletions
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 install-yq ## Generate RBAC objects.
@@ -173,11 +152,11 @@ modules: ## Update Go dependencies.
173152
go mod tidy
174153

175154
.PHONY: build
176-
build: modules defaults fmt vet ## Build manager binary.
155+
build: modules fmt vet ## Build manager binary.
177156
go build -o bin/manager main.go
178157

179158
.PHONY: run
180-
run: modules defaults manifests fmt vet ## Run a controller from your host.
159+
run: modules manifests fmt vet ## Run a controller from your host.
181160
go run ./main.go
182161

183162
.PHONY: image-build
@@ -290,7 +269,7 @@ validate-bundle: install-operator-sdk
290269
$(OPERATOR_SDK) bundle validate ./bundle --select-optional suite=operatorframework
291270

292271
.PHONY: bundle
293-
bundle: defaults manifests kustomize install-operator-sdk ## Generate bundle manifests and metadata, then validate generated files.
272+
bundle: manifests kustomize install-operator-sdk ## Generate bundle manifests and metadata, then validate generated files.
294273
$(OPERATOR_SDK) generate kustomize manifests -q
295274
cd config/manager && $(KUSTOMIZE) edit set image controller=$(IMG)
296275
cd config/manifests && $(KUSTOMIZE) edit add patch --patch '[{"op":"add", "path":"/metadata/annotations/containerImage", "value": "$(IMG)" }]' --kind ClusterServiceVersion
@@ -369,11 +348,11 @@ catalog-push: ## Push a catalog image.
369348
podman push $(CATALOG_IMG) $(CATALOG_PUSH_OPT)
370349

371350
.PHONY: test-unit
372-
test-unit: defaults manifests fmt vet envtest ## Run unit tests.
351+
test-unit: manifests fmt vet envtest ## Run unit tests.
373352
KUBEBUILDER_ASSETS="$(shell $(ENVTEST) use $(ENVTEST_K8S_VERSION) --bin-dir $(LOCALBIN) -p path)" go test $(go list ./... | grep -v /test/) -coverprofile cover.out
374353

375354
.PHONY: test-e2e
376-
test-e2e: defaults manifests fmt vet ## Run e2e tests.
355+
test-e2e: manifests fmt vet ## Run e2e tests.
377356
go test -timeout 30m -v ./test/e2e
378357

379358
.PHONY: kind-e2e

0 commit comments

Comments
 (0)