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 "[DCAE] Version updates for Kohn"
[oom.git]
/
kubernetes
/
appc
/
Makefile
diff --git
a/kubernetes/appc/Makefile
b/kubernetes/appc/Makefile
index
4c79718
..
08ed7cb
100644
(file)
--- a/
kubernetes/appc/Makefile
+++ b/
kubernetes/appc/Makefile
@@
-19,6
+19,12
@@
SECRET_DIR := $(OUTPUT_DIR)/secrets
EXCLUDES := dist resources templates charts docker
HELM_BIN := helm
EXCLUDES := dist resources templates charts docker
HELM_BIN := helm
+ifneq ($(SKIP_LINT),TRUE)
+ HELM_LINT_CMD := $(HELM_BIN) lint
+else
+ HELM_LINT_CMD := echo "Skipping linting of"
+endif
+
HELM_CHARTS := $(filter-out $(EXCLUDES), $(sort $(patsubst %/.,%,$(wildcard */.))))
.PHONY: $(EXCLUDES) $(HELM_CHARTS)
HELM_CHARTS := $(filter-out $(EXCLUDES), $(sort $(patsubst %/.,%,$(wildcard */.))))
.PHONY: $(EXCLUDES) $(HELM_CHARTS)
@@
-33,18
+39,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_BIN) dep up $*; fi
+ @if [ -f $*/
Chart
.yaml ]; then $(HELM_BIN) dep up $*; fi
lint-%: dep-%
lint-%: dep-%
- @if [ -f $*/Chart.yaml ]; then $(HELM_
BIN) lint
$*; fi
+ @if [ -f $*/Chart.yaml ]; then $(HELM_
LINT_CMD)
$*; fi
package-%: lint-%
@mkdir -p $(PACKAGE_DIR)
package-%: lint-%
@mkdir -p $(PACKAGE_DIR)
- @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) package -d $(PACKAGE_DIR) $*; fi
- @$(HELM_BIN) repo index $(PACKAGE_DIR)
+ @if [ -f $*/Chart.yaml ]; then PACKAGE_NAME=$$($(HELM_BIN) package -d $(PACKAGE_DIR) $* | cut -d":" -f2) && $(HELM_BIN) cm-push -f $$PACKAGE_NAME local; fi
+ @sleep 3
+ #@$(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)
%: