|
2 | 2 | OPERATOR_NAME = example-operator
|
3 | 3 | OPERATOR_CATALOG_DIR = catalog/$(OPERATOR_NAME)
|
4 | 4 | OPERATOR_CATALOG_CONTRIBUTION = $(OPERATOR_CATALOG_DIR)/catalog.yaml
|
5 |
| -STEP_PASS = \033[0;32m |
6 |
| -STEP_FAIL = \033[0;31m |
7 |
| -NO_COLOR = \033[0m |
8 | 5 | YQ = bin/yq
|
9 | 6 |
|
10 | 7 |
|
@@ -65,39 +62,32 @@ semver: bin/opm semver-veneer.yaml clean
|
65 | 62 | # all FBC must pass opm validation in order to be able to be used in a catalog
|
66 | 63 | .PHONY: sanity
|
67 | 64 | sanity: bin/opm $(OPERATOR_CATALOG_CONTRIBUTION) preverify
|
68 |
| - @bin/opm validate catalog; \ |
69 |
| - if [ $$? -ne 0 ] ; then \ |
70 |
| - echo "opm validate catalog $(STEP_FAIL)[FAIL]$(NO_COLOR)\n"; \ |
71 |
| - else \ |
72 |
| - echo "opm validate catalog $(STEP_PASS)[PASS]$(NO_COLOR)\n"; \ |
73 |
| - fi |
| 65 | + bin/opm validate catalog |
| 66 | + |
74 | 67 |
|
75 | 68 | # preverify target ensures that the operator name is consistent between the destination directory and the generated catalog
|
76 | 69 | # since the veneer will be modified outside the build process but needs to be consistent with the directory name
|
77 | 70 | .PHONY: preverify
|
78 | 71 | preverify: $(YQ) $(OPERATOR_CATALOG_CONTRIBUTION)
|
79 |
| - @./sanity.sh -q -n $(OPERATOR_NAME) -f $(OPERATOR_CATALOG_CONTRIBUTION); \ |
80 |
| - if [ $$? -ne 0 ] ; then \ |
81 |
| - echo "operator name MISMATCH in catalog contribution and Makefile $(STEP_FAIL)[FAIL]$(NO_COLOR)"; \ |
82 |
| - false; \ |
83 |
| - else \ |
84 |
| - echo "operator name matches in catalog contribution and Makefile $(STEP_PASS)[PASS]$(NO_COLOR)"; \ |
85 |
| - fi |
| 72 | + ./sanity.sh -n $(OPERATOR_NAME) -f $(OPERATOR_CATALOG_CONTRIBUTION) |
86 | 73 |
|
87 | 74 |
|
88 | 75 | .PHONY: clean
|
89 | 76 | clean:
|
90 | 77 | rm -rf catalog
|
91 | 78 |
|
| 79 | + |
92 | 80 | OS=$(shell uname -s | tr '[:upper:]' '[:lower:]')
|
93 | 81 | ARCH=$(shell uname -m | sed 's/x86_64/amd64/')
|
94 | 82 | OPM_VERSION ?= v1.26.1
|
95 | 83 | bin/opm:
|
96 | 84 | mkdir -p bin
|
97 | 85 | curl -sLO https://github.com/operator-framework/operator-registry/releases/download/$(OPM_VERSION)/$(OS)-$(ARCH)-opm && chmod +x $(OS)-$(ARCH)-opm && mv $(OS)-$(ARCH)-opm bin/opm
|
98 | 86 |
|
| 87 | + |
99 | 88 | YQ_VERSION=v4.22.1
|
100 | 89 | YQ_BINARY=yq_$(OS)_$(ARCH)
|
101 | 90 | $(YQ):
|
102 | 91 | if [ ! -e bin ] ; then mkdir -p bin; fi
|
103 | 92 | wget https://github.com/mikefarah/yq/releases/download/${YQ_VERSION}/${YQ_BINARY} -O bin/${YQ_BINARY} && mv -f bin/${YQ_BINARY} $(YQ) && chmod +x $(YQ)
|
| 93 | + |
0 commit comments