Code Review
/
oom.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
[SDC] Update SDC docker images to 1.11.6
[oom.git]
/
kubernetes
/
portal
/
Makefile
diff --git
a/kubernetes/portal/Makefile
b/kubernetes/portal/Makefile
index
248fb05
..
2f6c6fe
100644
(file)
--- a/
kubernetes/portal/Makefile
+++ b/
kubernetes/portal/Makefile
@@
-18,8
+18,9
@@
PACKAGE_DIR := $(OUTPUT_DIR)/packages
SECRET_DIR := $(OUTPUT_DIR)/secrets
EXCLUDES := dist resources templates charts docker
SECRET_DIR := $(OUTPUT_DIR)/secrets
EXCLUDES := dist resources templates charts docker
+HELM_BIN := helm
HELM_CHARTS := $(filter-out $(EXCLUDES), $(sort $(patsubst %/.,%,$(wildcard */.))))
HELM_CHARTS := $(filter-out $(EXCLUDES), $(sort $(patsubst %/.,%,$(wildcard */.))))
-HELM_VER := $(shell
helm
version --template "{{.Version}}")
+HELM_VER := $(shell
$(HELM_BIN)
version --template "{{.Version}}")
.PHONY: $(EXCLUDES) $(HELM_CHARTS)
.PHONY: $(EXCLUDES) $(HELM_CHARTS)
@@
-33,22
+34,22
@@
make-%:
@if [ -f $*/Makefile ]; then make -C $*; fi
dep-%: make-%
@if [ -f $*/Makefile ]; then make -C $*; fi
dep-%: make-%
- @if [ -f $*/
requirements.yaml ]; then helm
dep up $*; fi
+ @if [ -f $*/
Chart.yaml ]; then $(HELM_BIN)
dep up $*; fi
lint-%: dep-%
lint-%: dep-%
- @if [ -f $*/Chart.yaml ]; then
helm
lint $*; fi
+ @if [ -f $*/Chart.yaml ]; then
$(HELM_BIN)
lint $*; fi
package-%: lint-%
@mkdir -p $(PACKAGE_DIR)
ifeq "$(findstring v3,$(HELM_VER))" "v3"
package-%: lint-%
@mkdir -p $(PACKAGE_DIR)
ifeq "$(findstring v3,$(HELM_VER))" "v3"
- @if [ -f $*/Chart.yaml ]; then PACKAGE_NAME=$$(
helm package -d $(PACKAGE_DIR) $* | cut -d":" -f2) && helm
push -f $$PACKAGE_NAME local; fi
+ @if [ -f $*/Chart.yaml ]; then PACKAGE_NAME=$$(
$(HELM_BIN) package -d $(PACKAGE_DIR) $* | cut -d":" -f2) && $(HELM_BIN)
push -f $$PACKAGE_NAME local; fi
else
else
- @if [ -f $*/Chart.yaml ]; then
helm
package -d $(PACKAGE_DIR) $*; fi
+ @if [ -f $*/Chart.yaml ]; then
$(HELM_BIN)
package -d $(PACKAGE_DIR) $*; fi
endif
endif
- @
helm
repo index $(PACKAGE_DIR)
+ @
$(HELM_BIN)
repo index $(PACKAGE_DIR)
clean:
clean:
- @rm -f */
requirements
.lock
+ @rm -f */
Chart
.lock
@rm -f *tgz */charts/*tgz
@rm -rf $(PACKAGE_DIR)
%:
@rm -f *tgz */charts/*tgz
@rm -rf $(PACKAGE_DIR)
%: