Code Review
/
oom.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "[CONSUL] Add limits to consul chart."
[oom.git]
/
kubernetes
/
clamp
/
components
/
Makefile
diff --git
a/kubernetes/clamp/components/Makefile
b/kubernetes/clamp/components/Makefile
index
acaf7fb
..
bf267b7
100644
(file)
--- a/
kubernetes/clamp/components/Makefile
+++ b/
kubernetes/clamp/components/Makefile
@@
-18,6
+18,7
@@
PACKAGE_DIR := $(OUTPUT_DIR)/packages
SECRET_DIR := $(OUTPUT_DIR)/secrets
EXCLUDES :=
SECRET_DIR := $(OUTPUT_DIR)/secrets
EXCLUDES :=
+HELM_BIN := helm
HELM_CHARTS := $(filter-out $(EXCLUDES), $(sort $(patsubst %/.,%,$(wildcard */.))))
.PHONY: $(EXCLUDES) $(HELM_CHARTS)
HELM_CHARTS := $(filter-out $(EXCLUDES), $(sort $(patsubst %/.,%,$(wildcard */.))))
.PHONY: $(EXCLUDES) $(HELM_CHARTS)
@@
-32,19
+33,19
@@
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 $*/requirements.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)
package-%: lint-%
@mkdir -p $(PACKAGE_DIR)
- @if [ -f $*/Chart.yaml ]; then
helm
package -d $(PACKAGE_DIR) $*; fi
- @
helm
repo index $(PACKAGE_DIR)
+ @if [ -f $*/Chart.yaml ]; then
$(HELM_BIN)
package -d $(PACKAGE_DIR) $*; fi
+ @
$(HELM_BIN)
repo index $(PACKAGE_DIR)
clean:
@rm -f */requirements.lock
@rm -f *tgz */charts/*tgz
@rm -rf $(PACKAGE_DIR)
%:
clean:
@rm -f */requirements.lock
@rm -f *tgz */charts/*tgz
@rm -rf $(PACKAGE_DIR)
%:
- @:
\ No newline at end of file
+ @: