Skip to content

Commit 203ee10

Browse files
authored
[Improvement] Parametrize Make tools (#1167)
1 parent 1ced857 commit 203ee10

File tree

3 files changed

+11
-7
lines changed

3 files changed

+11
-7
lines changed

CHANGELOG.md

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
- (Refactoring) Extract Inspector Definitions package
99
- (Bugfix) Fix PDBs Version discovery
1010
- (Feature) Agency ArangoSync State check
11+
- (Improvement) Parametrize Make tools
1112

1213
## [1.2.20](https://github.com/arangodb/kube-arangodb/tree/1.2.20) (2022-10-25)
1314
- (Feature) Add action progress

Makefile

+9-6
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
CURRENT=$(shell dirname $(realpath $(firstword $(MAKEFILE_LIST))))
22
ROOT:=$(CURRENT)
33

4+
SED ?= sed
5+
REALPATH ?= realpath
6+
47
PROJECT := arangodb_operator
58
SCRIPTDIR := $(shell pwd)
69
ROOTDIR := $(shell cd $(SCRIPTDIR) && pwd)
@@ -279,7 +282,7 @@ update-generated:
279282
@rm -fr $(ORGDIR)
280283
@mkdir -p $(ORGDIR)
281284
@ln -s -f $(SCRIPTDIR) $(ORGDIR)/kube-arangodb
282-
@sed -e 's/^/\/\/ /' -e 's/ *$$//' $(ROOTDIR)/tools/codegen/license-header.txt > $(ROOTDIR)/tools/codegen/boilerplate.go.txt
285+
@$(SED) -e 's/^/\/\/ /' -e 's/ *$$//' $(ROOTDIR)/tools/codegen/license-header.txt > $(ROOTDIR)/tools/codegen/boilerplate.go.txt
283286
GOPATH=$(GOBUILDDIR) $(VENDORDIR)/k8s.io/code-generator/generate-groups.sh \
284287
"all" \
285288
"github.com/arangodb/kube-arangodb/pkg/generated" \
@@ -529,7 +532,7 @@ set-api-version/%:
529532
"$(ROOT)/pkg/apis/backup/" \
530533
"$(ROOT)/pkg/upgrade/" \
531534
| cut -d ':' -f 1 | sort | uniq \
532-
| xargs -n 1 sed -i "s#github.com/arangodb/kube-arangodb/pkg/apis/$*/v[A-Za-z0-9]\+#github.com/arangodb/kube-arangodb/pkg/apis/$*/v$(API_VERSION)#g"
535+
| xargs -n 1 $(SED) -i "s#github.com/arangodb/kube-arangodb/pkg/apis/$*/v[A-Za-z0-9]\+#github.com/arangodb/kube-arangodb/pkg/apis/$*/v$(API_VERSION)#g"
533536
@grep -rHn "DatabaseV[A-Za-z0-9]\+()" \
534537
"$(ROOT)/pkg/deployment/" \
535538
"$(ROOT)/pkg/replication/" \
@@ -540,7 +543,7 @@ set-api-version/%:
540543
"$(ROOT)/pkg/apis/backup/" \
541544
"$(ROOT)/pkg/upgrade/" \
542545
| cut -d ':' -f 1 | sort | uniq \
543-
| xargs -n 1 sed -i "s#DatabaseV[A-Za-z0-9]\+()\.#DatabaseV$(API_VERSION)().#g"
546+
| xargs -n 1 $(SED) -i "s#DatabaseV[A-Za-z0-9]\+()\.#DatabaseV$(API_VERSION)().#g"
544547
@grep -rHn "ReplicationV[A-Za-z0-9]\+()" \
545548
"$(ROOT)/pkg/deployment/" \
546549
"$(ROOT)/pkg/replication/" \
@@ -551,12 +554,12 @@ set-api-version/%:
551554
"$(ROOT)/pkg/apis/backup/" \
552555
"$(ROOT)/pkg/upgrade/" \
553556
| cut -d ':' -f 1 | sort | uniq \
554-
| xargs -n 1 sed -i "s#ReplicationV[A-Za-z0-9]\+()\.#ReplicationV$(API_VERSION)().#g"
557+
| xargs -n 1 $(SED) -i "s#ReplicationV[A-Za-z0-9]\+()\.#ReplicationV$(API_VERSION)().#g"
555558

556559
synchronize-v2alpha1-with-v1:
557560
@rm -f pkg/apis/deployment/v1/zz_generated.deepcopy.go pkg/apis/deployment/v2alpha1/zz_generated.deepcopy.go
558-
@for file in $$(find "$(ROOT)/pkg/apis/deployment/v1/" -type f -exec realpath --relative-to "$(ROOT)/pkg/apis/deployment/v1/" {} \;); do if [ ! -d "$(ROOT)/pkg/apis/deployment/v2alpha1/$$(dirname $${file})" ]; then mkdir -p "$(ROOT)/pkg/apis/deployment/v2alpha1/$$(dirname $${file})"; fi; done
559-
@for file in $$(find "$(ROOT)/pkg/apis/deployment/v1/" -type f -exec realpath --relative-to "$(ROOT)/pkg/apis/deployment/v1/" {} \;); do cat "$(ROOT)/pkg/apis/deployment/v1/$${file}" | sed "s#package v1#package v2alpha1#g" | sed 's#ArangoDeploymentVersion = "v1"#ArangoDeploymentVersion = "v2alpha1"#g' > "$(ROOT)/pkg/apis/deployment/v2alpha1/$${file}"; done
561+
@for file in $$(find "$(ROOT)/pkg/apis/deployment/v1/" -type f -exec $(REALPATH) --relative-to "$(ROOT)/pkg/apis/deployment/v1/" {} \;); do if [ ! -d "$(ROOT)/pkg/apis/deployment/v2alpha1/$$(dirname $${file})" ]; then mkdir -p "$(ROOT)/pkg/apis/deployment/v2alpha1/$$(dirname $${file})"; fi; done
562+
@for file in $$(find "$(ROOT)/pkg/apis/deployment/v1/" -type f -exec $(REALPATH) --relative-to "$(ROOT)/pkg/apis/deployment/v1/" {} \;); do cat "$(ROOT)/pkg/apis/deployment/v1/$${file}" | $(SED) "s#package v1#package v2alpha1#g" | $(SED) 's#ArangoDeploymentVersion = "v1"#ArangoDeploymentVersion = "v2alpha1"#g' > "$(ROOT)/pkg/apis/deployment/v2alpha1/$${file}"; done
560563
@make update-generated
561564
@make set-deployment-api-version-v2alpha1 bin
562565
@make set-deployment-api-version-v1 bin

community.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
.PHONY: vendor-pre
22

33
vendor-pre:
4-
@sed -i "s#\tgithub.com/arangodb/rebalancer#\t// github.com/arangodb/rebalancer#g" "$(ROOT)/go.mod"
4+
@$(SED) -i "s#\tgithub.com/arangodb/rebalancer#\t// github.com/arangodb/rebalancer#g" "$(ROOT)/go.mod"
55

66
vendor: vendor-pre

0 commit comments

Comments
 (0)