X-Git-Url: https://gerrit.onap.org/r/gitweb?p=oom.git;a=blobdiff_plain;f=kubernetes%2FMakefile;h=7b19e6e77337e1339e826d807f1d2785847d4787;hp=08b028afe14cab95ee05517fe6a06562de3317b1;hb=refs%2Fheads%2Fmaster;hpb=380f9b87472820704216ed057a77c622200ccd56

diff --git a/kubernetes/Makefile b/kubernetes/Makefile
index 08b028afe1..b92d41fe3f 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.
@@ -20,10 +21,12 @@ 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}}")
-# use this if you would like to push onap charts to repo with other name
+
+HELM_VER := $(shell $(HELM_BIN) version --template "{{.Version}}" 2>/dev/null)
+
+# use this if you would like to cm-push onap charts to repo with other name
 # WARNING: Helm v3+ only
-# WARNING: Make sure to edit also requirements files
+# WARNING: Make sure to edit also Chart files
 HELM_REPO := local
 
 ifneq ($(SKIP_LINT),TRUE)
@@ -32,83 +35,69 @@ else
 	HELM_LINT_CMD := echo "Skipping linting of"
 endif
 
-SUBMODS := robot aai
-EXCLUDES := config oneclick readiness test dist helm $(PARENT_CHART) dcae $(SUBMODS)
-HELM_CHARTS := $(filter-out $(EXCLUDES), $(sort $(patsubst %/.,%,$(wildcard */.)))) $(PARENT_CHART)
+SUBMODS := robot
+EXCLUDES := common config oneclick readiness test dist helm $(PARENT_CHART) dcae $(SUBMODS)
+HELM_CHARTS := $(filter-out $(EXCLUDES), $(sort $(patsubst %/.,%,$(wildcard */.))))
 
 .PHONY: $(EXCLUDES) $(HELM_CHARTS) check-for-staging-images
 
-all: $(COMMON_CHARTS_DIR) $(SUBMODS) $(HELM_CHARTS) helm-repo-update plugins
+all: print_helm_bin $(COMMON_CHARTS_DIR) $(SUBMODS) $(HELM_CHARTS) $(PARENT_CHART) helm-repo-update plugins
 
-$(COMMON_CHARTS):
+$(COMMON_CHARTS_DIR):
 	@echo "\n[$@]"
 	@make package-$@
 
-$(HELM_CHARTS):
+$(HELM_CHARTS): $(COMMON_CHARTS_DIR)
 	@echo "\n[$@]"
 	@make package-$@
 
-$(SUBMODS):
+$(SUBMODS): $(COMMON_CHARTS_DIR)
 	@echo "\n[$@]"
 	@make submod-$@
 	@make package-$@
 
+$(PARENT_CHART): $(HELM_CHARTS)
+	@echo "\n[$@]"
+	@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_BIN) 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)
-ifeq "$(findstring v3,$(HELM_VER))" "v3"
-	@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
-else
-	@if [ -f $*/Chart.yaml ]; then $(HELM_BIN) package -d $(PACKAGE_DIR) $*; fi
-	@$(HELM_BIN) repo index $(PACKAGE_DIR)
-endif
+	@if [ -f $*/Chart.yaml ]; then PACKAGE_NAME=$$($(HELM_BIN) package -d $(PACKAGE_DIR) $* | cut -d":" -f2) && $(HELM_BIN) cm-push -f $$PACKAGE_NAME $(HELM_REPO); fi
+	@sleep 3
 
 clean:
-	@rm -f */requirements.lock
+	@rm -f */Chart.lock
 	@find . -type f -name '*.tgz' -delete
 	@rm -rf $(PACKAGE_DIR)/*
 
 # publish helm plugins via distrubtion directory
 plugins:
-	@cp -R $(HELM_BIN) $(PACKAGE_DIR)/
-
-# start up a local helm repo to serve up helm chart packages
-# WARNING: Only helm < v3 supported
-repo:
 	@mkdir -p $(PACKAGE_DIR)
-	@$(HELM_BIN) serve --repo-path $(PACKAGE_DIR) &
-	@sleep 3
-	@$(HELM_BIN) repo index $(PACKAGE_DIR)
-	@$(HELM_BIN) repo add local http://127.0.0.1:8879
-
-# stop local helm repo
-# WARNING: Only helm < v3 supported
-repo-stop:
-	@pkill $(HELM_BIN)
-	@$(HELM_BIN) repo remove local
+	@cp -R helm $(PACKAGE_DIR)/
 
 check-for-staging-images:
-	$(ROOT_DIR)/contrib/tools/check-for-staging-images.sh
+	$(ROOT_DIR)/../.ci/check-for-staging-images.sh
 
-helm-repo-update:
-ifeq "$(findstring v3,$(HELM_VER))" "v3"
+helm-repo-update: $(PARENT_CHART)
 	@$(HELM_BIN) repo update
-endif
 
 %:
-	@:
+	@:
\ No newline at end of file