From cb047cbcd492cfac220745b6509912de29b9344c Mon Sep 17 00:00:00 2001 From: Mike Elliott Date: Tue, 27 Mar 2018 12:34:57 -0400 Subject: [PATCH] Add repo index fix Fixes an issue where subchart build dependencies are not always resolved when using 'make repo' to start a local helm repo. Also added the start of a 'make repo-stop' to shutdown and cleanup a running local repo. Change-Id: I33667053637ea4980ad00e424378a156abbe1ad4 Issue-ID: OOM-830 Signed-off-by: Mike Elliott --- kubernetes/Makefile | 10 ++++++++-- kubernetes/common/Makefile | 1 + 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/kubernetes/Makefile b/kubernetes/Makefile index 7ba5ba934a..4962c825d8 100644 --- a/kubernetes/Makefile +++ b/kubernetes/Makefile @@ -47,17 +47,23 @@ lint-%: dep-% package-%: lint-% @mkdir -p $(PACKAGE_DIR) @if [ -f $*/Chart.yaml ]; then helm package -d $(PACKAGE_DIR) $*; fi + @helm repo index $(PACKAGE_DIR) clean: @rm -f */requirements.lock @rm -f *tgz */charts/*tgz - @rm -rf $(PACKAGE_DIR) + @rm -rf $(PACKAGE_DIR)/* -# start up a local helm repo to serve up +# start up a local helm repo to serve up helm chart packages repo: @mkdir -p $(PACKAGE_DIR) @helm serve --repo-path $(PACKAGE_DIR) & @helm repo index $(PACKAGE_DIR) @helm repo add local http://127.0.0.1:8879 + +# stop local helm repo +repo-stop: + @pkill helm + @helm repo remove local %: @: diff --git a/kubernetes/common/Makefile b/kubernetes/common/Makefile index a78cc88b89..d634a8c506 100644 --- a/kubernetes/common/Makefile +++ b/kubernetes/common/Makefile @@ -41,6 +41,7 @@ lint-%: dep-% package-%: lint-% @mkdir -p $(PACKAGE_DIR) @if [ -f $*/Chart.yaml ]; then helm package -d $(PACKAGE_DIR) $*; fi + @helm repo index $(PACKAGE_DIR) clean: @rm -f */requirements.lock -- 2.16.6