X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2FMakefile;h=1b24a7962c6a4694728dfedd7e52f1cfc89e2d8f;hb=b4a66f9df15d8b10a31cf531ea6e8bf0bf1dd37a;hp=9cbf90fba7019261332a3fda0ebe23af663bef91;hpb=114736eb5119b023bc5f166a3b42aaf933b0b223;p=oom.git

diff --git a/kubernetes/Makefile b/kubernetes/Makefile
index 9cbf90fba7..1b24a7962c 100644
--- a/kubernetes/Makefile
+++ b/kubernetes/Makefile
@@ -1,26 +1,49 @@
+# 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.
+# You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 PARENT_CHART := onap
 COMMON_CHARTS_DIR := common
-SETUP_CHARTS_DIR := setup
-#Order is important
-SHARED_CHARTS := common setup mysql dgbuilder
 # FIXME OOM-765
 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)
 
-EXCLUDES := $(COMMON_CHARTS_DIR) config oneclick readiness test dist helm $(PARENT_CHART) dcae
-EXCLUDES := $(SHARED_CHARTS) config oneclick readiness test dist $(PARENT_CHART) dcae
-HELM_CHARTS := $(filter-out $(EXCLUDES), $(patsubst %/.,%,$(wildcard */.))) $(PARENT_CHART)
+# 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
 
-.PHONY: $(EXCLUDES) $(HELM_CHARTS)
+ifneq ($(SKIP_LINT),TRUE)
+	HELM_LINT_CMD := $(HELM_BIN) lint
+else
+	HELM_LINT_CMD := echo "Skipping linting of"
+endif
 
-all: $(COMMON_CHARTS_DIR) $(HELM_CHARTS)
+SUBMODS := robot
+EXCLUDES := config oneclick readiness test dist helm $(PARENT_CHART) dcae $(SUBMODS)
+HELM_CHARTS := $(filter-out $(EXCLUDES), $(sort $(patsubst %/.,%,$(wildcard */.)))) $(PARENT_CHART)
 
-common:
-all: $(SHARED_CHARTS) $(HELM_CHARTS)
+.PHONY: $(EXCLUDES) $(HELM_CHARTS) check-for-staging-images
 
-$(SHARED_CHARTS):
+all: print_helm_bin $(COMMON_CHARTS_DIR) $(SUBMODS) $(HELM_CHARTS) helm-repo-update plugins
+
+$(COMMON_CHARTS):
 	@echo "\n[$@]"
 	@make package-$@
 
@@ -28,22 +51,47 @@ $(HELM_CHARTS):
 	@echo "\n[$@]"
 	@make package-$@
 
+$(SUBMODS):
+	@echo "\n[$@]"
+	@make submod-$@
+	@make package-$@
+
+submod-%:
+	@make $*/Chart.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 $*; fi
+	@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
+	@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 *tgz */charts/*tgz
-	@rm -rf $(PACKAGE_DIR)
+	@rm -f */Chart.lock
+	@find . -type f -name '*.tgz' -delete
+	@rm -rf $(PACKAGE_DIR)/*
+
+# publish helm plugins via distrubtion directory
+plugins:
+	@cp -R helm $(PACKAGE_DIR)/
+
+check-for-staging-images:
+	$(ROOT_DIR)/../.ci/check-for-staging-images.sh
+
+helm-repo-update:
+	@$(HELM_BIN) repo update
+
 %:
 	@: