aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Elliott <mike.elliott@amdocs.com>2018-03-21 12:18:40 -0400
committerMike Elliott <mike.elliott@amdocs.com>2018-03-22 12:21:49 -0400
commit2670b0ef2262f25176ed2f0e08867c3807ffdfa6 (patch)
tree5877a8c1ccc4f1e93f60c62d8c4a84d84d41d0ba
parent38692ad900baf554896b07ce04f475fb3c621b25 (diff)
Add common location for shared charts
Moved shared templates into common directory. This "common" location is where upcoming charts for mariadb-galera, postgress etc. will reside. Change-Id: Id2e2ffd3369a3e4d6437c2ca4f04a5f1dceb236a Issue-ID: OOM-816 Signed-off-by: Mike Elliott <mike.elliott@amdocs.com>
-rw-r--r--kubernetes/Makefile9
-rw-r--r--kubernetes/common/Makefile50
-rw-r--r--kubernetes/common/common/Chart.yaml (renamed from kubernetes/common/Chart.yaml)0
-rw-r--r--kubernetes/common/common/templates/_name.tpl31
-rw-r--r--kubernetes/common/common/templates/_namespace.tpl26
-rw-r--r--kubernetes/common/common/values.yaml (renamed from kubernetes/common/values.yaml)0
-rw-r--r--kubernetes/common/templates/_name.tpl15
-rw-r--r--kubernetes/common/templates/_namespace.tpl10
8 files changed, 109 insertions, 32 deletions
diff --git a/kubernetes/Makefile b/kubernetes/Makefile
index 4cf97059ac..000be48048 100644
--- a/kubernetes/Makefile
+++ b/kubernetes/Makefile
@@ -1,27 +1,22 @@
PARENT_CHART := onap
COMMON_CHARTS_DIR := common
-SETUP_CHARTS_DIR := setup
# 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 := $(SETUP_CHARTS_DIR) $(COMMON_CHARTS_DIR) config oneclick readiness test dist $(PARENT_CHART) dcae
+EXCLUDES := $(COMMON_CHARTS_DIR) 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) $(SETUP_CHARTS_DIR) $(HELM_CHARTS)
+all: $(COMMON_CHARTS_DIR) $(HELM_CHARTS)
common:
@echo "\n[$@]"
@make package-$@
-setup:
- @echo "\n[$@]"
- @make package-$@
-
$(HELM_CHARTS):
@echo "\n[$@]"
@make package-$@
diff --git a/kubernetes/common/Makefile b/kubernetes/common/Makefile
new file mode 100644
index 0000000000..b9cc1250d5
--- /dev/null
+++ b/kubernetes/common/Makefile
@@ -0,0 +1,50 @@
+# 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), $(patsubst %/.,%,$(wildcard */.))) $(PARENT_CHART)
+
+.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
+
+clean:
+ @rm -f */requirements.lock
+ @rm -f *tgz */charts/*tgz
+ @rm -rf $(PACKAGE_DIR)
+%:
+ @: \ No newline at end of file
diff --git a/kubernetes/common/Chart.yaml b/kubernetes/common/common/Chart.yaml
index 7d58e53dfd..7d58e53dfd 100644
--- a/kubernetes/common/Chart.yaml
+++ b/kubernetes/common/common/Chart.yaml
diff --git a/kubernetes/common/common/templates/_name.tpl b/kubernetes/common/common/templates/_name.tpl
new file mode 100644
index 0000000000..4299984673
--- /dev/null
+++ b/kubernetes/common/common/templates/_name.tpl
@@ -0,0 +1,31 @@
+{{/*
+# 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.
+*/}}
+
+{{/*
+ Expand the name of a chart.
+*/}}
+{{- define "common.name" -}}
+ {{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{/*
+ Create a default fully qualified application name.
+ Truncated at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+*/}}
+{{- define "common.fullname" -}}
+ {{- $name := default .Chart.Name .Values.nameOverride -}}
+ {{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}} \ No newline at end of file
diff --git a/kubernetes/common/common/templates/_namespace.tpl b/kubernetes/common/common/templates/_namespace.tpl
new file mode 100644
index 0000000000..94c9ee72d9
--- /dev/null
+++ b/kubernetes/common/common/templates/_namespace.tpl
@@ -0,0 +1,26 @@
+{{/*
+# 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.
+*/}}
+
+{{/*
+ Resolve the namespace to apply to a chart. The default namespace suffix
+ is the name of the chart. This can be overridden if necessary (eg. for subcharts)
+ using the following value:
+
+ - .Values.nsPrefix : override namespace prefix
+*/}}
+{{- define "common.namespace" -}}
+ {{- default .Release.Namespace .Values.nsPrefix -}}
+{{- end -}}
diff --git a/kubernetes/common/values.yaml b/kubernetes/common/common/values.yaml
index c8ded9a5dd..c8ded9a5dd 100644
--- a/kubernetes/common/values.yaml
+++ b/kubernetes/common/common/values.yaml
diff --git a/kubernetes/common/templates/_name.tpl b/kubernetes/common/templates/_name.tpl
deleted file mode 100644
index f6c221f15d..0000000000
--- a/kubernetes/common/templates/_name.tpl
+++ /dev/null
@@ -1,15 +0,0 @@
-{{/*
- Expand the name of a chart.
-*/}}
-{{- define "common.name" -}}
- {{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{/*
- Create a default fully qualified application name.
- Truncated at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
-*/}}
-{{- define "common.fullname" -}}
- {{- $name := default .Chart.Name .Values.nameOverride -}}
- {{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}} \ No newline at end of file
diff --git a/kubernetes/common/templates/_namespace.tpl b/kubernetes/common/templates/_namespace.tpl
deleted file mode 100644
index 3da9fee7c1..0000000000
--- a/kubernetes/common/templates/_namespace.tpl
+++ /dev/null
@@ -1,10 +0,0 @@
-{{/*
- Resolve the namespace to apply to a chart. The default namespace suffix
- is the name of the chart. This can be overridden if necessary (eg. for subcharts)
- using the following value:
-
- - .Values.nsPrefix : override namespace prefix
-*/}}
-{{- define "common.namespace" -}}
- {{- default .Release.Namespace .Values.nsPrefix -}}
-{{- end -}}