X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2FMakefile;h=f96a32a4f0a257fc9e335085537c35184021c997;hb=370c6dc33e55bfee7b3b79bcc21481b02a3f1e24;hp=faa96df81118e2c65526290249f15504b552bf0b;hpb=5d30d8e17f6fc68bc2f818ad81b5cefd85ba1f00;p=oom.git

diff --git a/kubernetes/Makefile b/kubernetes/Makefile
index faa96df811..f96a32a4f0 100644
--- a/kubernetes/Makefile
+++ b/kubernetes/Makefile
@@ -1,4 +1,5 @@
 # Copyright © 2017 Amdocs, Bell Canada
+# Modification copyright (C) 2021 Nordix Foundation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -19,20 +20,28 @@ ROOT_DIR := $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))
 OUTPUT_DIR := $(ROOT_DIR)/dist
 PACKAGE_DIR := $(OUTPUT_DIR)/packages
 SECRET_DIR := $(OUTPUT_DIR)/secrets
+HELM_BIN := helm
+
+HELM_VER := $(shell $(HELM_BIN) version --template "{{.Version}}" 2>/dev/null)
+
+# use this if you would like to push onap charts to repo with other name
+# WARNING: Helm v3+ only
+# WARNING: Make sure to edit also Chart files
+HELM_REPO := local
 
 ifneq ($(SKIP_LINT),TRUE)
-	HELM_LINT_CMD := helm lint
+	HELM_LINT_CMD := $(HELM_BIN) lint
 else
 	HELM_LINT_CMD := echo "Skipping linting of"
 endif
 
-SUBMODS := robot aai
+SUBMODS := robot
 EXCLUDES := config oneclick readiness test dist helm $(PARENT_CHART) dcae $(SUBMODS)
-HELM_CHARTS := $(filter-out $(EXCLUDES), $(sort $(patsubst %/.,%,$(wildcard */.)))) $(SUBMODS) $(PARENT_CHART)
+HELM_CHARTS := $(filter-out $(EXCLUDES), $(sort $(patsubst %/.,%,$(wildcard */.)))) $(PARENT_CHART)
 
-.PHONY: $(EXCLUDES) $(HELM_CHARTS)
+.PHONY: $(EXCLUDES) $(HELM_CHARTS) check-for-staging-images
 
-all: $(COMMON_CHARTS_DIR) $(SUBMODS) $(HELM_CHARTS) plugins
+all: print_helm_bin $(COMMON_CHARTS_DIR) $(SUBMODS) $(HELM_CHARTS) helm-repo-update plugins
 
 $(COMMON_CHARTS):
 	@echo "\n[$@]"
@@ -48,28 +57,29 @@ $(SUBMODS):
 	@make package-$@
 
 submod-%:
-	@make $*/requirements.yaml
+	@make $*/Chart.yaml
 
-%/requirements.yaml:
+%/Chart.yaml:
 	$(error Submodule $* needs to be retrieved from gerrit.  See https://wiki.onap.org/display/DW/OOM+-+Development+workflow+after+code+transfer+to+tech+teams ); fi
 
+print_helm_bin:
+	$(info Using Helm binary ${HELM_BIN} which is helm version ${HELM_VER})
 
 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-%
 	@if [ -f $*/Chart.yaml ]; then $(HELM_LINT_CMD) $*; fi
 
 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 PACKAGE_NAME=$$($(HELM_BIN) package -d $(PACKAGE_DIR) $* | cut -d":" -f2) && $(HELM_BIN) push -f $$PACKAGE_NAME $(HELM_REPO); fi
 
 clean:
-	@rm -f */requirements.lock
+	@rm -f */Chart.lock
 	@find . -type f -name '*.tgz' -delete
 	@rm -rf $(PACKAGE_DIR)/*
 
@@ -77,16 +87,11 @@ clean:
 plugins:
 	@cp -R helm $(PACKAGE_DIR)/
 
-# 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
+check-for-staging-images:
+	$(ROOT_DIR)/contrib/tools/check-for-staging-images.sh
+
+helm-repo-update:
+	@$(HELM_BIN) repo update
+
 %:
 	@: