Skip to content

Commit 82f917b

Browse files
committed
ci: fixed generate chart target for working in mac
Signed-off-by: Tomer Figenblat <[email protected]>
1 parent 60370c8 commit 82f917b

File tree

2 files changed

+11
-3
lines changed

2 files changed

+11
-3
lines changed

Makefile

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,11 +74,17 @@ VERSION_ENVTEST = release-0.19
7474
#####################################
7575
OS=$(shell go env GOOS)
7676
ARCH=$(shell go env GOARCH)
77+
7778
ifeq ($(OS),darwin)
7879
DATE_BIN = gdate
80+
FIND_BIN = gfind
81+
PASTE_BIN = gpaste
7982
else
8083
DATE_BIN = date
84+
FIND_BIN = find
85+
PASTE_BIN = paste
8186
endif
87+
8288
BUILD_DATE = $(strip $(shell $(DATE_BIN) +%FT%T))
8389
BUILD_TIMESTAMP = $(strip $(shell $(DATE_BIN) -d "$(BUILD_DATE)" +%s))
8490
COMMIT_HASH = $(strip $(shell git rev-parse --short HEAD))
@@ -154,7 +160,7 @@ generate/chart: $(BIN_KUSTOMIZE) ## Generate a Helm Chart in a target folder. us
154160
@$(call verify-essential-tool,$(REQ_BIN_YQ),REQ_BIN_YQ)
155161
@$(call kustomize-setup)
156162
./hack/generate_chart.sh --bin_yq $(REQ_BIN_YQ) --bin_kustomize $(BIN_KUSTOMIZE) --bin_sed $(REQ_BIN_SED) \
157-
--chart_version $(CHART_VERSION) --target_folder $(CHART_TARGET)
163+
--bin_find $(FIND_BIN) --bin_paste $(PASTE_BIN) --chart_version $(CHART_VERSION) --target_folder $(CHART_TARGET)
158164
@$(call kustomize-cleanup)
159165

160166
################################################

hack/generate_chart.sh

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ transformers_folder=${transformers_folder:-hack/chart_transformers}
2626
bin_yq=${bin_yq:-yq}
2727
bin_kustomize=${bin_kustomize:-kustomize}
2828
bin_sed=${bin_sed:-sed}
29+
bin_find=${bin_find:-find}
30+
bin_paste=${bin_paste:-paste}
2931
app_version=${app_version:-$(<VERSION)}
3032

3133
# required named parameters
@@ -56,12 +58,12 @@ inject_helm_labels(){
5658
}
5759

5860
# iterate over all base templates and route each to its transformer
59-
transformers=$(find "$transformers_folder"/*.sh -maxdepth 1 -type f -printf '%f\n')
61+
transformers=$($bin_find "$transformers_folder"/*.sh -maxdepth 1 -type f -printf '%f\n')
6062
for temp_template in "$temp_folder"/templates/*.yml; do
6163
kind=$($bin_yq '.kind' "$temp_template")
6264
apiVersion=$($bin_yq '.apiVersion' "$temp_template")
6365
if [[ "$apiVersion" = *"/"* ]]; then
64-
ver_dot_group=$(tr '/' $'\n' <<< "$apiVersion" | tac | paste -s -d '.')
66+
ver_dot_group=$(tr '/' $'\n' <<< "$apiVersion" | tac | $bin_paste -s -d '.')
6567
transformer_name="$kind"."$ver_dot_group".sh
6668
# i.e. Deployment transformer_name will be Deployment.v1.apps.sh
6769
else

0 commit comments

Comments
 (0)