diff options
author | Krzysztof Opasiak <k.opasiak@samsung.com> | 2020-05-08 18:56:39 +0200 |
---|---|---|
committer | Sylvain Desbureaux <sylvain.desbureaux@orange.com> | 2020-05-12 07:46:30 +0000 |
commit | ebb1d7292fd23b4f1283876cfd921a1d29716e22 (patch) | |
tree | 5f91e754f76cd3f72ed4e2fb65c4bd8195fcf178 /kubernetes/sdnc | |
parent | b4d3b47ee2b0e1c84cd89ac722e75d2ec40cf857 (diff) |
[Tree-wide] Make chart build process predictible
ONAP is built using plain makefile rules. List of targets is generated
using wildcard function. Based on make changelog:
http://git.savannah.gnu.org/cgit/make.git/tree/NEWS
since version 3.82 wildcard is not going to sort its results which
means that charts are being processed in an arbitrary order which may
lead to build failure due to missing dependencies.
Since version 4.3 make started sorting the wildcard results once again
which may lead to build issues.
To avoid that and make our builds predictible independently from
Makefile version let's make sure that we always sort wildcard results.
Addinally let's use 'file://' instead of '@local' for charts in common
to resolve dependencies between them.
Issue-ID: OOM-2399
Signed-off-by: Krzysztof Opasiak <k.opasiak@samsung.com>
Change-Id: Iacb02dcdbd577ce0e9ca1078dd0586d296ec9375
(cherry picked from commit aae2da91becf5f1f56329d49656c1ad634917cba)
Diffstat (limited to 'kubernetes/sdnc')
-rw-r--r-- | kubernetes/sdnc/Makefile | 6 | ||||
-rw-r--r-- | kubernetes/sdnc/components/Makefile | 51 | ||||
-rw-r--r-- | kubernetes/sdnc/components/sdnc-prom/Chart.yaml (renamed from kubernetes/sdnc/sdnc-prom/Chart.yaml) | 0 | ||||
-rw-r--r-- | kubernetes/sdnc/components/sdnc-prom/requirements.yaml (renamed from kubernetes/sdnc/sdnc-prom/requirements.yaml) | 0 | ||||
-rwxr-xr-x | kubernetes/sdnc/components/sdnc-prom/resources/bin/ensureSdncActive.sh (renamed from kubernetes/sdnc/sdnc-prom/resources/bin/ensureSdncActive.sh) | 0 | ||||
-rwxr-xr-x | kubernetes/sdnc/components/sdnc-prom/resources/bin/ensureSdncStandby.sh (renamed from kubernetes/sdnc/sdnc-prom/resources/bin/ensureSdncStandby.sh) | 0 | ||||
-rwxr-xr-x | kubernetes/sdnc/components/sdnc-prom/resources/bin/prom.sh (renamed from kubernetes/sdnc/sdnc-prom/resources/bin/prom.sh) | 0 | ||||
-rwxr-xr-x | kubernetes/sdnc/components/sdnc-prom/resources/bin/sdnc.cluster (renamed from kubernetes/sdnc/sdnc-prom/resources/bin/sdnc.cluster) | 0 | ||||
-rwxr-xr-x | kubernetes/sdnc/components/sdnc-prom/resources/bin/sdnc.dnsswitch (renamed from kubernetes/sdnc/sdnc-prom/resources/bin/sdnc.dnsswitch) | 0 | ||||
-rwxr-xr-x | kubernetes/sdnc/components/sdnc-prom/resources/bin/sdnc.failover (renamed from kubernetes/sdnc/sdnc-prom/resources/bin/sdnc.failover) | 0 | ||||
-rwxr-xr-x | kubernetes/sdnc/components/sdnc-prom/resources/bin/sdnc.monitor (renamed from kubernetes/sdnc/sdnc-prom/resources/bin/sdnc.monitor) | 0 | ||||
-rwxr-xr-x | kubernetes/sdnc/components/sdnc-prom/resources/bin/switchVoting.sh (renamed from kubernetes/sdnc/sdnc-prom/resources/bin/switchVoting.sh) | 0 | ||||
-rw-r--r-- | kubernetes/sdnc/components/sdnc-prom/resources/config/config.json (renamed from kubernetes/sdnc/sdnc-prom/resources/config/config.json) | 0 | ||||
-rw-r--r-- | kubernetes/sdnc/components/sdnc-prom/resources/config/healthchecks.json (renamed from kubernetes/sdnc/sdnc-prom/resources/config/healthchecks.json) | 0 | ||||
-rw-r--r-- | kubernetes/sdnc/components/sdnc-prom/templates/configmap.yaml (renamed from kubernetes/sdnc/sdnc-prom/templates/configmap.yaml) | 0 | ||||
-rw-r--r-- | kubernetes/sdnc/components/sdnc-prom/templates/deployment.yaml (renamed from kubernetes/sdnc/sdnc-prom/templates/deployment.yaml) | 0 | ||||
-rw-r--r-- | kubernetes/sdnc/components/sdnc-prom/templates/pv.yaml (renamed from kubernetes/sdnc/sdnc-prom/templates/pv.yaml) | 0 | ||||
-rw-r--r-- | kubernetes/sdnc/components/sdnc-prom/templates/pvc.yaml (renamed from kubernetes/sdnc/sdnc-prom/templates/pvc.yaml) | 0 | ||||
-rw-r--r-- | kubernetes/sdnc/components/sdnc-prom/values.yaml (renamed from kubernetes/sdnc/sdnc-prom/values.yaml) | 0 |
19 files changed, 54 insertions, 3 deletions
diff --git a/kubernetes/sdnc/Makefile b/kubernetes/sdnc/Makefile index d634a8c506..e4b5dda95d 100644 --- a/kubernetes/sdnc/Makefile +++ b/kubernetes/sdnc/Makefile @@ -18,8 +18,8 @@ OUTPUT_DIR := $(ROOT_DIR)/../dist PACKAGE_DIR := $(OUTPUT_DIR)/packages SECRET_DIR := $(OUTPUT_DIR)/secrets -EXCLUDES := -HELM_CHARTS := $(filter-out $(EXCLUDES), $(patsubst %/.,%,$(wildcard */.))) +EXCLUDES := dist resources templates charts +HELM_CHARTS := $(filter-out $(EXCLUDES), $(sort $(patsubst %/.,%,$(wildcard */.)))) .PHONY: $(EXCLUDES) $(HELM_CHARTS) @@ -48,4 +48,4 @@ clean: @rm -f *tgz */charts/*tgz @rm -rf $(PACKAGE_DIR) %: - @:
\ No newline at end of file + @: diff --git a/kubernetes/sdnc/components/Makefile b/kubernetes/sdnc/components/Makefile new file mode 100644 index 0000000000..4e737638a6 --- /dev/null +++ b/kubernetes/sdnc/components/Makefile @@ -0,0 +1,51 @@ +# Copyright © 2017 Amdocs, Bell Canada +# +# 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. + +# 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 + +EXCLUDES := +HELM_CHARTS := $(filter-out $(EXCLUDES), $(sort $(patsubst %/.,%,$(wildcard */.)))) + +.PHONY: $(EXCLUDES) $(HELM_CHARTS) + +all: $(HELM_CHARTS) + +$(HELM_CHARTS): + @echo "\n[$@]" + @make package-$@ + +make-%: + @if [ -f $*/Makefile ]; then make -C $*; fi + +dep-%: make-% + @if [ -f $*/requirements.yaml ]; then helm dep up $*; fi + +lint-%: dep-% + @if [ -f $*/Chart.yaml ]; then helm lint $*; fi + +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) +%: + @: diff --git a/kubernetes/sdnc/sdnc-prom/Chart.yaml b/kubernetes/sdnc/components/sdnc-prom/Chart.yaml index 54fb337f04..54fb337f04 100644 --- a/kubernetes/sdnc/sdnc-prom/Chart.yaml +++ b/kubernetes/sdnc/components/sdnc-prom/Chart.yaml diff --git a/kubernetes/sdnc/sdnc-prom/requirements.yaml b/kubernetes/sdnc/components/sdnc-prom/requirements.yaml index e4c7240290..e4c7240290 100644 --- a/kubernetes/sdnc/sdnc-prom/requirements.yaml +++ b/kubernetes/sdnc/components/sdnc-prom/requirements.yaml diff --git a/kubernetes/sdnc/sdnc-prom/resources/bin/ensureSdncActive.sh b/kubernetes/sdnc/components/sdnc-prom/resources/bin/ensureSdncActive.sh index fb24653129..fb24653129 100755 --- a/kubernetes/sdnc/sdnc-prom/resources/bin/ensureSdncActive.sh +++ b/kubernetes/sdnc/components/sdnc-prom/resources/bin/ensureSdncActive.sh diff --git a/kubernetes/sdnc/sdnc-prom/resources/bin/ensureSdncStandby.sh b/kubernetes/sdnc/components/sdnc-prom/resources/bin/ensureSdncStandby.sh index 8dd84bd3ea..8dd84bd3ea 100755 --- a/kubernetes/sdnc/sdnc-prom/resources/bin/ensureSdncStandby.sh +++ b/kubernetes/sdnc/components/sdnc-prom/resources/bin/ensureSdncStandby.sh diff --git a/kubernetes/sdnc/sdnc-prom/resources/bin/prom.sh b/kubernetes/sdnc/components/sdnc-prom/resources/bin/prom.sh index c93ba24bd7..c93ba24bd7 100755 --- a/kubernetes/sdnc/sdnc-prom/resources/bin/prom.sh +++ b/kubernetes/sdnc/components/sdnc-prom/resources/bin/prom.sh diff --git a/kubernetes/sdnc/sdnc-prom/resources/bin/sdnc.cluster b/kubernetes/sdnc/components/sdnc-prom/resources/bin/sdnc.cluster index bdfa1a440b..bdfa1a440b 100755 --- a/kubernetes/sdnc/sdnc-prom/resources/bin/sdnc.cluster +++ b/kubernetes/sdnc/components/sdnc-prom/resources/bin/sdnc.cluster diff --git a/kubernetes/sdnc/sdnc-prom/resources/bin/sdnc.dnsswitch b/kubernetes/sdnc/components/sdnc-prom/resources/bin/sdnc.dnsswitch index 209352c4e3..209352c4e3 100755 --- a/kubernetes/sdnc/sdnc-prom/resources/bin/sdnc.dnsswitch +++ b/kubernetes/sdnc/components/sdnc-prom/resources/bin/sdnc.dnsswitch diff --git a/kubernetes/sdnc/sdnc-prom/resources/bin/sdnc.failover b/kubernetes/sdnc/components/sdnc-prom/resources/bin/sdnc.failover index e78b7eeee3..e78b7eeee3 100755 --- a/kubernetes/sdnc/sdnc-prom/resources/bin/sdnc.failover +++ b/kubernetes/sdnc/components/sdnc-prom/resources/bin/sdnc.failover diff --git a/kubernetes/sdnc/sdnc-prom/resources/bin/sdnc.monitor b/kubernetes/sdnc/components/sdnc-prom/resources/bin/sdnc.monitor index 0042ac368a..0042ac368a 100755 --- a/kubernetes/sdnc/sdnc-prom/resources/bin/sdnc.monitor +++ b/kubernetes/sdnc/components/sdnc-prom/resources/bin/sdnc.monitor diff --git a/kubernetes/sdnc/sdnc-prom/resources/bin/switchVoting.sh b/kubernetes/sdnc/components/sdnc-prom/resources/bin/switchVoting.sh index f13196e7e8..f13196e7e8 100755 --- a/kubernetes/sdnc/sdnc-prom/resources/bin/switchVoting.sh +++ b/kubernetes/sdnc/components/sdnc-prom/resources/bin/switchVoting.sh diff --git a/kubernetes/sdnc/sdnc-prom/resources/config/config.json b/kubernetes/sdnc/components/sdnc-prom/resources/config/config.json index 54f95c140c..54f95c140c 100644 --- a/kubernetes/sdnc/sdnc-prom/resources/config/config.json +++ b/kubernetes/sdnc/components/sdnc-prom/resources/config/config.json diff --git a/kubernetes/sdnc/sdnc-prom/resources/config/healthchecks.json b/kubernetes/sdnc/components/sdnc-prom/resources/config/healthchecks.json index ea8ceccc0c..ea8ceccc0c 100644 --- a/kubernetes/sdnc/sdnc-prom/resources/config/healthchecks.json +++ b/kubernetes/sdnc/components/sdnc-prom/resources/config/healthchecks.json diff --git a/kubernetes/sdnc/sdnc-prom/templates/configmap.yaml b/kubernetes/sdnc/components/sdnc-prom/templates/configmap.yaml index 927bb1e5be..927bb1e5be 100644 --- a/kubernetes/sdnc/sdnc-prom/templates/configmap.yaml +++ b/kubernetes/sdnc/components/sdnc-prom/templates/configmap.yaml diff --git a/kubernetes/sdnc/sdnc-prom/templates/deployment.yaml b/kubernetes/sdnc/components/sdnc-prom/templates/deployment.yaml index 7492b5501e..7492b5501e 100644 --- a/kubernetes/sdnc/sdnc-prom/templates/deployment.yaml +++ b/kubernetes/sdnc/components/sdnc-prom/templates/deployment.yaml diff --git a/kubernetes/sdnc/sdnc-prom/templates/pv.yaml b/kubernetes/sdnc/components/sdnc-prom/templates/pv.yaml index bef2d6a85f..bef2d6a85f 100644 --- a/kubernetes/sdnc/sdnc-prom/templates/pv.yaml +++ b/kubernetes/sdnc/components/sdnc-prom/templates/pv.yaml diff --git a/kubernetes/sdnc/sdnc-prom/templates/pvc.yaml b/kubernetes/sdnc/components/sdnc-prom/templates/pvc.yaml index 9933852f16..9933852f16 100644 --- a/kubernetes/sdnc/sdnc-prom/templates/pvc.yaml +++ b/kubernetes/sdnc/components/sdnc-prom/templates/pvc.yaml diff --git a/kubernetes/sdnc/sdnc-prom/values.yaml b/kubernetes/sdnc/components/sdnc-prom/values.yaml index 7216e81abf..7216e81abf 100644 --- a/kubernetes/sdnc/sdnc-prom/values.yaml +++ b/kubernetes/sdnc/components/sdnc-prom/values.yaml |