diff options
Diffstat (limited to 'kubernetes/Makefile')
| -rw-r--r-- | kubernetes/Makefile | 38 |
1 files changed, 6 insertions, 32 deletions
diff --git a/kubernetes/Makefile b/kubernetes/Makefile index d994397269..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. @@ -21,16 +22,11 @@ PACKAGE_DIR := $(OUTPUT_DIR)/packages SECRET_DIR := $(OUTPUT_DIR)/secrets HELM_BIN := helm -# Helm v2 and helm v3 uses different version format so we first try in helm v3 format -# and if it fails then we fallback to helm v2 one HELM_VER := $(shell $(HELM_BIN) version --template "{{.Version}}" 2>/dev/null) -ifneq "$(findstring v3,$(HELM_VER))" "v3" - HELM_VER := $(shell $(HELM_BIN) version -c --template "{{.Client.SemVer}}") -endif # 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 requirements files +# WARNING: Make sure to edit also Chart files HELM_REPO := local ifneq ($(SKIP_LINT),TRUE) @@ -61,9 +57,9 @@ $(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: @@ -73,22 +69,17 @@ 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 clean: - @rm -f */requirements.lock + @rm -f */Chart.lock @find . -type f -name '*.tgz' -delete @rm -rf $(PACKAGE_DIR)/* @@ -96,28 +87,11 @@ clean: plugins: @cp -R helm $(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 - check-for-staging-images: $(ROOT_DIR)/contrib/tools/check-for-staging-images.sh helm-repo-update: -ifeq "$(findstring v3,$(HELM_VER))" "v3" @$(HELM_BIN) repo update -endif %: @: |