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>

diff --git a/kubernetes/Makefile b/kubernetes/Makefile
index 9cbf90f..f3e50e4 100644 (file)
--- 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 b9cc125..a78cc88 100644 (file)
--- 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
similarity index 100%
rename from kubernetes/dgbuilder/.helmignore
rename to kubernetes/common/dgbuilder/.helmignore

diff --git a/kubernetes/dgbuilder/Chart.yaml b/kubernetes/common/dgbuilder/Chart.yaml
similarity index 100%
rename from kubernetes/dgbuilder/Chart.yaml
rename to kubernetes/common/dgbuilder/Chart.yaml

diff --git a/kubernetes/dgbuilder/requirements.yaml b/kubernetes/common/dgbuilder/requirements.yaml
similarity index 100%
rename from kubernetes/dgbuilder/requirements.yaml
rename to kubernetes/common/dgbuilder/requirements.yaml

diff --git a/kubernetes/dgbuilder/resources/config/svclogic.properties b/kubernetes/common/dgbuilder/resources/config/svclogic.properties
similarity index 100%
rename from kubernetes/dgbuilder/resources/config/svclogic.properties
rename to kubernetes/common/dgbuilder/resources/config/svclogic.properties

diff --git a/kubernetes/dgbuilder/resources/scripts/createReleaseDir.sh b/kubernetes/common/dgbuilder/resources/scripts/createReleaseDir.sh
similarity index 100%
rename from kubernetes/dgbuilder/resources/scripts/createReleaseDir.sh
rename to kubernetes/common/dgbuilder/resources/scripts/createReleaseDir.sh

diff --git a/kubernetes/dgbuilder/resources/scripts/customSettings.js b/kubernetes/common/dgbuilder/resources/scripts/customSettings.js
similarity index 100%
rename from kubernetes/dgbuilder/resources/scripts/customSettings.js
rename to kubernetes/common/dgbuilder/resources/scripts/customSettings.js

diff --git a/kubernetes/dgbuilder/templates/NOTES.txt b/kubernetes/common/dgbuilder/templates/NOTES.txt
similarity index 100%
rename from kubernetes/dgbuilder/templates/NOTES.txt
rename to kubernetes/common/dgbuilder/templates/NOTES.txt

diff --git a/kubernetes/dgbuilder/templates/configmap.yaml b/kubernetes/common/dgbuilder/templates/configmap.yaml
similarity index 100%
rename from kubernetes/dgbuilder/templates/configmap.yaml
rename to kubernetes/common/dgbuilder/templates/configmap.yaml

diff --git a/kubernetes/dgbuilder/templates/deployment.yaml b/kubernetes/common/dgbuilder/templates/deployment.yaml
similarity index 100%
rename from kubernetes/dgbuilder/templates/deployment.yaml
rename to kubernetes/common/dgbuilder/templates/deployment.yaml

diff --git a/kubernetes/dgbuilder/templates/secrets.yaml b/kubernetes/common/dgbuilder/templates/secrets.yaml
similarity index 100%
rename from kubernetes/dgbuilder/templates/secrets.yaml
rename to kubernetes/common/dgbuilder/templates/secrets.yaml

diff --git a/kubernetes/dgbuilder/templates/service.yaml b/kubernetes/common/dgbuilder/templates/service.yaml
similarity index 100%
rename from kubernetes/dgbuilder/templates/service.yaml
rename to kubernetes/common/dgbuilder/templates/service.yaml

diff --git a/kubernetes/dgbuilder/values.yaml b/kubernetes/common/dgbuilder/values.yaml
similarity index 100%
rename from kubernetes/dgbuilder/values.yaml
rename to kubernetes/common/dgbuilder/values.yaml

diff --git a/kubernetes/mysql/.helmignore b/kubernetes/common/mysql/.helmignore
similarity index 100%
rename from kubernetes/mysql/.helmignore
rename to kubernetes/common/mysql/.helmignore

diff --git a/kubernetes/mysql/Chart.yaml b/kubernetes/common/mysql/Chart.yaml
similarity index 100%
rename from kubernetes/mysql/Chart.yaml
rename to kubernetes/common/mysql/Chart.yaml

diff --git a/kubernetes/mysql/requirements.yaml b/kubernetes/common/mysql/requirements.yaml
similarity index 100%
rename from kubernetes/mysql/requirements.yaml
rename to kubernetes/common/mysql/requirements.yaml

diff --git a/kubernetes/mysql/templates/configmap.yaml b/kubernetes/common/mysql/templates/configmap.yaml
similarity index 100%
rename from kubernetes/mysql/templates/configmap.yaml
rename to kubernetes/common/mysql/templates/configmap.yaml

diff --git a/kubernetes/mysql/templates/nfs-provisoner.yaml b/kubernetes/common/mysql/templates/nfs-provisoner.yaml
similarity index 100%
rename from kubernetes/mysql/templates/nfs-provisoner.yaml
rename to kubernetes/common/mysql/templates/nfs-provisoner.yaml

diff --git a/kubernetes/mysql/templates/pv.yaml b/kubernetes/common/mysql/templates/pv.yaml
similarity index 100%
rename from kubernetes/mysql/templates/pv.yaml
rename to kubernetes/common/mysql/templates/pv.yaml

diff --git a/kubernetes/mysql/templates/pvc.yaml b/kubernetes/common/mysql/templates/pvc.yaml
similarity index 100%
rename from kubernetes/mysql/templates/pvc.yaml
rename to kubernetes/common/mysql/templates/pvc.yaml

diff --git a/kubernetes/mysql/templates/secrets.yaml b/kubernetes/common/mysql/templates/secrets.yaml
similarity index 100%
rename from kubernetes/mysql/templates/secrets.yaml
rename to kubernetes/common/mysql/templates/secrets.yaml

diff --git a/kubernetes/mysql/templates/service.yaml b/kubernetes/common/mysql/templates/service.yaml
similarity index 100%
rename from kubernetes/mysql/templates/service.yaml
rename to kubernetes/common/mysql/templates/service.yaml

diff --git a/kubernetes/mysql/templates/statefulset.yaml b/kubernetes/common/mysql/templates/statefulset.yaml
similarity index 100%
rename from kubernetes/mysql/templates/statefulset.yaml
rename to kubernetes/common/mysql/templates/statefulset.yaml

diff --git a/kubernetes/mysql/templates/storageclass.yaml b/kubernetes/common/mysql/templates/storageclass.yaml
similarity index 100%
rename from kubernetes/mysql/templates/storageclass.yaml
rename to kubernetes/common/mysql/templates/storageclass.yaml

diff --git a/kubernetes/mysql/values.yaml b/kubernetes/common/mysql/values.yaml
similarity index 100%
rename from kubernetes/mysql/values.yaml
rename to kubernetes/common/mysql/values.yaml