aboutsummaryrefslogtreecommitdiffstats
path: root/kubernetes
diff options
context:
space:
mode:
authorMike Elliott <mike.elliott@amdocs.com>2018-03-26 12:28:53 -0400
committerMike Elliott <mike.elliott@amdocs.com>2018-03-26 15:11:52 -0400
commit003d7290a65a9df52e049b9c824dfb20a2b6d253 (patch)
tree747d94ef0b010a73ff85e450d3b64bd4b32aecc1 /kubernetes
parent114736eb5119b023bc5f166a3b42aaf933b0b223 (diff)
Add fix for build dependecies
Moved mysql and dgbuilder under common (built first) to ensure they are built before appc and sdnc charts that depend on them. Change-Id: I2fc28f0537b2639bd2b761c6f115544965a228b1 Issue-ID: OOM-830 Signed-off-by: Mike Elliott <mike.elliott@amdocs.com>
Diffstat (limited to 'kubernetes')
-rw-r--r--kubernetes/Makefile25
-rw-r--r--kubernetes/common/Makefile2
-rw-r--r--kubernetes/common/dgbuilder/.helmignore (renamed from kubernetes/dgbuilder/.helmignore)0
-rw-r--r--kubernetes/common/dgbuilder/Chart.yaml (renamed from kubernetes/dgbuilder/Chart.yaml)0
-rw-r--r--kubernetes/common/dgbuilder/requirements.yaml (renamed from kubernetes/dgbuilder/requirements.yaml)0
-rw-r--r--kubernetes/common/dgbuilder/resources/config/svclogic.properties (renamed from kubernetes/dgbuilder/resources/config/svclogic.properties)0
-rwxr-xr-xkubernetes/common/dgbuilder/resources/scripts/createReleaseDir.sh (renamed from kubernetes/dgbuilder/resources/scripts/createReleaseDir.sh)0
-rw-r--r--kubernetes/common/dgbuilder/resources/scripts/customSettings.js (renamed from kubernetes/dgbuilder/resources/scripts/customSettings.js)0
-rw-r--r--kubernetes/common/dgbuilder/templates/NOTES.txt (renamed from kubernetes/dgbuilder/templates/NOTES.txt)0
-rw-r--r--kubernetes/common/dgbuilder/templates/configmap.yaml (renamed from kubernetes/dgbuilder/templates/configmap.yaml)0
-rw-r--r--kubernetes/common/dgbuilder/templates/deployment.yaml (renamed from kubernetes/dgbuilder/templates/deployment.yaml)0
-rw-r--r--kubernetes/common/dgbuilder/templates/secrets.yaml (renamed from kubernetes/dgbuilder/templates/secrets.yaml)0
-rw-r--r--kubernetes/common/dgbuilder/templates/service.yaml (renamed from kubernetes/dgbuilder/templates/service.yaml)0
-rw-r--r--kubernetes/common/dgbuilder/values.yaml (renamed from kubernetes/dgbuilder/values.yaml)0
-rw-r--r--kubernetes/common/mysql/.helmignore (renamed from kubernetes/mysql/.helmignore)0
-rw-r--r--kubernetes/common/mysql/Chart.yaml (renamed from kubernetes/mysql/Chart.yaml)0
-rw-r--r--kubernetes/common/mysql/requirements.yaml (renamed from kubernetes/mysql/requirements.yaml)0
-rw-r--r--kubernetes/common/mysql/templates/configmap.yaml (renamed from kubernetes/mysql/templates/configmap.yaml)0
-rw-r--r--kubernetes/common/mysql/templates/nfs-provisoner.yaml (renamed from kubernetes/mysql/templates/nfs-provisoner.yaml)0
-rw-r--r--kubernetes/common/mysql/templates/pv.yaml (renamed from kubernetes/mysql/templates/pv.yaml)0
-rw-r--r--kubernetes/common/mysql/templates/pvc.yaml (renamed from kubernetes/mysql/templates/pvc.yaml)0
-rw-r--r--kubernetes/common/mysql/templates/secrets.yaml (renamed from kubernetes/mysql/templates/secrets.yaml)0
-rw-r--r--kubernetes/common/mysql/templates/service.yaml (renamed from kubernetes/mysql/templates/service.yaml)0
-rw-r--r--kubernetes/common/mysql/templates/statefulset.yaml (renamed from kubernetes/mysql/templates/statefulset.yaml)0
-rw-r--r--kubernetes/common/mysql/templates/storageclass.yaml (renamed from kubernetes/mysql/templates/storageclass.yaml)0
-rw-r--r--kubernetes/common/mysql/values.yaml (renamed from kubernetes/mysql/values.yaml)0
26 files changed, 17 insertions, 10 deletions
diff --git a/kubernetes/Makefile b/kubernetes/Makefile
index 9cbf90fba7..f3e50e4347 100644
--- a/kubernetes/Makefile
+++ b/kubernetes/Makefile
@@ -1,26 +1,33 @@
+# 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.
+
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
-EXCLUDES := $(COMMON_CHARTS_DIR) config oneclick readiness test dist helm $(PARENT_CHART) dcae
-EXCLUDES := $(SHARED_CHARTS) config oneclick readiness test dist $(PARENT_CHART) dcae
+EXCLUDES := config oneclick readiness test dist helm $(PARENT_CHART) dcae
HELM_CHARTS := $(filter-out $(EXCLUDES), $(patsubst %/.,%,$(wildcard */.))) $(PARENT_CHART)
.PHONY: $(EXCLUDES) $(HELM_CHARTS)
all: $(COMMON_CHARTS_DIR) $(HELM_CHARTS)
-common:
-all: $(SHARED_CHARTS) $(HELM_CHARTS)
-
-$(SHARED_CHARTS):
+$(COMMON_CHARTS):
@echo "\n[$@]"
@make package-$@
diff --git a/kubernetes/common/Makefile b/kubernetes/common/Makefile
index b9cc1250d5..a78cc88b89 100644
--- a/kubernetes/common/Makefile
+++ b/kubernetes/common/Makefile
@@ -19,7 +19,7 @@ PACKAGE_DIR := $(OUTPUT_DIR)/packages
SECRET_DIR := $(OUTPUT_DIR)/secrets
EXCLUDES :=
-HELM_CHARTS := $(filter-out $(EXCLUDES), $(patsubst %/.,%,$(wildcard */.))) $(PARENT_CHART)
+HELM_CHARTS := $(filter-out $(EXCLUDES), $(patsubst %/.,%,$(wildcard */.)))
.PHONY: $(EXCLUDES) $(HELM_CHARTS)
diff --git a/kubernetes/dgbuilder/.helmignore b/kubernetes/common/dgbuilder/.helmignore
index f0c1319444..f0c1319444 100644
--- a/kubernetes/dgbuilder/.helmignore
+++ b/kubernetes/common/dgbuilder/.helmignore
diff --git a/kubernetes/dgbuilder/Chart.yaml b/kubernetes/common/dgbuilder/Chart.yaml
index e1955a137c..e1955a137c 100644
--- a/kubernetes/dgbuilder/Chart.yaml
+++ b/kubernetes/common/dgbuilder/Chart.yaml
diff --git a/kubernetes/dgbuilder/requirements.yaml b/kubernetes/common/dgbuilder/requirements.yaml
index acca8ef7e2..acca8ef7e2 100644
--- a/kubernetes/dgbuilder/requirements.yaml
+++ b/kubernetes/common/dgbuilder/requirements.yaml
diff --git a/kubernetes/dgbuilder/resources/config/svclogic.properties b/kubernetes/common/dgbuilder/resources/config/svclogic.properties
index fdaf5779e2..fdaf5779e2 100644
--- a/kubernetes/dgbuilder/resources/config/svclogic.properties
+++ b/kubernetes/common/dgbuilder/resources/config/svclogic.properties
diff --git a/kubernetes/dgbuilder/resources/scripts/createReleaseDir.sh b/kubernetes/common/dgbuilder/resources/scripts/createReleaseDir.sh
index 38f7fe2720..38f7fe2720 100755
--- a/kubernetes/dgbuilder/resources/scripts/createReleaseDir.sh
+++ b/kubernetes/common/dgbuilder/resources/scripts/createReleaseDir.sh
diff --git a/kubernetes/dgbuilder/resources/scripts/customSettings.js b/kubernetes/common/dgbuilder/resources/scripts/customSettings.js
index f09d396f96..f09d396f96 100644
--- a/kubernetes/dgbuilder/resources/scripts/customSettings.js
+++ b/kubernetes/common/dgbuilder/resources/scripts/customSettings.js
diff --git a/kubernetes/dgbuilder/templates/NOTES.txt b/kubernetes/common/dgbuilder/templates/NOTES.txt
index 2465e03634..2465e03634 100644
--- a/kubernetes/dgbuilder/templates/NOTES.txt
+++ b/kubernetes/common/dgbuilder/templates/NOTES.txt
diff --git a/kubernetes/dgbuilder/templates/configmap.yaml b/kubernetes/common/dgbuilder/templates/configmap.yaml
index 7ef92d09e7..7ef92d09e7 100644
--- a/kubernetes/dgbuilder/templates/configmap.yaml
+++ b/kubernetes/common/dgbuilder/templates/configmap.yaml
diff --git a/kubernetes/dgbuilder/templates/deployment.yaml b/kubernetes/common/dgbuilder/templates/deployment.yaml
index 4e1f1019ee..4e1f1019ee 100644
--- a/kubernetes/dgbuilder/templates/deployment.yaml
+++ b/kubernetes/common/dgbuilder/templates/deployment.yaml
diff --git a/kubernetes/dgbuilder/templates/secrets.yaml b/kubernetes/common/dgbuilder/templates/secrets.yaml
index 7604be8239..7604be8239 100644
--- a/kubernetes/dgbuilder/templates/secrets.yaml
+++ b/kubernetes/common/dgbuilder/templates/secrets.yaml
diff --git a/kubernetes/dgbuilder/templates/service.yaml b/kubernetes/common/dgbuilder/templates/service.yaml
index c61cdd549b..c61cdd549b 100644
--- a/kubernetes/dgbuilder/templates/service.yaml
+++ b/kubernetes/common/dgbuilder/templates/service.yaml
diff --git a/kubernetes/dgbuilder/values.yaml b/kubernetes/common/dgbuilder/values.yaml
index 23f8eea78e..23f8eea78e 100644
--- a/kubernetes/dgbuilder/values.yaml
+++ b/kubernetes/common/dgbuilder/values.yaml
diff --git a/kubernetes/mysql/.helmignore b/kubernetes/common/mysql/.helmignore
index f0c1319444..f0c1319444 100644
--- a/kubernetes/mysql/.helmignore
+++ b/kubernetes/common/mysql/.helmignore
diff --git a/kubernetes/mysql/Chart.yaml b/kubernetes/common/mysql/Chart.yaml
index 99e7c44fb9..99e7c44fb9 100644
--- a/kubernetes/mysql/Chart.yaml
+++ b/kubernetes/common/mysql/Chart.yaml
diff --git a/kubernetes/mysql/requirements.yaml b/kubernetes/common/mysql/requirements.yaml
index acca8ef7e2..acca8ef7e2 100644
--- a/kubernetes/mysql/requirements.yaml
+++ b/kubernetes/common/mysql/requirements.yaml
diff --git a/kubernetes/mysql/templates/configmap.yaml b/kubernetes/common/mysql/templates/configmap.yaml
index dd2b5b7db2..dd2b5b7db2 100644
--- a/kubernetes/mysql/templates/configmap.yaml
+++ b/kubernetes/common/mysql/templates/configmap.yaml
diff --git a/kubernetes/mysql/templates/nfs-provisoner.yaml b/kubernetes/common/mysql/templates/nfs-provisoner.yaml
index 478224e1a1..478224e1a1 100644
--- a/kubernetes/mysql/templates/nfs-provisoner.yaml
+++ b/kubernetes/common/mysql/templates/nfs-provisoner.yaml
diff --git a/kubernetes/mysql/templates/pv.yaml b/kubernetes/common/mysql/templates/pv.yaml
index ba128b95d0..ba128b95d0 100644
--- a/kubernetes/mysql/templates/pv.yaml
+++ b/kubernetes/common/mysql/templates/pv.yaml
diff --git a/kubernetes/mysql/templates/pvc.yaml b/kubernetes/common/mysql/templates/pvc.yaml
index a2949fef36..a2949fef36 100644
--- a/kubernetes/mysql/templates/pvc.yaml
+++ b/kubernetes/common/mysql/templates/pvc.yaml
diff --git a/kubernetes/mysql/templates/secrets.yaml b/kubernetes/common/mysql/templates/secrets.yaml
index 7604be8239..7604be8239 100644
--- a/kubernetes/mysql/templates/secrets.yaml
+++ b/kubernetes/common/mysql/templates/secrets.yaml
diff --git a/kubernetes/mysql/templates/service.yaml b/kubernetes/common/mysql/templates/service.yaml
index c6a28c4605..c6a28c4605 100644
--- a/kubernetes/mysql/templates/service.yaml
+++ b/kubernetes/common/mysql/templates/service.yaml
diff --git a/kubernetes/mysql/templates/statefulset.yaml b/kubernetes/common/mysql/templates/statefulset.yaml
index 7b55bf2be0..7b55bf2be0 100644
--- a/kubernetes/mysql/templates/statefulset.yaml
+++ b/kubernetes/common/mysql/templates/statefulset.yaml
diff --git a/kubernetes/mysql/templates/storageclass.yaml b/kubernetes/common/mysql/templates/storageclass.yaml
index 1a4e6b6bb7..1a4e6b6bb7 100644
--- a/kubernetes/mysql/templates/storageclass.yaml
+++ b/kubernetes/common/mysql/templates/storageclass.yaml
diff --git a/kubernetes/mysql/values.yaml b/kubernetes/common/mysql/values.yaml
index c0beb6fd22..c0beb6fd22 100644
--- a/kubernetes/mysql/values.yaml
+++ b/kubernetes/common/mysql/values.yaml