-
Notifications
You must be signed in to change notification settings - Fork 16
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
GA v1.8.0 merge develop to master branch (#235)
- Loading branch information
Arbel Nathan
authored
Dec 16, 2021
1 parent
c3112cd
commit d575a90
Showing
32 changed files
with
4,439 additions
and
1,245 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -39,11 +39,11 @@ manifests: controller-gen kustomize## Generate WebhookConfiguration, ClusterRole | |
generate: controller-gen ## Generate code containing DeepCopy, DeepCopyInto, and DeepCopyObject method implementations. | ||
$(CONTROLLER_GEN) object:headerFile="hack/boilerplate.go.txt" paths="./..." | ||
|
||
CONTROLLER_GEN = $(shell pwd)/bin/controller-gen | ||
CONTROLLER_GEN = controller-gen | ||
controller-gen: ## Download controller-gen locally if necessary. | ||
$(call go-get-tool,$(CONTROLLER_GEN),sigs.k8s.io/controller-tools/cmd/[email protected]) | ||
|
||
KUSTOMIZE = $(shell pwd)/bin/kustomize | ||
KUSTOMIZE = kustomize | ||
kustomize: ## Download kustomize locally if necessary. | ||
$(call go-get-tool,$(KUSTOMIZE),sigs.k8s.io/kustomize/kustomize/[email protected]) | ||
|
||
|
@@ -55,26 +55,43 @@ TMP_DIR=$$(mktemp -d) ;\ | |
cd $$TMP_DIR ;\ | ||
go mod init tmp ;\ | ||
echo "Downloading $(2)" ;\ | ||
GOBIN=$(PROJECT_DIR)/bin go get $(2) ;\ | ||
go get $(2) ;\ | ||
rm -rf $$TMP_DIR ;\ | ||
} | ||
endef | ||
|
||
# custom | ||
run_unit_tests_image=docker run --rm -v $(CURDIR):/go/src/github.com/IBM/ibm-block-csi-operator -t operator-unittests | ||
|
||
.PHONY: olm-validation | ||
olm-validation: | ||
build/ci/olm_validation.sh | ||
|
||
.PHONY: build-unit-tests-image | ||
build-unit-tests-image: | ||
docker build -f build/ci/Dockerfile.unittest -t operator-unittests . | ||
|
||
.PHONY: run-unit-tests | ||
run-unit-tests: | ||
$(run_unit_tests_image) make test | ||
|
||
.PHONY: test | ||
test: update | ||
hack/check-generated-manifests.sh | ||
test: check-generated-manifests update | ||
ginkgo -r -v -skipPackage tests | ||
|
||
.PHONY: update | ||
update: | ||
update: kustomize | ||
hack/update-all.sh | ||
|
||
.PHONY: check-generated-manifests | ||
check-generated-manifests: | ||
hack/check-generated-manifests.sh | ||
|
||
.PHONY: update-generated-yamls | ||
update-generated-yamls: | ||
$(run_unit_tests_image) hack/update-config-yamls.sh | ||
$(run_unit_tests_image) hack/update-installer.sh | ||
|
||
.PHONY: list | ||
list: | ||
@$(MAKE) -pRrq -f $(lastword $(MAKEFILE_LIST)) : 2>/dev/null | awk -v RS= -F: '/^# File/,/^# Finished Make data base/ {if ($$1 !~ "^[#.]") {print $$1}}' | sort | egrep -v -e '^[^[:alnum:]]' -e '^$@$$' |
Oops, something went wrong.