aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--kubernetes/aaf/charts/aaf-cm/templates/NOTES.txt14
-rw-r--r--kubernetes/aaf/charts/aaf-cs/Chart.yaml14
-rw-r--r--kubernetes/aaf/charts/aaf-cs/resources/config/aaf-cs-data/init.cql13
-rw-r--r--kubernetes/aaf/charts/aaf-cs/resources/config/aaf-cs-data/keyspace.cql14
-rw-r--r--kubernetes/aaf/charts/aaf-cs/resources/config/aaf-cs-data/osaaf.cql14
-rw-r--r--kubernetes/aaf/charts/aaf-cs/resources/config/aaf-cs-data/temp_identity.cql14
-rw-r--r--kubernetes/aaf/charts/aaf-cs/templates/NOTES.txt14
-rw-r--r--kubernetes/aaf/charts/aaf-fs/templates/NOTES.txt14
-rw-r--r--kubernetes/aaf/charts/aaf-gui/templates/NOTES.txt14
-rw-r--r--kubernetes/aaf/charts/aaf-hello/templates/NOTES.txt14
-rw-r--r--kubernetes/aaf/charts/aaf-locate/templates/NOTES.txt14
-rw-r--r--kubernetes/aaf/charts/aaf-oauth/templates/NOTES.txt14
-rw-r--r--kubernetes/aaf/resources/config/backup/backup.sh14
-rw-r--r--kubernetes/aaf/resources/config/backup/cbackup.sh14
-rw-r--r--kubernetes/aaf/resources/config/data/identities.dat14
-rw-r--r--kubernetes/aaf/resources/config/data/sample.identities.dat13
-rw-r--r--kubernetes/aaf/resources/config/etc/org.osaaf.cm.props14
-rw-r--r--kubernetes/aaf/resources/config/etc/org.osaaf.common.props14
-rw-r--r--kubernetes/aaf/resources/config/etc/org.osaaf.fs.props15
-rw-r--r--kubernetes/aaf/resources/config/etc/org.osaaf.gui.props15
-rw-r--r--kubernetes/aaf/resources/config/etc/org.osaaf.hello.props15
-rw-r--r--kubernetes/aaf/resources/config/etc/org.osaaf.locate.props15
-rw-r--r--kubernetes/aaf/resources/config/etc/org.osaaf.oauth.props14
-rw-r--r--kubernetes/aaf/resources/config/etc/org.osaaf.orgs.props14
-rw-r--r--kubernetes/aaf/resources/config/etc/org.osaaf.service.props15
-rw-r--r--kubernetes/aaf/resources/config/local/org.osaaf.aaf.props20
-rw-r--r--kubernetes/cli/templates/NOTES.txt14
-rw-r--r--kubernetes/readiness/docker/init/ready.py11
-rw-r--r--kubernetes/sdc/charts/sdc-act/resources/config/configuration.yaml12
-rw-r--r--kubernetes/sdc/charts/sdc-act/templates/configmap.yaml21
-rw-r--r--kubernetes/sdc/charts/sdc-wfd-be/.helmignore (renamed from kubernetes/sdc/charts/sdc-act/.helmignore)0
-rw-r--r--kubernetes/sdc/charts/sdc-wfd-be/Chart.yaml (renamed from kubernetes/sdc/charts/sdc-act/Chart.yaml)6
-rw-r--r--kubernetes/sdc/charts/sdc-wfd-be/templates/NOTES.txt (renamed from kubernetes/sdc/charts/sdc-act/templates/NOTES.txt)2
-rw-r--r--kubernetes/sdc/charts/sdc-wfd-be/templates/deployment.yaml (renamed from kubernetes/sdc/charts/sdc-act/templates/deployment.yaml)26
-rw-r--r--kubernetes/sdc/charts/sdc-wfd-be/templates/job.yaml (renamed from kubernetes/sdc/charts/sdc-act/templates/job.yaml)17
-rw-r--r--kubernetes/sdc/charts/sdc-wfd-be/templates/service.yaml (renamed from kubernetes/sdc/charts/sdc-act/templates/service.yaml)2
-rw-r--r--kubernetes/sdc/charts/sdc-wfd-be/values.yaml (renamed from kubernetes/sdc/charts/sdc-act/values.yaml)25
-rw-r--r--kubernetes/sdc/charts/sdc-wfd-fe/.helmignore (renamed from kubernetes/sdc/charts/sdc-wfd/.helmignore)0
-rw-r--r--kubernetes/sdc/charts/sdc-wfd-fe/Chart.yaml (renamed from kubernetes/sdc/charts/sdc-wfd/Chart.yaml)6
-rw-r--r--kubernetes/sdc/charts/sdc-wfd-fe/templates/NOTES.txt (renamed from kubernetes/sdc/charts/sdc-wfd/templates/NOTES.txt)15
-rw-r--r--kubernetes/sdc/charts/sdc-wfd-fe/templates/deployment.yaml112
-rw-r--r--kubernetes/sdc/charts/sdc-wfd-fe/templates/service.yaml (renamed from kubernetes/sdc/charts/sdc-wfd/templates/service.yaml)26
-rw-r--r--kubernetes/sdc/charts/sdc-wfd-fe/values.yaml (renamed from kubernetes/sdc/charts/sdc-wfd/values.yaml)44
-rw-r--r--kubernetes/sdc/charts/sdc-wfd/templates/deployment.yaml52
-rwxr-xr-xkubernetes/sdc/resources/config/environments/AUTO.json4
-rw-r--r--kubernetes/sdnc/charts/ueb-listener/resources/config/ueb-listener.properties4
-rw-r--r--kubernetes/vid/charts/vid-galera/Chart.yaml14
-rw-r--r--kubernetes/vid/charts/vid-galera/templates/NOTES.txt14
-rw-r--r--kubernetes/vid/charts/vid-galera/templates/configmap.yaml14
-rw-r--r--kubernetes/vid/charts/vid-galera/templates/secrets.yaml14
-rw-r--r--kubernetes/vid/charts/vid-galera/templates/service.yaml14
-rw-r--r--kubernetes/vid/charts/vid-galera/templates/statefulset.yaml14
-rw-r--r--kubernetes/vid/charts/vid-galera/values.yaml14
-rw-r--r--kubernetes/vid/resources/config/log/filebeat/filebeat.yml14
-rw-r--r--kubernetes/vid/templates/NOTES.txt14
-rw-r--r--kubernetes/vid/templates/check-job-completion-configmap.yaml14
-rw-r--r--kubernetes/vid/templates/cluster-ready-configmap.yaml14
-rw-r--r--kubernetes/vid/templates/dbcmd-configmap.yaml14
-rw-r--r--kubernetes/vid/templates/galera-sql-configmap.yaml14
-rw-r--r--kubernetes/vid/templates/vid-galera-config-job.yaml14
60 files changed, 810 insertions, 158 deletions
diff --git a/kubernetes/aaf/charts/aaf-cm/templates/NOTES.txt b/kubernetes/aaf/charts/aaf-cm/templates/NOTES.txt
index c60c745ca3..bd74a42cd5 100644
--- a/kubernetes/aaf/charts/aaf-cm/templates/NOTES.txt
+++ b/kubernetes/aaf/charts/aaf-cm/templates/NOTES.txt
@@ -1,3 +1,17 @@
+# Copyright © 2018 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.
+
1. Get the application URL by running these commands:
{{- if .Values.ingress.enabled }}
{{- range .Values.ingress.hosts }}
diff --git a/kubernetes/aaf/charts/aaf-cs/Chart.yaml b/kubernetes/aaf/charts/aaf-cs/Chart.yaml
index a0f05c4cf3..92ea707aaa 100644
--- a/kubernetes/aaf/charts/aaf-cs/Chart.yaml
+++ b/kubernetes/aaf/charts/aaf-cs/Chart.yaml
@@ -1,3 +1,17 @@
+# Copyright © 2018 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.
+
apiVersion: v1
description: ONAP AAF cassandra
name: aaf-cs
diff --git a/kubernetes/aaf/charts/aaf-cs/resources/config/aaf-cs-data/init.cql b/kubernetes/aaf/charts/aaf-cs/resources/config/aaf-cs-data/init.cql
index c06e5ee952..c4f77d80c9 100644
--- a/kubernetes/aaf/charts/aaf-cs/resources/config/aaf-cs-data/init.cql
+++ b/kubernetes/aaf/charts/aaf-cs/resources/config/aaf-cs-data/init.cql
@@ -1,3 +1,16 @@
+/* # Copyright © 2018 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. */
// Table Initialization
// First make sure the keyspace exists.
diff --git a/kubernetes/aaf/charts/aaf-cs/resources/config/aaf-cs-data/keyspace.cql b/kubernetes/aaf/charts/aaf-cs/resources/config/aaf-cs-data/keyspace.cql
index 52dc5ea77e..2951b2a197 100644
--- a/kubernetes/aaf/charts/aaf-cs/resources/config/aaf-cs-data/keyspace.cql
+++ b/kubernetes/aaf/charts/aaf-cs/resources/config/aaf-cs-data/keyspace.cql
@@ -1,3 +1,17 @@
+/* # Copyright © 2018 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. */
+
// For Developer Machine single instance
// CREATE KEYSPACE authz
// WITH REPLICATION = {'class' : 'SimpleStrategy','replication_factor':1};
diff --git a/kubernetes/aaf/charts/aaf-cs/resources/config/aaf-cs-data/osaaf.cql b/kubernetes/aaf/charts/aaf-cs/resources/config/aaf-cs-data/osaaf.cql
index e7385ab69d..89da60f9db 100644
--- a/kubernetes/aaf/charts/aaf-cs/resources/config/aaf-cs-data/osaaf.cql
+++ b/kubernetes/aaf/charts/aaf-cs/resources/config/aaf-cs-data/osaaf.cql
@@ -1,3 +1,17 @@
+/* # Copyright © 2018 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. */
+
USE authz;
// Create 'org' root NS
diff --git a/kubernetes/aaf/charts/aaf-cs/resources/config/aaf-cs-data/temp_identity.cql b/kubernetes/aaf/charts/aaf-cs/resources/config/aaf-cs-data/temp_identity.cql
index 5e7cfe1741..4b6bf44140 100644
--- a/kubernetes/aaf/charts/aaf-cs/resources/config/aaf-cs-data/temp_identity.cql
+++ b/kubernetes/aaf/charts/aaf-cs/resources/config/aaf-cs-data/temp_identity.cql
@@ -1,3 +1,17 @@
+/* # Copyright © 2018 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. */
+
USE authz;
INSERT INTO user_role(user,role,expires,ns,rname)
diff --git a/kubernetes/aaf/charts/aaf-cs/templates/NOTES.txt b/kubernetes/aaf/charts/aaf-cs/templates/NOTES.txt
index c60c745ca3..bd74a42cd5 100644
--- a/kubernetes/aaf/charts/aaf-cs/templates/NOTES.txt
+++ b/kubernetes/aaf/charts/aaf-cs/templates/NOTES.txt
@@ -1,3 +1,17 @@
+# Copyright © 2018 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.
+
1. Get the application URL by running these commands:
{{- if .Values.ingress.enabled }}
{{- range .Values.ingress.hosts }}
diff --git a/kubernetes/aaf/charts/aaf-fs/templates/NOTES.txt b/kubernetes/aaf/charts/aaf-fs/templates/NOTES.txt
index c60c745ca3..bd74a42cd5 100644
--- a/kubernetes/aaf/charts/aaf-fs/templates/NOTES.txt
+++ b/kubernetes/aaf/charts/aaf-fs/templates/NOTES.txt
@@ -1,3 +1,17 @@
+# Copyright © 2018 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.
+
1. Get the application URL by running these commands:
{{- if .Values.ingress.enabled }}
{{- range .Values.ingress.hosts }}
diff --git a/kubernetes/aaf/charts/aaf-gui/templates/NOTES.txt b/kubernetes/aaf/charts/aaf-gui/templates/NOTES.txt
index c60c745ca3..bd74a42cd5 100644
--- a/kubernetes/aaf/charts/aaf-gui/templates/NOTES.txt
+++ b/kubernetes/aaf/charts/aaf-gui/templates/NOTES.txt
@@ -1,3 +1,17 @@
+# Copyright © 2018 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.
+
1. Get the application URL by running these commands:
{{- if .Values.ingress.enabled }}
{{- range .Values.ingress.hosts }}
diff --git a/kubernetes/aaf/charts/aaf-hello/templates/NOTES.txt b/kubernetes/aaf/charts/aaf-hello/templates/NOTES.txt
index c60c745ca3..bd74a42cd5 100644
--- a/kubernetes/aaf/charts/aaf-hello/templates/NOTES.txt
+++ b/kubernetes/aaf/charts/aaf-hello/templates/NOTES.txt
@@ -1,3 +1,17 @@
+# Copyright © 2018 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.
+
1. Get the application URL by running these commands:
{{- if .Values.ingress.enabled }}
{{- range .Values.ingress.hosts }}
diff --git a/kubernetes/aaf/charts/aaf-locate/templates/NOTES.txt b/kubernetes/aaf/charts/aaf-locate/templates/NOTES.txt
index c60c745ca3..bd74a42cd5 100644
--- a/kubernetes/aaf/charts/aaf-locate/templates/NOTES.txt
+++ b/kubernetes/aaf/charts/aaf-locate/templates/NOTES.txt
@@ -1,3 +1,17 @@
+# Copyright © 2018 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.
+
1. Get the application URL by running these commands:
{{- if .Values.ingress.enabled }}
{{- range .Values.ingress.hosts }}
diff --git a/kubernetes/aaf/charts/aaf-oauth/templates/NOTES.txt b/kubernetes/aaf/charts/aaf-oauth/templates/NOTES.txt
index c60c745ca3..bd74a42cd5 100644
--- a/kubernetes/aaf/charts/aaf-oauth/templates/NOTES.txt
+++ b/kubernetes/aaf/charts/aaf-oauth/templates/NOTES.txt
@@ -1,3 +1,17 @@
+# Copyright © 2018 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.
+
1. Get the application URL by running these commands:
{{- if .Values.ingress.enabled }}
{{- range .Values.ingress.hosts }}
diff --git a/kubernetes/aaf/resources/config/backup/backup.sh b/kubernetes/aaf/resources/config/backup/backup.sh
index 1359d3de83..0cc2f6287f 100644
--- a/kubernetes/aaf/resources/config/backup/backup.sh
+++ b/kubernetes/aaf/resources/config/backup/backup.sh
@@ -1,3 +1,17 @@
+# Copyright © 2018 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.
+
# BEGIN Store prev
BD=/opt/app/osaaf/backup
if [ -e "$BD/6day" ]; then
diff --git a/kubernetes/aaf/resources/config/backup/cbackup.sh b/kubernetes/aaf/resources/config/backup/cbackup.sh
index 9c91d0c670..de918520c6 100644
--- a/kubernetes/aaf/resources/config/backup/cbackup.sh
+++ b/kubernetes/aaf/resources/config/backup/cbackup.sh
@@ -1,3 +1,17 @@
+# Copyright © 2018 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.
+
cd /opt/app/cass_backup
DATA="ns role perm ns_attrib user_role cred cert x509 delegate approval approved future notify artifact health history"
PWD=cassandra
diff --git a/kubernetes/aaf/resources/config/data/identities.dat b/kubernetes/aaf/resources/config/data/identities.dat
index 39d18a12b9..cb7f01db20 100644
--- a/kubernetes/aaf/resources/config/data/identities.dat
+++ b/kubernetes/aaf/resources/config/data/identities.dat
@@ -1,3 +1,17 @@
+# Copyright © 2018 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.
+
#
# Sample Identities.dat
# This file is for use with the "Default Organization". It is a simple mechanism to have a basic ILM structure to use with
diff --git a/kubernetes/aaf/resources/config/data/sample.identities.dat b/kubernetes/aaf/resources/config/data/sample.identities.dat
index 39d18a12b9..cf2ca6dcb6 100644
--- a/kubernetes/aaf/resources/config/data/sample.identities.dat
+++ b/kubernetes/aaf/resources/config/data/sample.identities.dat
@@ -1,3 +1,16 @@
+# Copyright © 2018 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.
#
# Sample Identities.dat
# This file is for use with the "Default Organization". It is a simple mechanism to have a basic ILM structure to use with
diff --git a/kubernetes/aaf/resources/config/etc/org.osaaf.cm.props b/kubernetes/aaf/resources/config/etc/org.osaaf.cm.props
index d634cfeb37..ccd8a3329e 100644
--- a/kubernetes/aaf/resources/config/etc/org.osaaf.cm.props
+++ b/kubernetes/aaf/resources/config/etc/org.osaaf.cm.props
@@ -1,3 +1,17 @@
+# Copyright © 2018 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.
+
##
## org.osaaf.cm.props
## AAF Certificate Manager properties
diff --git a/kubernetes/aaf/resources/config/etc/org.osaaf.common.props b/kubernetes/aaf/resources/config/etc/org.osaaf.common.props
index 8b75e709d4..052a2ec901 100644
--- a/kubernetes/aaf/resources/config/etc/org.osaaf.common.props
+++ b/kubernetes/aaf/resources/config/etc/org.osaaf.common.props
@@ -1,3 +1,17 @@
+# Copyright © 2018 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.
+
############################################################
# Common properties for all AAF Components
# on 2018-03-02 06:59.628-0500
diff --git a/kubernetes/aaf/resources/config/etc/org.osaaf.fs.props b/kubernetes/aaf/resources/config/etc/org.osaaf.fs.props
index d499f97f56..266e08e74b 100644
--- a/kubernetes/aaf/resources/config/etc/org.osaaf.fs.props
+++ b/kubernetes/aaf/resources/config/etc/org.osaaf.fs.props
@@ -1,3 +1,18 @@
+# Copyright © 2018 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.
+
+
##
## org.osaaf.locator
## AAF Locator Properties
diff --git a/kubernetes/aaf/resources/config/etc/org.osaaf.gui.props b/kubernetes/aaf/resources/config/etc/org.osaaf.gui.props
index 86b3aa6467..6c40b40c34 100644
--- a/kubernetes/aaf/resources/config/etc/org.osaaf.gui.props
+++ b/kubernetes/aaf/resources/config/etc/org.osaaf.gui.props
@@ -1,3 +1,18 @@
+# Copyright © 2018 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.
+
+
##
## org.osaaf.locator
## AAF Locator Properties
diff --git a/kubernetes/aaf/resources/config/etc/org.osaaf.hello.props b/kubernetes/aaf/resources/config/etc/org.osaaf.hello.props
index d832aaf7e0..eeacc1da94 100644
--- a/kubernetes/aaf/resources/config/etc/org.osaaf.hello.props
+++ b/kubernetes/aaf/resources/config/etc/org.osaaf.hello.props
@@ -1,3 +1,18 @@
+# Copyright © 2018 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.
+
+
##
## org.osaaf.locator
## AAF Locator Properties
diff --git a/kubernetes/aaf/resources/config/etc/org.osaaf.locate.props b/kubernetes/aaf/resources/config/etc/org.osaaf.locate.props
index 47a174ed44..1026dd85bd 100644
--- a/kubernetes/aaf/resources/config/etc/org.osaaf.locate.props
+++ b/kubernetes/aaf/resources/config/etc/org.osaaf.locate.props
@@ -1,3 +1,18 @@
+# Copyright © 2018 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.
+
+
##
## org.osaaf.locator
## AAF Locator Properties
diff --git a/kubernetes/aaf/resources/config/etc/org.osaaf.oauth.props b/kubernetes/aaf/resources/config/etc/org.osaaf.oauth.props
index 82e80c716a..d2a5b97ec2 100644
--- a/kubernetes/aaf/resources/config/etc/org.osaaf.oauth.props
+++ b/kubernetes/aaf/resources/config/etc/org.osaaf.oauth.props
@@ -1,3 +1,17 @@
+# Copyright © 2018 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.
+
##
## org.osaaf.locator
## AAF Locator Properties
diff --git a/kubernetes/aaf/resources/config/etc/org.osaaf.orgs.props b/kubernetes/aaf/resources/config/etc/org.osaaf.orgs.props
index 66bfd2fad3..c609de2027 100644
--- a/kubernetes/aaf/resources/config/etc/org.osaaf.orgs.props
+++ b/kubernetes/aaf/resources/config/etc/org.osaaf.orgs.props
@@ -1,3 +1,17 @@
+# Copyright © 2018 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.
+
#
# Define Organizations for use in some of the components. Not all use them
#
diff --git a/kubernetes/aaf/resources/config/etc/org.osaaf.service.props b/kubernetes/aaf/resources/config/etc/org.osaaf.service.props
index ff3e0b5c33..adb9032929 100644
--- a/kubernetes/aaf/resources/config/etc/org.osaaf.service.props
+++ b/kubernetes/aaf/resources/config/etc/org.osaaf.service.props
@@ -1,3 +1,18 @@
+# Copyright © 2018 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.
+
+
##
## org.osaaf.service
## AAF Service Properties
diff --git a/kubernetes/aaf/resources/config/local/org.osaaf.aaf.props b/kubernetes/aaf/resources/config/local/org.osaaf.aaf.props
index 37a9d62711..21910eb627 100644
--- a/kubernetes/aaf/resources/config/local/org.osaaf.aaf.props
+++ b/kubernetes/aaf/resources/config/local/org.osaaf.aaf.props
@@ -1,9 +1,17 @@
-############################################################
-# Properties Generated by AT&T Certificate Manager
-# by jg1555
-# on 2018-02-21T10:28:08.909-0600
-# @copyright 2016, AT&T
-############################################################
+# Copyright © 2018 Amdocs, Bell Canada, AT&T
+#
+# 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.
+
cm_url=https://{{.Values.config.cmServiceName}}:8150
#hostname=aaf.osaaf.org
aaf_env=DEV
diff --git a/kubernetes/cli/templates/NOTES.txt b/kubernetes/cli/templates/NOTES.txt
index 91d8ed42f1..21018aea02 100644
--- a/kubernetes/cli/templates/NOTES.txt
+++ b/kubernetes/cli/templates/NOTES.txt
@@ -1,3 +1,17 @@
+# Copyright © 2018 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.
+
1. Get the application URL by running these commands:
{{- if .Values.ingress.enabled }}
{{- range .Values.ingress.hosts }}
diff --git a/kubernetes/readiness/docker/init/ready.py b/kubernetes/readiness/docker/init/ready.py
index 6d2edef81c..f4a5e5da8f 100644
--- a/kubernetes/readiness/docker/init/ready.py
+++ b/kubernetes/readiness/docker/init/ready.py
@@ -41,7 +41,16 @@ def is_ready(container_name):
if i.status.container_statuses is None:
continue
for s in i.status.container_statuses:
- if s.name == container_name:
+ if i.metadata.owner_references[0].kind == "StatefulSet":
+ if i.metadata.name == container_name:
+ ready = s.ready
+ if not ready:
+ log.info(container_name + " is not ready.")
+ else:
+ log.info(container_name + " is ready!")
+ else:
+ continue
+ elif s.name == container_name:
ready = s.ready
if not ready:
log.info(container_name + " is not ready.")
diff --git a/kubernetes/sdc/charts/sdc-act/resources/config/configuration.yaml b/kubernetes/sdc/charts/sdc-act/resources/config/configuration.yaml
deleted file mode 100644
index af380172e0..0000000000
--- a/kubernetes/sdc/charts/sdc-act/resources/config/configuration.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-cassandraConfig:
- cassandraHosts: {{ .Values.config.cassandraHosts }}
- reconnectTimeout : {{ .Values.config.cassandraReconnectTimeout }}
- socketReadTimeout: {{ .Values.config.cassandraSocketReadTimeout }}
- socketConnectTimeout: {{ .Values.config.cassandraSocketConnectTimeout }}
- authenticate: true
- username: {{ .Values.config.cassandraUserName }}
- password: {{ .Values.config.cassandraUserPassword }}
- ssl: {{ .Values.config.cassandraSslEnabled }}
- truststorePath : {{ .Values.config.cassandraTruststorePath }}
- truststorePassword : {{ .Values.config.cassandraTruststorePassword }}
-
diff --git a/kubernetes/sdc/charts/sdc-act/templates/configmap.yaml b/kubernetes/sdc/charts/sdc-act/templates/configmap.yaml
deleted file mode 100644
index 4ccc7cc526..0000000000
--- a/kubernetes/sdc/charts/sdc-act/templates/configmap.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
-# 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.
-
-apiVersion: v1
-kind: ConfigMap
-metadata:
- name: {{ include "common.fullname" . }}-configmap
- namespace: {{ include "common.namespace" . }}
-data:
-{{ tpl (.Files.Glob "resources/config/*").AsConfig . | indent 2 }} \ No newline at end of file
diff --git a/kubernetes/sdc/charts/sdc-act/.helmignore b/kubernetes/sdc/charts/sdc-wfd-be/.helmignore
index f0c1319444..f0c1319444 100644
--- a/kubernetes/sdc/charts/sdc-act/.helmignore
+++ b/kubernetes/sdc/charts/sdc-wfd-be/.helmignore
diff --git a/kubernetes/sdc/charts/sdc-act/Chart.yaml b/kubernetes/sdc/charts/sdc-wfd-be/Chart.yaml
index 7fa0d2d008..0de4faaeb4 100644
--- a/kubernetes/sdc/charts/sdc-act/Chart.yaml
+++ b/kubernetes/sdc/charts/sdc-wfd-be/Chart.yaml
@@ -1,4 +1,4 @@
-# Copyright © 2017 Amdocs, Bell Canada
+# Copyright © 2018 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.
@@ -13,6 +13,6 @@
# limitations under the License.
apiVersion: v1
-description: ONAP Activity Spec WebService
-name: sdc-act
+description: ONAP Service Design and Creation Workflow Designer backend
+name: sdc-wfd-be
version: 2.0.0 \ No newline at end of file
diff --git a/kubernetes/sdc/charts/sdc-act/templates/NOTES.txt b/kubernetes/sdc/charts/sdc-wfd-be/templates/NOTES.txt
index 41f9706fec..a3c79b12a4 100644
--- a/kubernetes/sdc/charts/sdc-act/templates/NOTES.txt
+++ b/kubernetes/sdc/charts/sdc-wfd-be/templates/NOTES.txt
@@ -1,4 +1,4 @@
-# Copyright © 2018 Amdocs, AT&T, Bell Canada
+# Copyright © 2018 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.
diff --git a/kubernetes/sdc/charts/sdc-act/templates/deployment.yaml b/kubernetes/sdc/charts/sdc-wfd-be/templates/deployment.yaml
index 542982fd63..a8225040ac 100644
--- a/kubernetes/sdc/charts/sdc-act/templates/deployment.yaml
+++ b/kubernetes/sdc/charts/sdc-wfd-be/templates/deployment.yaml
@@ -1,4 +1,4 @@
-# Copyright © 2017 Amdocs, AT&T, Bell Canada
+# Copyright © 2018 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.
@@ -38,7 +38,7 @@ spec:
- /root/job_complete.py
args:
- --job-name
- - {{ include "common.fullname" . }}-init-activity-spec
+ - {{ include "common.fullname" . }}-workflow-init
env:
- name: NAMESPACE
valueFrom:
@@ -68,13 +68,19 @@ spec:
env:
- name: JAVA_OPTIONS
value: {{ .Values.config.javaOptions }}
- volumeMounts:
- - name: {{ include "common.fullname" . }}-config
- mountPath: /etc/onap/activity-spec/be/config
- volumes:
- - name: {{ include "common.fullname" . }}-config
- configMap:
- name : {{ include "common.fullname" . }}-configmap
- defaultMode: 0755
+ - name: CS_HOSTS
+ value: "{{ .Values.config.cassandraHosts }}"
+ - name: CS_PORT
+ value: "{{ .Values.config.cassandraClientPort }}"
+ - name: CS_USER
+ valueFrom:
+ secretKeyRef: {name: {{ .Release.Name }}-sdc-cs-secrets, key: sdc_user}
+ - name: CS_PASSWORD
+ valueFrom:
+ secretKeyRef: {name: {{ .Release.Name }}-sdc-cs-secrets, key: sdc_password}
+ - name: SDC_PROTOCOL
+ value: "{{ .Values.config.sdcProtocol }}"
+ - name: SDC_ENDPOINT
+ value: "{{ .Values.config.sdcEndpoint }}"
imagePullSecrets:
- name: "{{ include "common.namespace" . }}-docker-registry-key" \ No newline at end of file
diff --git a/kubernetes/sdc/charts/sdc-act/templates/job.yaml b/kubernetes/sdc/charts/sdc-wfd-be/templates/job.yaml
index bd9d9d1e00..f4a68d7752 100644
--- a/kubernetes/sdc/charts/sdc-act/templates/job.yaml
+++ b/kubernetes/sdc/charts/sdc-wfd-be/templates/job.yaml
@@ -1,4 +1,4 @@
-# Copyright © 2017 Amdocs, AT&T, Bell Canada
+# Copyright © 2018 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.
@@ -15,7 +15,7 @@
apiVersion: batch/v1
kind: Job
metadata:
- name: {{ include "common.fullname" . }}-init-activity-spec
+ name: {{ include "common.fullname" . }}-workflow-init
namespace: {{ include "common.namespace" . }}
labels:
app: {{ include "common.name" . }}-job
@@ -36,10 +36,10 @@ spec:
image: "{{ .Values.global.readinessRepository }}/{{ .Values.global.readinessImage }}"
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
command:
- - /root/ready.py
+ - /root/job_complete.py
args:
- - --container-name
- - sdc-cs
+ - --job-name
+ - {{ .Release.Name }}-sdc-cs-config-cassandra
env:
- name: NAMESPACE
valueFrom:
@@ -52,7 +52,11 @@ spec:
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
env:
- name: CS_HOST
- value: sdc-cs
+ value: "sdc-cs"
+ - name: CS_PORT
+ value: "{{ .Values.config.cassandraThriftClientPort }}"
+ - name: CS_AUTHENTICATE
+ value: "{{ .Values.config.cassandaAuthenticationEnabled }}"
- name: CS_USER
valueFrom:
secretKeyRef: {name: {{ .Release.Name }}-sdc-cs-secrets, key: sdc_user}
@@ -61,4 +65,3 @@ spec:
secretKeyRef: {name: {{ .Release.Name }}-sdc-cs-secrets, key: sdc_password}
imagePullSecrets:
- name: "{{ include "common.namespace" . }}-docker-registry-key"
- restartPolicy: Never
diff --git a/kubernetes/sdc/charts/sdc-act/templates/service.yaml b/kubernetes/sdc/charts/sdc-wfd-be/templates/service.yaml
index 736ef740ee..acabaae282 100644
--- a/kubernetes/sdc/charts/sdc-act/templates/service.yaml
+++ b/kubernetes/sdc/charts/sdc-wfd-be/templates/service.yaml
@@ -1,4 +1,4 @@
-# Copyright © 2017 Amdocs, Bell Canada
+# Copyright © 2018 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.
diff --git a/kubernetes/sdc/charts/sdc-act/values.yaml b/kubernetes/sdc/charts/sdc-wfd-be/values.yaml
index 0df41573ea..057ebbe058 100644
--- a/kubernetes/sdc/charts/sdc-act/values.yaml
+++ b/kubernetes/sdc/charts/sdc-wfd-be/values.yaml
@@ -1,4 +1,4 @@
-# Copyright © 2017 Amdocs, Bell Canada
+# Copyright © 2018 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.
@@ -27,24 +27,21 @@ global:
#################################################################
# application image
repository: nexus3.onap.org:10001
-image: onap/activity-spec:1.3.0-SNAPSHOT
-configInitImage: onap/activity-spec-init:1.3.0-SNAPSHOT
+image: onap/workflow-backend:1.3.0-SNAPSHOT
+configInitImage: onap/workflow-init:1.3.0-SNAPSHOT
pullPolicy: Always
# flag to enable debugging - application support required
debugEnabled: false
config:
- javaOptions: "-Xmx1536m -Xms1536m"
- cassandraSslEnabled: "false"
- cassandraHosts: ['sdc-cs']
- cassandraUserName: "asdc_user"
- cassandraUserPassword: "Aa1234%^!"
- cassandraReconnectTimeout: 30000
- cassandraSocketReadTimeout: 20000
- cassandraSocketConnectTimeout: 20000
- cassandraTruststorePath: "/path/path"
- cassandraTruststorePassword: "Aa123456"
+ javaOptions: "-Xdebug -agentlib:jdwp=transport=dt_socket,address=6000,server=y,suspend=n -Xmx1536m -Xms1536m"
+ cassandaAuthenticationEnabled: true
+ cassandraHosts: sdc-cs
+ cassandraThriftClientPort: 9160
+ cassandraClientPort: 9042
+ sdcProtocol: HTTP
+ sdcEndpoint: sdc-be:8080
# default number of instances
replicaCount: 1
@@ -69,7 +66,7 @@ service:
type: NodePort
internalPort: 8080
externalPort: 8080
- portName: sdc-act
+ portName: sdc-wfd-be
nodePort: "57"
ingress:
diff --git a/kubernetes/sdc/charts/sdc-wfd/.helmignore b/kubernetes/sdc/charts/sdc-wfd-fe/.helmignore
index f0c1319444..f0c1319444 100644
--- a/kubernetes/sdc/charts/sdc-wfd/.helmignore
+++ b/kubernetes/sdc/charts/sdc-wfd-fe/.helmignore
diff --git a/kubernetes/sdc/charts/sdc-wfd/Chart.yaml b/kubernetes/sdc/charts/sdc-wfd-fe/Chart.yaml
index 1db5bb2fdd..60dd6c2ae8 100644
--- a/kubernetes/sdc/charts/sdc-wfd/Chart.yaml
+++ b/kubernetes/sdc/charts/sdc-wfd-fe/Chart.yaml
@@ -1,4 +1,4 @@
-# Copyright © 2018 ZTE
+# Copyright © 2018 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.
@@ -13,6 +13,6 @@
# limitations under the License.
apiVersion: v1
-description: ONAP Service Design and Creation Common Workflow Design
-name: sdc-wfd
+description: ONAP Service Design and Creation Workflow Designer frontend
+name: sdc-wfd-fe
version: 2.0.0 \ No newline at end of file
diff --git a/kubernetes/sdc/charts/sdc-wfd/templates/NOTES.txt b/kubernetes/sdc/charts/sdc-wfd-fe/templates/NOTES.txt
index d83c152a4c..a3c79b12a4 100644
--- a/kubernetes/sdc/charts/sdc-wfd/templates/NOTES.txt
+++ b/kubernetes/sdc/charts/sdc-wfd-fe/templates/NOTES.txt
@@ -1,3 +1,17 @@
+# Copyright © 2018 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.
+
1. Get the application URL by running these commands:
{{- if .Values.ingress.enabled }}
{{- range .Values.ingress.hosts }}
@@ -17,4 +31,3 @@
echo "Visit http://127.0.0.1:8080 to use your application"
kubectl port-forward $POD_NAME 8080:{{ .Values.service.internalPort }}
{{- end }}
-
diff --git a/kubernetes/sdc/charts/sdc-wfd-fe/templates/deployment.yaml b/kubernetes/sdc/charts/sdc-wfd-fe/templates/deployment.yaml
new file mode 100644
index 0000000000..0dfc61afb5
--- /dev/null
+++ b/kubernetes/sdc/charts/sdc-wfd-fe/templates/deployment.yaml
@@ -0,0 +1,112 @@
+# Copyright © 2018 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.
+
+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+ name: {{ include "common.fullname" . }}
+ namespace: {{ include "common.namespace" . }}
+ labels:
+ app: {{ include "common.name" . }}
+ chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+ release: {{ .Release.Name }}
+ heritage: {{ .Release.Service }}
+spec:
+ replicas: {{ .Values.replicaCount }}
+ template:
+ metadata:
+ labels:
+ app: {{ include "common.name" . }}
+ release: {{ .Release.Name }}
+ spec:
+ initContainers:
+ - name: {{ include "common.name" . }}-readiness
+ command:
+ - /root/ready.py
+ args:
+ - --container-name
+ - "sdc-wfd-be"
+ env:
+ - name: NAMESPACE
+ valueFrom:
+ fieldRef:
+ apiVersion: v1
+ fieldPath: metadata.namespace
+ image: "{{ .Values.global.readinessRepository }}/{{ .Values.global.readinessImage }}"
+ imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
+ containers:
+ - name: {{ include "common.name" . }}
+ image: "{{ include "common.repository" . }}/{{ .Values.image }}"
+ imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
+ ports:
+ - containerPort: {{ .Values.service.internalPort }}
+ {{ if .Values.liveness.enabled }}
+ livenessProbe:
+ tcpSocket:
+ port: {{ .Values.service.internalPort }}
+ initialDelaySeconds: {{ .Values.liveness.initialDelaySeconds }}
+ periodSeconds: {{ .Values.liveness.periodSeconds }}
+ {{ end }}
+ readinessProbe:
+ tcpSocket:
+ port: {{ .Values.service.internalPort }}
+ initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }}
+ periodSeconds: {{ .Values.readiness.periodSeconds }}
+ env:
+ - name: ENVNAME
+ value: {{ .Values.global.env.name }}
+ - name: JAVA_OPTIONS
+ value: {{ .Values.config.javaOptions }}
+ - name: BACKEND
+ value: {{ .Values.config.backendServerURL }}
+ volumeMounts:
+ - name: {{ include "common.fullname" . }}-localtime
+ mountPath: /etc/localtime
+ readOnly: true
+ resources:
+{{ toYaml .Values.resources | indent 12 }}
+ {{- if .Values.nodeSelector }}
+ nodeSelector:
+{{ toYaml .Values.nodeSelector | indent 10 }}
+ {{- end -}}
+ {{- if .Values.affinity }}
+ affinity:
+{{ toYaml .Values.affinity | indent 10 }}
+ {{- end }}
+
+ # side car containers
+ - name: {{ include "common.name" . }}-filebeat-onap
+ image: "{{ .Values.global.loggingRepository }}/{{ .Values.global.loggingImage }}"
+ imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
+ volumeMounts:
+ - name: {{ include "common.fullname" . }}-filebeat-conf
+ mountPath: /usr/share/filebeat/filebeat.yml
+ subPath: filebeat.yml
+ - name: {{ include "common.fullname" . }}-logs
+ mountPath: /var/log/onap
+ - name: {{ include "common.fullname" . }}-data-filebeat
+ mountPath: /usr/share/filebeat/data
+ volumes:
+ - name: {{ include "common.fullname" . }}-localtime
+ hostPath:
+ path: /etc/localtime
+ - name: {{ include "common.fullname" . }}-filebeat-conf
+ configMap:
+ name: {{ .Release.Name }}-sdc-filebeat-configmap
+ - name: {{ include "common.fullname" . }}-data-filebeat
+ emptyDir: {}
+ - name: {{ include "common.fullname" . }}-logs
+ emptyDir: {}
+ imagePullSecrets:
+ - name: "{{ include "common.namespace" . }}-docker-registry-key" \ No newline at end of file
diff --git a/kubernetes/sdc/charts/sdc-wfd/templates/service.yaml b/kubernetes/sdc/charts/sdc-wfd-fe/templates/service.yaml
index 95ea8338a1..68e7f32943 100644
--- a/kubernetes/sdc/charts/sdc-wfd/templates/service.yaml
+++ b/kubernetes/sdc/charts/sdc-wfd-fe/templates/service.yaml
@@ -1,4 +1,4 @@
-# Copyright © 2018 ZTE
+# Copyright © 2018 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.
@@ -25,30 +25,26 @@ metadata:
annotations:
msb.onap.org/service-info: '[
{
- "serviceName": "workflow-modeler",
+ "serviceName": "wf-gui",
"version": "v1",
- "url": "/api/workflow-modeler/v1",
- "protocol": "REST",
- "port": "{{ .Values.service.internalPort }}",
- "enable_ssl": true,
- "visualRange":"1"
- },
- {
- "serviceName": "workflow-modeler-ui",
- "version": "v1",
- "url": "/workflow-modeler",
+ "url": "/",
"protocol": "UI",
- "path": "/workflow-modeler",
"port": "{{ .Values.service.internalPort }}",
- "visualRange":"1"
+ "visualRange":"0|1"
}
]'
spec:
type: {{ .Values.service.type }}
ports:
+ {{if eq .Values.service.type "NodePort" -}}
- port: {{ .Values.service.internalPort }}
nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort }}
- name: {{ .Values.service.portName }}
+ name: {{ .Values.service.portName | default "http" }}
+ {{- else -}}
+ - port: {{ .Values.service.externalPort }}
+ targetPort: {{ .Values.service.internalPort }}
+ name: {{ .Values.service.portName | default "http" }}
+ {{- end}}
selector:
app: {{ include "common.name" . }}
release: {{ .Release.Name }}
diff --git a/kubernetes/sdc/charts/sdc-wfd/values.yaml b/kubernetes/sdc/charts/sdc-wfd-fe/values.yaml
index ca11780f22..6eece108ee 100644
--- a/kubernetes/sdc/charts/sdc-wfd/values.yaml
+++ b/kubernetes/sdc/charts/sdc-wfd-fe/values.yaml
@@ -1,4 +1,4 @@
-# Copyright © 2018 ZTE
+# Copyright © 2018 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.
@@ -17,40 +17,70 @@
#################################################################
global:
nodePortPrefix: 302
+ readinessRepository: oomk8s
+ readinessImage: readiness-check:2.0.0
+ loggingRepository: docker.elastic.co
+ loggingImage: beats/filebeat:5.5.0
#################################################################
# Application configuration defaults.
#################################################################
# application image
repository: nexus3.onap.org:10001
-image: onap/sdc/sdc-workflow-designer:1.1.0
+image: onap/workflow-frontend:1.3.0-SNAPSHOT
pullPolicy: Always
# flag to enable debugging - application support required
debugEnabled: false
+config:
+ javaOptions: "-Xdebug -agentlib:jdwp=transport=dt_socket,address=6001,server=y,suspend=n -Xmx256m -Xms256m"
+ backendServerURL: "http://sdc-wfd-be:8080"
+
# default number of instances
replicaCount: 1
+nodeSelector: {}
+
+affinity: {}
+
# probe configuration parameters
liveness:
- initialDelaySeconds: 10
+ initialDelaySeconds: 60
periodSeconds: 10
# necessary to disable liveness probe when setting breakpoints
# in debugger so K8s doesn't restart unresponsive container
enabled: true
readiness:
- initialDelaySeconds: 10
+ initialDelaySeconds: 60
periodSeconds: 10
service:
type: NodePort
- name: sdc-wfd
- portName: sdc-wfd
- nodePort: "56"
internalPort: 8080
+ externalPort: 8080
+ portName: sdc-wfd-fe
+ nodePort: "56"
ingress:
enabled: false
+resources: {}
+ # We usually recommend not to specify default resources and to leave this as a conscious
+ # choice for the user. This also increases chances charts run on environments with little
+ # resources, such as Minikube. If you do want to specify resources, uncomment the following
+ # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
+ #
+ # Example:
+ # Configure resource requests and limits
+ # ref: http://kubernetes.io/docs/user-guide/compute-resources/
+ # Minimum memory for development is 2 CPU cores and 4GB memory
+ # Minimum memory for production is 4 CPU cores and 8GB memory
+#resources:
+# limits:
+# cpu: 2
+# memory: 4Gi
+# requests:
+# cpu: 2
+# memory: 4Gi
diff --git a/kubernetes/sdc/charts/sdc-wfd/templates/deployment.yaml b/kubernetes/sdc/charts/sdc-wfd/templates/deployment.yaml
deleted file mode 100644
index f6ec2c7a0b..0000000000
--- a/kubernetes/sdc/charts/sdc-wfd/templates/deployment.yaml
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright © 2018 ZTE
-#
-# 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.
-
-apiVersion: extensions/v1beta1
-kind: Deployment
-metadata:
- name: {{ include "common.fullname" . }}
- namespace: {{ include "common.namespace" . }}
- labels:
- app: {{ include "common.name" . }}
- chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
- release: {{ .Release.Name }}
- heritage: {{ .Release.Service }}
-spec:
- replicas: {{ .Values.replicaCount }}
- template:
- metadata:
- labels:
- app: {{ include "common.name" . }}
- release: {{ .Release.Name }}
- spec:
- containers:
- - name: {{ include "common.name" . }}
- image: "{{ include "common.repository" . }}/{{ .Values.image }}"
- imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
- ports:
- - containerPort: {{ .Values.service.internalPort }}
- {{ if eq .Values.liveness.enabled true }}
- livenessProbe:
- tcpSocket:
- port: {{ .Values.service.internalPort }}
- initialDelaySeconds: {{ .Values.liveness.initialDelaySeconds }}
- periodSeconds: {{ .Values.liveness.periodSeconds }}
- {{ end }}
- readinessProbe:
- tcpSocket:
- port: {{ .Values.service.internalPort }}
- initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }}
- periodSeconds: {{ .Values.readiness.periodSeconds }}
- imagePullSecrets:
- - name: "{{ include "common.namespace" . }}-docker-registry-key" \ No newline at end of file
diff --git a/kubernetes/sdc/resources/config/environments/AUTO.json b/kubernetes/sdc/resources/config/environments/AUTO.json
index 7700a787bf..52240457e1 100755
--- a/kubernetes/sdc/resources/config/environments/AUTO.json
+++ b/kubernetes/sdc/resources/config/environments/AUTO.json
@@ -61,8 +61,8 @@
"dcae_dt_source_url": ""
},
"WORKFLOW": {
- "workflow_discovery_url": "{{.Values.config.environment.workflowUrl}}",
- "workflow_source_url": "{{.Values.config.environment.workflowUrl}}"
+ "workflow_discovery_url": "http://sdc-wfd-fe.{{include "common.namespace" .}}:8080",
+ "workflow_source_url": "http://sdc.workflow.plugin.simpledemo.onap.org:30256"
}
},
"VnfRepo": {
diff --git a/kubernetes/sdnc/charts/ueb-listener/resources/config/ueb-listener.properties b/kubernetes/sdnc/charts/ueb-listener/resources/config/ueb-listener.properties
index b5c88241c4..4ff572a762 100644
--- a/kubernetes/sdnc/charts/ueb-listener/resources/config/ueb-listener.properties
+++ b/kubernetes/sdnc/charts/ueb-listener/resources/config/ueb-listener.properties
@@ -13,10 +13,10 @@ org.onap.ccsdk.sli.northbound.uebclient.spool.archive=/opt/onap/sdnc/ueb-listene
org.onap.ccsdk.sli.northbound.uebclient.polling-interval=30
org.onap.ccsdk.sli.northbound.uebclient.polling-timeout=15
org.onap.ccsdk.sli.northbound.uebclient.client-startup-timeout=900
-org.onap.ccsdk.sli.northbound.uebclient.relevant-artifact-types=YANG_XML,VF_LICENSE,TOSCA_CSAR,UCPE_LAYER_2_CONFIGURATION
+org.onap.ccsdk.sli.northbound.uebclient.relevant-artifact-types=TOSCA_CSAR
org.onap.ccsdk.sli.northbound.uebclient.activate-server-tls-auth=false
org.onap.ccsdk.sli.northbound.uebclient.keystore-path=
org.onap.ccsdk.sli.northbound.uebclient.keystore-password=
-org.onap.ccsdk.sli.northbound.uebclient.xslt-path-list=
+org.onap.ccsdk.sli.northbound.uebclient.xslt-path-list=/opt/onap/sdnc/ueb-listener/lib/normalizeTagNames.xslt,/opt/onap/sdnc/ueb-listener/lib/removeNs.xslt
org.onap.ccsdk.sli.northbound.uebclient.artifact-map=/opt/onap/sdnc/data/properties/artifact.map
org.onap.ccsdk.sli.northbound.uebclient.msg-bus-address=message-router.{{.Release.Namespace}},message-router.{{.Release.Namespace}}
diff --git a/kubernetes/vid/charts/vid-galera/Chart.yaml b/kubernetes/vid/charts/vid-galera/Chart.yaml
index 85f36dc6fb..47f9e7e31d 100644
--- a/kubernetes/vid/charts/vid-galera/Chart.yaml
+++ b/kubernetes/vid/charts/vid-galera/Chart.yaml
@@ -1,3 +1,17 @@
+# Copyright © 2018 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.
+
apiVersion: v1
description: Chart for MariaDB Galera cluster
name: mariadb-galera
diff --git a/kubernetes/vid/charts/vid-galera/templates/NOTES.txt b/kubernetes/vid/charts/vid-galera/templates/NOTES.txt
index 3dd25ac4b7..c44fa8948e 100644
--- a/kubernetes/vid/charts/vid-galera/templates/NOTES.txt
+++ b/kubernetes/vid/charts/vid-galera/templates/NOTES.txt
@@ -1,3 +1,17 @@
+# Copyright © 2018 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.
+
MariaDB-Galera service can be accessed via port 3306 on the following DNS name from within your cluster:
{{ include "common.fullname" . }}.{{ .Release.Namespace }}.svc.cluster.local
diff --git a/kubernetes/vid/charts/vid-galera/templates/configmap.yaml b/kubernetes/vid/charts/vid-galera/templates/configmap.yaml
index ea90cd3e45..aff9f5b857 100644
--- a/kubernetes/vid/charts/vid-galera/templates/configmap.yaml
+++ b/kubernetes/vid/charts/vid-galera/templates/configmap.yaml
@@ -1,3 +1,17 @@
+# Copyright © 2018 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.
+
apiVersion: v1
kind: ConfigMap
metadata:
diff --git a/kubernetes/vid/charts/vid-galera/templates/secrets.yaml b/kubernetes/vid/charts/vid-galera/templates/secrets.yaml
index 101a7eba79..233158f791 100644
--- a/kubernetes/vid/charts/vid-galera/templates/secrets.yaml
+++ b/kubernetes/vid/charts/vid-galera/templates/secrets.yaml
@@ -1,3 +1,17 @@
+# Copyright © 2018 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.
+
apiVersion: v1
kind: Secret
metadata:
diff --git a/kubernetes/vid/charts/vid-galera/templates/service.yaml b/kubernetes/vid/charts/vid-galera/templates/service.yaml
index 348baa9ddc..ae11a26629 100644
--- a/kubernetes/vid/charts/vid-galera/templates/service.yaml
+++ b/kubernetes/vid/charts/vid-galera/templates/service.yaml
@@ -1,3 +1,17 @@
+# Copyright © 2018 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.
+
apiVersion: v1
kind: Service
metadata:
diff --git a/kubernetes/vid/charts/vid-galera/templates/statefulset.yaml b/kubernetes/vid/charts/vid-galera/templates/statefulset.yaml
index 7d6ce6e676..816d473257 100644
--- a/kubernetes/vid/charts/vid-galera/templates/statefulset.yaml
+++ b/kubernetes/vid/charts/vid-galera/templates/statefulset.yaml
@@ -1,3 +1,17 @@
+# Copyright © 2018 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.
+
apiVersion: apps/v1beta1
kind: StatefulSet
metadata:
diff --git a/kubernetes/vid/charts/vid-galera/values.yaml b/kubernetes/vid/charts/vid-galera/values.yaml
index 31955753df..eb715a8b48 100644
--- a/kubernetes/vid/charts/vid-galera/values.yaml
+++ b/kubernetes/vid/charts/vid-galera/values.yaml
@@ -1,3 +1,17 @@
+# Copyright © 2018 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.
+
#################################################################
# Global configuration defaults.
#################################################################
diff --git a/kubernetes/vid/resources/config/log/filebeat/filebeat.yml b/kubernetes/vid/resources/config/log/filebeat/filebeat.yml
index b0d4690754..1854263feb 100644
--- a/kubernetes/vid/resources/config/log/filebeat/filebeat.yml
+++ b/kubernetes/vid/resources/config/log/filebeat/filebeat.yml
@@ -1,3 +1,17 @@
+# Copyright © 2018 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.
+
filebeat.prospectors:
#it is mandatory, in our case it's log
- input_type: log
diff --git a/kubernetes/vid/templates/NOTES.txt b/kubernetes/vid/templates/NOTES.txt
index 6e0b9fc06d..a209ea8f29 100644
--- a/kubernetes/vid/templates/NOTES.txt
+++ b/kubernetes/vid/templates/NOTES.txt
@@ -1,3 +1,17 @@
+# 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.
+
1. Get the application URL by running these commands:
{{- if .Values.ingress.enabled }}
{{- range .Values.ingress.hosts }}
diff --git a/kubernetes/vid/templates/check-job-completion-configmap.yaml b/kubernetes/vid/templates/check-job-completion-configmap.yaml
index b9c4488338..270615a04b 100644
--- a/kubernetes/vid/templates/check-job-completion-configmap.yaml
+++ b/kubernetes/vid/templates/check-job-completion-configmap.yaml
@@ -1,3 +1,17 @@
+# Copyright © 2018 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.
+
apiVersion: v1
kind: ConfigMap
metadata:
diff --git a/kubernetes/vid/templates/cluster-ready-configmap.yaml b/kubernetes/vid/templates/cluster-ready-configmap.yaml
index 296db335a7..86f8d9129b 100644
--- a/kubernetes/vid/templates/cluster-ready-configmap.yaml
+++ b/kubernetes/vid/templates/cluster-ready-configmap.yaml
@@ -1,3 +1,17 @@
+# Copyright © 2018 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.
+
apiVersion: v1
kind: ConfigMap
metadata:
diff --git a/kubernetes/vid/templates/dbcmd-configmap.yaml b/kubernetes/vid/templates/dbcmd-configmap.yaml
index 7c06e748f4..aa088011ea 100644
--- a/kubernetes/vid/templates/dbcmd-configmap.yaml
+++ b/kubernetes/vid/templates/dbcmd-configmap.yaml
@@ -1,3 +1,17 @@
+# Copyright © 2018 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.
+
apiVersion: v1
kind: ConfigMap
metadata:
diff --git a/kubernetes/vid/templates/galera-sql-configmap.yaml b/kubernetes/vid/templates/galera-sql-configmap.yaml
index ccda497887..7f05af56a9 100644
--- a/kubernetes/vid/templates/galera-sql-configmap.yaml
+++ b/kubernetes/vid/templates/galera-sql-configmap.yaml
@@ -1,3 +1,17 @@
+# Copyright © 2018 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.
+
apiVersion: v1
kind: ConfigMap
metadata:
diff --git a/kubernetes/vid/templates/vid-galera-config-job.yaml b/kubernetes/vid/templates/vid-galera-config-job.yaml
index 0e32261019..b893dbf617 100644
--- a/kubernetes/vid/templates/vid-galera-config-job.yaml
+++ b/kubernetes/vid/templates/vid-galera-config-job.yaml
@@ -1,3 +1,17 @@
+# Copyright © 2018 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.
+
apiVersion: batch/v1
kind: Job
metadata: