summaryrefslogtreecommitdiffstats
path: root/kubernetes/oof/components
diff options
context:
space:
mode:
authorSylvain Desbureaux <sylvain.desbureaux@orange.com>2020-10-22 06:39:52 +0000
committerGerrit Code Review <gerrit@onap.org>2020-10-22 06:39:52 +0000
commit593d0d500f75c127cc07872415eb709949bc98dc (patch)
tree9270598d5db6c08a288a62513261a65d470557fd /kubernetes/oof/components
parent8a94a1dc516b41c76d30a8e217c3d3397db366cb (diff)
parent544ded22f28d1b98c3187cb6fcde7da4548938f8 (diff)
Merge "[OOF] change comment style"
Diffstat (limited to 'kubernetes/oof/components')
-rw-r--r--kubernetes/oof/components/oof-cmso/components/oof-cmso-optimizer/resources/config/cadi.properties2
-rw-r--r--kubernetes/oof/components/oof-cmso/components/oof-cmso-optimizer/resources/config/liquibase.properties2
-rw-r--r--kubernetes/oof/components/oof-cmso/components/oof-cmso-optimizer/resources/config/optimizer.properties4
-rw-r--r--kubernetes/oof/components/oof-cmso/components/oof-cmso-optimizer/templates/configmap.yaml2
-rw-r--r--kubernetes/oof/components/oof-cmso/components/oof-cmso-optimizer/templates/deployment.yaml2
-rw-r--r--kubernetes/oof/components/oof-cmso/components/oof-cmso-optimizer/templates/secret.yaml2
-rw-r--r--kubernetes/oof/components/oof-cmso/components/oof-cmso-optimizer/templates/service.yaml2
-rw-r--r--kubernetes/oof/components/oof-cmso/components/oof-cmso-service/resources/config/cadi.properties2
-rw-r--r--kubernetes/oof/components/oof-cmso/components/oof-cmso-service/resources/config/liquibase.properties2
-rw-r--r--kubernetes/oof/components/oof-cmso/components/oof-cmso-service/resources/config/optimizer.properties4
-rw-r--r--kubernetes/oof/components/oof-cmso/components/oof-cmso-service/resources/config/ticketmgt.properties2
-rw-r--r--kubernetes/oof/components/oof-cmso/components/oof-cmso-service/templates/configmap.yaml2
-rw-r--r--kubernetes/oof/components/oof-cmso/components/oof-cmso-service/templates/deployment.yaml2
-rw-r--r--kubernetes/oof/components/oof-cmso/components/oof-cmso-service/templates/secret.yaml2
-rw-r--r--kubernetes/oof/components/oof-cmso/components/oof-cmso-service/templates/service.yaml2
-rw-r--r--kubernetes/oof/components/oof-cmso/components/oof-cmso-ticketmgt/resources/config/cadi.properties2
-rw-r--r--kubernetes/oof/components/oof-cmso/components/oof-cmso-ticketmgt/resources/config/ticketmgt.properties2
-rw-r--r--kubernetes/oof/components/oof-cmso/components/oof-cmso-ticketmgt/templates/configmap.yaml2
-rw-r--r--kubernetes/oof/components/oof-cmso/components/oof-cmso-ticketmgt/templates/deployment.yaml2
-rw-r--r--kubernetes/oof/components/oof-cmso/components/oof-cmso-ticketmgt/templates/service.yaml2
-rw-r--r--kubernetes/oof/components/oof-cmso/components/oof-cmso-topology/resources/config/cadi.properties2
-rw-r--r--kubernetes/oof/components/oof-cmso/components/oof-cmso-topology/resources/config/topology.properties2
-rw-r--r--kubernetes/oof/components/oof-cmso/components/oof-cmso-topology/templates/configmap.yaml2
-rw-r--r--kubernetes/oof/components/oof-cmso/components/oof-cmso-topology/templates/deployment.yaml2
-rw-r--r--kubernetes/oof/components/oof-cmso/components/oof-cmso-topology/templates/service.yaml2
-rw-r--r--kubernetes/oof/components/oof-cmso/resources/log/filebeat/filebeat.yml2
-rw-r--r--kubernetes/oof/components/oof-cmso/templates/configmap.yaml2
-rw-r--r--kubernetes/oof/components/oof-cmso/templates/secret.yaml2
-rwxr-xr-xkubernetes/oof/components/oof-has/components/oof-has-api/templates/deployment.yaml2
-rwxr-xr-xkubernetes/oof/components/oof-has/components/oof-has-api/templates/service.yaml2
-rwxr-xr-xkubernetes/oof/components/oof-has/components/oof-has-controller/templates/deployment.yaml2
-rwxr-xr-xkubernetes/oof/components/oof-has/components/oof-has-data/templates/deployment.yaml2
-rwxr-xr-xkubernetes/oof/components/oof-has/components/oof-has-reservation/templates/deployment.yaml2
-rwxr-xr-xkubernetes/oof/components/oof-has/components/oof-has-solver/templates/deployment.yaml2
-rwxr-xr-xkubernetes/oof/components/oof-has/resources/config/conductor.conf2
-rwxr-xr-xkubernetes/oof/components/oof-has/resources/config/healthy.sh5
-rwxr-xr-xkubernetes/oof/components/oof-has/resources/config/log.conf2
-rwxr-xr-xkubernetes/oof/components/oof-has/resources/config/log/filebeat.yml2
-rwxr-xr-xkubernetes/oof/components/oof-has/templates/configmap.yaml2
39 files changed, 82 insertions, 3 deletions
diff --git a/kubernetes/oof/components/oof-cmso/components/oof-cmso-optimizer/resources/config/cadi.properties b/kubernetes/oof/components/oof-cmso/components/oof-cmso-optimizer/resources/config/cadi.properties
index 7904e8ff86..d7387dd1e1 100644
--- a/kubernetes/oof/components/oof-cmso/components/oof-cmso-optimizer/resources/config/cadi.properties
+++ b/kubernetes/oof/components/oof-cmso/components/oof-cmso-optimizer/resources/config/cadi.properties
@@ -1,3 +1,4 @@
+{{/*
#-------------------------------------------------------------------------------
# ============LICENSE_START==============================================
# Copyright (c) 2019 AT&T Intellectual Property.
@@ -16,6 +17,7 @@
# ============LICENSE_END=================================================
#
#-------------------------------------------------------------------------------
+*/}}
cadi_loglevel=DEBUG
cadi_prop_files=/share/etc/osaaf/local/org.onap.oof.props
diff --git a/kubernetes/oof/components/oof-cmso/components/oof-cmso-optimizer/resources/config/liquibase.properties b/kubernetes/oof/components/oof-cmso/components/oof-cmso-optimizer/resources/config/liquibase.properties
index 32d77bb663..46855120cd 100644
--- a/kubernetes/oof/components/oof-cmso/components/oof-cmso-optimizer/resources/config/liquibase.properties
+++ b/kubernetes/oof/components/oof-cmso/components/oof-cmso-optimizer/resources/config/liquibase.properties
@@ -1,3 +1,4 @@
+{{/*
###
# Copyright (c) 2019 AT&T Intellectual Property.
# Modifications Copyright (c) 2018 IBM.
@@ -28,6 +29,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
###
+*/}}
spring.datasource.jdbcUrl=jdbc:mariadb://${DB_HOST}:${DB_PORT}/${DB_SCHEMA}?createDatabaseIfNotExist=true
spring.datasource.driver-class-name=org.mariadb.jdbc.Driver
spring.datasource.username=${DB_USERNAME}
diff --git a/kubernetes/oof/components/oof-cmso/components/oof-cmso-optimizer/resources/config/optimizer.properties b/kubernetes/oof/components/oof-cmso/components/oof-cmso-optimizer/resources/config/optimizer.properties
index 98b7543756..4bf8f74666 100644
--- a/kubernetes/oof/components/oof-cmso/components/oof-cmso-optimizer/resources/config/optimizer.properties
+++ b/kubernetes/oof/components/oof-cmso/components/oof-cmso-optimizer/resources/config/optimizer.properties
@@ -1,3 +1,4 @@
+{{/*
#-------------------------------------------------------------------------------
# ============LICENSE_START==============================================
# Copyright (c) 2019 AT&T Intellectual Property.
@@ -16,6 +17,7 @@
# ============LICENSE_END=================================================
#
#-------------------------------------------------------------------------------
+*/}}
spring.datasource.url=jdbc:mariadb://${DB_HOST}:${DB_PORT}/${DB_SCHEMA}
spring.datasource.driver-class-name=org.mariadb.jdbc.Driver
spring.datasource.username=${DB_USERNAME}
@@ -60,4 +62,4 @@ aaf.namespace=org.onap.oof
cadi_loglevel=DEBUG
cadi_prop_files=/share/etc/osaaf/local/org.onap.oof.props
-aaf.user.roles=/share/etc/certs/AAFUserRoles.properties \ No newline at end of file
+aaf.user.roles=/share/etc/certs/AAFUserRoles.properties
diff --git a/kubernetes/oof/components/oof-cmso/components/oof-cmso-optimizer/templates/configmap.yaml b/kubernetes/oof/components/oof-cmso/components/oof-cmso-optimizer/templates/configmap.yaml
index e4d0a5c256..69614344fc 100644
--- a/kubernetes/oof/components/oof-cmso/components/oof-cmso-optimizer/templates/configmap.yaml
+++ b/kubernetes/oof/components/oof-cmso/components/oof-cmso-optimizer/templates/configmap.yaml
@@ -1,3 +1,4 @@
+{{/*
# Copyright © 2018 AT&T
#
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -11,6 +12,7 @@
# 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
diff --git a/kubernetes/oof/components/oof-cmso/components/oof-cmso-optimizer/templates/deployment.yaml b/kubernetes/oof/components/oof-cmso/components/oof-cmso-optimizer/templates/deployment.yaml
index fd131906a2..fb798ef791 100644
--- a/kubernetes/oof/components/oof-cmso/components/oof-cmso-optimizer/templates/deployment.yaml
+++ b/kubernetes/oof/components/oof-cmso/components/oof-cmso-optimizer/templates/deployment.yaml
@@ -1,3 +1,4 @@
+{{/*
# Copyright © 2018 AT&T
# Copyright (C) 2020 Wipro Limited.
#
@@ -12,6 +13,7 @@
# 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/v1
kind: Deployment
diff --git a/kubernetes/oof/components/oof-cmso/components/oof-cmso-optimizer/templates/secret.yaml b/kubernetes/oof/components/oof-cmso/components/oof-cmso-optimizer/templates/secret.yaml
index bd7eb8ea40..34932b713d 100644
--- a/kubernetes/oof/components/oof-cmso/components/oof-cmso-optimizer/templates/secret.yaml
+++ b/kubernetes/oof/components/oof-cmso/components/oof-cmso-optimizer/templates/secret.yaml
@@ -1,3 +1,4 @@
+{{/*
# Copyright © 2020 Samsung Electronics
#
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -11,5 +12,6 @@
# 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.
+*/}}
{{ include "common.secretFast" . }}
diff --git a/kubernetes/oof/components/oof-cmso/components/oof-cmso-optimizer/templates/service.yaml b/kubernetes/oof/components/oof-cmso/components/oof-cmso-optimizer/templates/service.yaml
index d0b586acf7..e8db9f7b2e 100644
--- a/kubernetes/oof/components/oof-cmso/components/oof-cmso-optimizer/templates/service.yaml
+++ b/kubernetes/oof/components/oof-cmso/components/oof-cmso-optimizer/templates/service.yaml
@@ -1,3 +1,4 @@
+{{/*
# Copyright © 2018 AT&T
#
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -11,6 +12,7 @@
# 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
diff --git a/kubernetes/oof/components/oof-cmso/components/oof-cmso-service/resources/config/cadi.properties b/kubernetes/oof/components/oof-cmso/components/oof-cmso-service/resources/config/cadi.properties
index 7904e8ff86..d7387dd1e1 100644
--- a/kubernetes/oof/components/oof-cmso/components/oof-cmso-service/resources/config/cadi.properties
+++ b/kubernetes/oof/components/oof-cmso/components/oof-cmso-service/resources/config/cadi.properties
@@ -1,3 +1,4 @@
+{{/*
#-------------------------------------------------------------------------------
# ============LICENSE_START==============================================
# Copyright (c) 2019 AT&T Intellectual Property.
@@ -16,6 +17,7 @@
# ============LICENSE_END=================================================
#
#-------------------------------------------------------------------------------
+*/}}
cadi_loglevel=DEBUG
cadi_prop_files=/share/etc/osaaf/local/org.onap.oof.props
diff --git a/kubernetes/oof/components/oof-cmso/components/oof-cmso-service/resources/config/liquibase.properties b/kubernetes/oof/components/oof-cmso/components/oof-cmso-service/resources/config/liquibase.properties
index 66dad37bd8..fb61e08fff 100644
--- a/kubernetes/oof/components/oof-cmso/components/oof-cmso-service/resources/config/liquibase.properties
+++ b/kubernetes/oof/components/oof-cmso/components/oof-cmso-service/resources/config/liquibase.properties
@@ -1,3 +1,4 @@
+{{/*
###
# Copyright &#194;© 2017-2018 AT&T Intellectual Property.
# Modifications Copyright &#194;© 2018 IBM.
@@ -28,6 +29,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
###
+*/}}
spring.datasource.jdbcUrl=jdbc:mariadb://${DB_HOST}:${DB_PORT}/${DB_SCHEMA}?createDatabaseIfNotExist=true
spring.datasource.driver-class-name=org.mariadb.jdbc.Driver
spring.datasource.username=${DB_USERNAME}
diff --git a/kubernetes/oof/components/oof-cmso/components/oof-cmso-service/resources/config/optimizer.properties b/kubernetes/oof/components/oof-cmso/components/oof-cmso-service/resources/config/optimizer.properties
index 1e4a8417c4..141b164e99 100644
--- a/kubernetes/oof/components/oof-cmso/components/oof-cmso-service/resources/config/optimizer.properties
+++ b/kubernetes/oof/components/oof-cmso/components/oof-cmso-service/resources/config/optimizer.properties
@@ -1,3 +1,4 @@
+{{/*
#-------------------------------------------------------------------------------
# Copyright (c) 2017-2018 AT&T Intellectual Property.
# Modifications Copyright ? 2018 IBM.
@@ -28,7 +29,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#-------------------------------------------------------------------------------
+*/}}
cmso.optimizer.request.url=https://oof-cmso-optimizer:7997/optimizer/v1/optimize/schedule
cmso.optimizer.status.url=https://oof-cmso-optimizer:7997/optimizer/v1/optimize/schedule
-cmso.optimizer.health.url=https://oof-cmso-optimizer:7997/optimizer/v1/health?checkInterfaces=true \ No newline at end of file
+cmso.optimizer.health.url=https://oof-cmso-optimizer:7997/optimizer/v1/health?checkInterfaces=true
diff --git a/kubernetes/oof/components/oof-cmso/components/oof-cmso-service/resources/config/ticketmgt.properties b/kubernetes/oof/components/oof-cmso/components/oof-cmso-service/resources/config/ticketmgt.properties
index bdf483d289..124df5712b 100644
--- a/kubernetes/oof/components/oof-cmso/components/oof-cmso-service/resources/config/ticketmgt.properties
+++ b/kubernetes/oof/components/oof-cmso/components/oof-cmso-service/resources/config/ticketmgt.properties
@@ -1,3 +1,4 @@
+{{/*
#-------------------------------------------------------------------------------
# Copyright © 2017-2018 AT&T Intellectual Property.
# Modifications Copyright © 2018 IBM.
@@ -28,6 +29,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#-------------------------------------------------------------------------------
+*/}}
tm.vnfs.per.ticket=1
tm.getPath=http://localhost:8089/cmso/v1/tm/getChangeRecord
diff --git a/kubernetes/oof/components/oof-cmso/components/oof-cmso-service/templates/configmap.yaml b/kubernetes/oof/components/oof-cmso/components/oof-cmso-service/templates/configmap.yaml
index e4d0a5c256..69614344fc 100644
--- a/kubernetes/oof/components/oof-cmso/components/oof-cmso-service/templates/configmap.yaml
+++ b/kubernetes/oof/components/oof-cmso/components/oof-cmso-service/templates/configmap.yaml
@@ -1,3 +1,4 @@
+{{/*
# Copyright © 2018 AT&T
#
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -11,6 +12,7 @@
# 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
diff --git a/kubernetes/oof/components/oof-cmso/components/oof-cmso-service/templates/deployment.yaml b/kubernetes/oof/components/oof-cmso/components/oof-cmso-service/templates/deployment.yaml
index 51613a82b7..522645e9ce 100644
--- a/kubernetes/oof/components/oof-cmso/components/oof-cmso-service/templates/deployment.yaml
+++ b/kubernetes/oof/components/oof-cmso/components/oof-cmso-service/templates/deployment.yaml
@@ -1,3 +1,4 @@
+{{/*
# Copyright (c) 2018 AT&T
# Copyright (C) 2020 Wipro Limited.
#
@@ -12,6 +13,7 @@
# 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/v1
kind: Deployment
diff --git a/kubernetes/oof/components/oof-cmso/components/oof-cmso-service/templates/secret.yaml b/kubernetes/oof/components/oof-cmso/components/oof-cmso-service/templates/secret.yaml
index bd7eb8ea40..34932b713d 100644
--- a/kubernetes/oof/components/oof-cmso/components/oof-cmso-service/templates/secret.yaml
+++ b/kubernetes/oof/components/oof-cmso/components/oof-cmso-service/templates/secret.yaml
@@ -1,3 +1,4 @@
+{{/*
# Copyright © 2020 Samsung Electronics
#
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -11,5 +12,6 @@
# 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.
+*/}}
{{ include "common.secretFast" . }}
diff --git a/kubernetes/oof/components/oof-cmso/components/oof-cmso-service/templates/service.yaml b/kubernetes/oof/components/oof-cmso/components/oof-cmso-service/templates/service.yaml
index d0b586acf7..e8db9f7b2e 100644
--- a/kubernetes/oof/components/oof-cmso/components/oof-cmso-service/templates/service.yaml
+++ b/kubernetes/oof/components/oof-cmso/components/oof-cmso-service/templates/service.yaml
@@ -1,3 +1,4 @@
+{{/*
# Copyright © 2018 AT&T
#
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -11,6 +12,7 @@
# 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
diff --git a/kubernetes/oof/components/oof-cmso/components/oof-cmso-ticketmgt/resources/config/cadi.properties b/kubernetes/oof/components/oof-cmso/components/oof-cmso-ticketmgt/resources/config/cadi.properties
index 7904e8ff86..d7387dd1e1 100644
--- a/kubernetes/oof/components/oof-cmso/components/oof-cmso-ticketmgt/resources/config/cadi.properties
+++ b/kubernetes/oof/components/oof-cmso/components/oof-cmso-ticketmgt/resources/config/cadi.properties
@@ -1,3 +1,4 @@
+{{/*
#-------------------------------------------------------------------------------
# ============LICENSE_START==============================================
# Copyright (c) 2019 AT&T Intellectual Property.
@@ -16,6 +17,7 @@
# ============LICENSE_END=================================================
#
#-------------------------------------------------------------------------------
+*/}}
cadi_loglevel=DEBUG
cadi_prop_files=/share/etc/osaaf/local/org.onap.oof.props
diff --git a/kubernetes/oof/components/oof-cmso/components/oof-cmso-ticketmgt/resources/config/ticketmgt.properties b/kubernetes/oof/components/oof-cmso/components/oof-cmso-ticketmgt/resources/config/ticketmgt.properties
index c4c9d83dda..6480537988 100644
--- a/kubernetes/oof/components/oof-cmso/components/oof-cmso-ticketmgt/resources/config/ticketmgt.properties
+++ b/kubernetes/oof/components/oof-cmso/components/oof-cmso-ticketmgt/resources/config/ticketmgt.properties
@@ -1,3 +1,4 @@
+{{/*
#-------------------------------------------------------------------------------
# Copyright © 2017-2019 AT&T Intellectual Property.
# Modifications Copyright © 2018 IBM.
@@ -28,6 +29,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#-------------------------------------------------------------------------------
+*/}}
cadi_loglevel=DEBUG
cadi_prop_files=/share/etc/osaaf/local/org.onap.oof.props
aaf.user.roles=/share/etc/certs/AAFUserRoles.properties
diff --git a/kubernetes/oof/components/oof-cmso/components/oof-cmso-ticketmgt/templates/configmap.yaml b/kubernetes/oof/components/oof-cmso/components/oof-cmso-ticketmgt/templates/configmap.yaml
index e4d0a5c256..69614344fc 100644
--- a/kubernetes/oof/components/oof-cmso/components/oof-cmso-ticketmgt/templates/configmap.yaml
+++ b/kubernetes/oof/components/oof-cmso/components/oof-cmso-ticketmgt/templates/configmap.yaml
@@ -1,3 +1,4 @@
+{{/*
# Copyright © 2018 AT&T
#
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -11,6 +12,7 @@
# 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
diff --git a/kubernetes/oof/components/oof-cmso/components/oof-cmso-ticketmgt/templates/deployment.yaml b/kubernetes/oof/components/oof-cmso/components/oof-cmso-ticketmgt/templates/deployment.yaml
index 8f8ca196b9..929e0fb731 100644
--- a/kubernetes/oof/components/oof-cmso/components/oof-cmso-ticketmgt/templates/deployment.yaml
+++ b/kubernetes/oof/components/oof-cmso/components/oof-cmso-ticketmgt/templates/deployment.yaml
@@ -1,3 +1,4 @@
+{{/*
# Copyright © 2018 AT&T
#
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -11,6 +12,7 @@
# 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/v1
kind: Deployment
diff --git a/kubernetes/oof/components/oof-cmso/components/oof-cmso-ticketmgt/templates/service.yaml b/kubernetes/oof/components/oof-cmso/components/oof-cmso-ticketmgt/templates/service.yaml
index d0b586acf7..e8db9f7b2e 100644
--- a/kubernetes/oof/components/oof-cmso/components/oof-cmso-ticketmgt/templates/service.yaml
+++ b/kubernetes/oof/components/oof-cmso/components/oof-cmso-ticketmgt/templates/service.yaml
@@ -1,3 +1,4 @@
+{{/*
# Copyright © 2018 AT&T
#
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -11,6 +12,7 @@
# 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
diff --git a/kubernetes/oof/components/oof-cmso/components/oof-cmso-topology/resources/config/cadi.properties b/kubernetes/oof/components/oof-cmso/components/oof-cmso-topology/resources/config/cadi.properties
index 7904e8ff86..d7387dd1e1 100644
--- a/kubernetes/oof/components/oof-cmso/components/oof-cmso-topology/resources/config/cadi.properties
+++ b/kubernetes/oof/components/oof-cmso/components/oof-cmso-topology/resources/config/cadi.properties
@@ -1,3 +1,4 @@
+{{/*
#-------------------------------------------------------------------------------
# ============LICENSE_START==============================================
# Copyright (c) 2019 AT&T Intellectual Property.
@@ -16,6 +17,7 @@
# ============LICENSE_END=================================================
#
#-------------------------------------------------------------------------------
+*/}}
cadi_loglevel=DEBUG
cadi_prop_files=/share/etc/osaaf/local/org.onap.oof.props
diff --git a/kubernetes/oof/components/oof-cmso/components/oof-cmso-topology/resources/config/topology.properties b/kubernetes/oof/components/oof-cmso/components/oof-cmso-topology/resources/config/topology.properties
index c4c9d83dda..6480537988 100644
--- a/kubernetes/oof/components/oof-cmso/components/oof-cmso-topology/resources/config/topology.properties
+++ b/kubernetes/oof/components/oof-cmso/components/oof-cmso-topology/resources/config/topology.properties
@@ -1,3 +1,4 @@
+{{/*
#-------------------------------------------------------------------------------
# Copyright © 2017-2019 AT&T Intellectual Property.
# Modifications Copyright © 2018 IBM.
@@ -28,6 +29,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#-------------------------------------------------------------------------------
+*/}}
cadi_loglevel=DEBUG
cadi_prop_files=/share/etc/osaaf/local/org.onap.oof.props
aaf.user.roles=/share/etc/certs/AAFUserRoles.properties
diff --git a/kubernetes/oof/components/oof-cmso/components/oof-cmso-topology/templates/configmap.yaml b/kubernetes/oof/components/oof-cmso/components/oof-cmso-topology/templates/configmap.yaml
index e4d0a5c256..69614344fc 100644
--- a/kubernetes/oof/components/oof-cmso/components/oof-cmso-topology/templates/configmap.yaml
+++ b/kubernetes/oof/components/oof-cmso/components/oof-cmso-topology/templates/configmap.yaml
@@ -1,3 +1,4 @@
+{{/*
# Copyright © 2018 AT&T
#
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -11,6 +12,7 @@
# 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
diff --git a/kubernetes/oof/components/oof-cmso/components/oof-cmso-topology/templates/deployment.yaml b/kubernetes/oof/components/oof-cmso/components/oof-cmso-topology/templates/deployment.yaml
index fc713cd59a..8b030298ea 100644
--- a/kubernetes/oof/components/oof-cmso/components/oof-cmso-topology/templates/deployment.yaml
+++ b/kubernetes/oof/components/oof-cmso/components/oof-cmso-topology/templates/deployment.yaml
@@ -1,3 +1,4 @@
+{{/*
# Copyright © 2018 AT&T
#
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -11,6 +12,7 @@
# 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/v1
kind: Deployment
diff --git a/kubernetes/oof/components/oof-cmso/components/oof-cmso-topology/templates/service.yaml b/kubernetes/oof/components/oof-cmso/components/oof-cmso-topology/templates/service.yaml
index d0b586acf7..e8db9f7b2e 100644
--- a/kubernetes/oof/components/oof-cmso/components/oof-cmso-topology/templates/service.yaml
+++ b/kubernetes/oof/components/oof-cmso/components/oof-cmso-topology/templates/service.yaml
@@ -1,3 +1,4 @@
+{{/*
# Copyright © 2018 AT&T
#
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -11,6 +12,7 @@
# 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
diff --git a/kubernetes/oof/components/oof-cmso/resources/log/filebeat/filebeat.yml b/kubernetes/oof/components/oof-cmso/resources/log/filebeat/filebeat.yml
index 50586783e9..450b6f427e 100644
--- a/kubernetes/oof/components/oof-cmso/resources/log/filebeat/filebeat.yml
+++ b/kubernetes/oof/components/oof-cmso/resources/log/filebeat/filebeat.yml
@@ -1,3 +1,4 @@
+{{/*
# Copyright © 2018 Amdocs, Bell Canada, AT&T
#
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -11,6 +12,7 @@
# 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
diff --git a/kubernetes/oof/components/oof-cmso/templates/configmap.yaml b/kubernetes/oof/components/oof-cmso/templates/configmap.yaml
index f4a79627f6..03e006e6dc 100644
--- a/kubernetes/oof/components/oof-cmso/templates/configmap.yaml
+++ b/kubernetes/oof/components/oof-cmso/templates/configmap.yaml
@@ -1,3 +1,4 @@
+{{/*
# Copyright © 2017 Amdocs, Bell Canada
# Modifications Copyright © 2018 AT&T
#
@@ -12,6 +13,7 @@
# 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
diff --git a/kubernetes/oof/components/oof-cmso/templates/secret.yaml b/kubernetes/oof/components/oof-cmso/templates/secret.yaml
index 3dbdd31b1f..992a471e08 100644
--- a/kubernetes/oof/components/oof-cmso/templates/secret.yaml
+++ b/kubernetes/oof/components/oof-cmso/templates/secret.yaml
@@ -1,3 +1,4 @@
+{{/*
# Copyright © 2018 Amdocs, Bell Canada, AT&T
# Copyright © 2020 Samsung Electronics
#
@@ -12,6 +13,7 @@
# 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.
+*/}}
{{ include "common.secretFast" . }}
---
diff --git a/kubernetes/oof/components/oof-has/components/oof-has-api/templates/deployment.yaml b/kubernetes/oof/components/oof-has/components/oof-has-api/templates/deployment.yaml
index 78c054bd28..4db9f158b9 100755
--- a/kubernetes/oof/components/oof-has/components/oof-has-api/templates/deployment.yaml
+++ b/kubernetes/oof/components/oof-has/components/oof-has-api/templates/deployment.yaml
@@ -1,3 +1,4 @@
+{{/*
# Copyright © 2017 Amdocs, Bell Canada
# Copyright (C) 2020 Wipro Limited.
# Modifications Copyright © 2018 AT&T,VMware
@@ -13,6 +14,7 @@
# 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/v1
kind: Deployment
diff --git a/kubernetes/oof/components/oof-has/components/oof-has-api/templates/service.yaml b/kubernetes/oof/components/oof-has/components/oof-has-api/templates/service.yaml
index 1e6486a96d..751545ebef 100755
--- a/kubernetes/oof/components/oof-has/components/oof-has-api/templates/service.yaml
+++ b/kubernetes/oof/components/oof-has/components/oof-has-api/templates/service.yaml
@@ -1,3 +1,4 @@
+{{/*
# Copyright © 2017 Amdocs, Bell Canada
# Modifications Copyright © 2018 AT&T,VMware
#
@@ -12,6 +13,7 @@
# 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
diff --git a/kubernetes/oof/components/oof-has/components/oof-has-controller/templates/deployment.yaml b/kubernetes/oof/components/oof-has/components/oof-has-controller/templates/deployment.yaml
index 53e053aa42..9540cc3159 100755
--- a/kubernetes/oof/components/oof-has/components/oof-has-controller/templates/deployment.yaml
+++ b/kubernetes/oof/components/oof-has/components/oof-has-controller/templates/deployment.yaml
@@ -1,3 +1,4 @@
+{{/*
# Copyright © 2017 Amdocs, Bell Canada
# Modifications Copyright © 2018 AT&T,VMware
#
@@ -12,6 +13,7 @@
# 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/v1
kind: Deployment
diff --git a/kubernetes/oof/components/oof-has/components/oof-has-data/templates/deployment.yaml b/kubernetes/oof/components/oof-has/components/oof-has-data/templates/deployment.yaml
index 3ed74a048a..4292cb1e4f 100755
--- a/kubernetes/oof/components/oof-has/components/oof-has-data/templates/deployment.yaml
+++ b/kubernetes/oof/components/oof-has/components/oof-has-data/templates/deployment.yaml
@@ -1,3 +1,4 @@
+{{/*
# Copyright © 2017 Amdocs, Bell Canada
# Modifications Copyright © 2018 AT&T,VMware
#
@@ -12,6 +13,7 @@
# 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/v1
kind: Deployment
diff --git a/kubernetes/oof/components/oof-has/components/oof-has-reservation/templates/deployment.yaml b/kubernetes/oof/components/oof-has/components/oof-has-reservation/templates/deployment.yaml
index 4f5067db12..9acd944ac5 100755
--- a/kubernetes/oof/components/oof-has/components/oof-has-reservation/templates/deployment.yaml
+++ b/kubernetes/oof/components/oof-has/components/oof-has-reservation/templates/deployment.yaml
@@ -1,3 +1,4 @@
+{{/*
# Copyright © 2017 Amdocs, Bell Canada
# Modifications Copyright © 2018 AT&T,VMware
#
@@ -12,6 +13,7 @@
# 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/v1
kind: Deployment
diff --git a/kubernetes/oof/components/oof-has/components/oof-has-solver/templates/deployment.yaml b/kubernetes/oof/components/oof-has/components/oof-has-solver/templates/deployment.yaml
index d1e4946ae1..ec26684111 100755
--- a/kubernetes/oof/components/oof-has/components/oof-has-solver/templates/deployment.yaml
+++ b/kubernetes/oof/components/oof-has/components/oof-has-solver/templates/deployment.yaml
@@ -1,3 +1,4 @@
+{{/*
# Copyright © 2017 Amdocs, Bell Canada
# Modifications Copyright © 2018 AT&T,VMware
#
@@ -12,6 +13,7 @@
# 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/v1
kind: Deployment
diff --git a/kubernetes/oof/components/oof-has/resources/config/conductor.conf b/kubernetes/oof/components/oof-has/resources/config/conductor.conf
index 4c7228a301..a259a6d8d0 100755
--- a/kubernetes/oof/components/oof-has/resources/config/conductor.conf
+++ b/kubernetes/oof/components/oof-has/resources/config/conductor.conf
@@ -1,3 +1,4 @@
+{{/*
# Copyright © 2017 Amdocs, Bell Canada
# Modifications Copyright © 2018 AT&T,VMware, Intel Corporation.
#
@@ -12,6 +13,7 @@
# 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.
+*/}}
[DEFAULT]
diff --git a/kubernetes/oof/components/oof-has/resources/config/healthy.sh b/kubernetes/oof/components/oof-has/resources/config/healthy.sh
index d78777ad1c..9f5309b5d5 100755
--- a/kubernetes/oof/components/oof-has/resources/config/healthy.sh
+++ b/kubernetes/oof/components/oof-has/resources/config/healthy.sh
@@ -1,3 +1,4 @@
+{{/*
# Copyright © 2017 Amdocs, Bell Canada
# Modifications Copyright © 2018 AT&T,VMware
#
@@ -13,13 +14,15 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+*/}}
#!/bin/bash
-
+{{/*
# Controller is a process that reads from Music Q
# It uses no ports (TCP or HTTP). The PROB will check
# if the controller process exists or not. In case
# it exists, it will send 0, else send 1 so k8s can i
# restart the container
+*/}}
pid="$(pgrep -f '/usr/local/bin/conductor')"
if [ -z "$pid" ]
diff --git a/kubernetes/oof/components/oof-has/resources/config/log.conf b/kubernetes/oof/components/oof-has/resources/config/log.conf
index 374d02abcd..c9bf3fabc9 100755
--- a/kubernetes/oof/components/oof-has/resources/config/log.conf
+++ b/kubernetes/oof/components/oof-has/resources/config/log.conf
@@ -1,3 +1,4 @@
+{{/*
# Copyright © 2017 Amdocs, Bell Canada
# Modifications Copyright © 2018 AT&T,VMware
# Modifications Copyright (C) 2020 Wipro Limited.
@@ -13,6 +14,7 @@
# 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.
+*/}}
[loggers]
keys=root
diff --git a/kubernetes/oof/components/oof-has/resources/config/log/filebeat.yml b/kubernetes/oof/components/oof-has/resources/config/log/filebeat.yml
index aa19dc2d22..8b1e926e10 100755
--- a/kubernetes/oof/components/oof-has/resources/config/log/filebeat.yml
+++ b/kubernetes/oof/components/oof-has/resources/config/log/filebeat.yml
@@ -1,3 +1,4 @@
+{{/*
# Copyright © 2017 Amdocs, Bell Canada
# Modifications Copyright © 2018 AT&T,VMware
#
@@ -12,6 +13,7 @@
# 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
diff --git a/kubernetes/oof/components/oof-has/templates/configmap.yaml b/kubernetes/oof/components/oof-has/templates/configmap.yaml
index 39b69a6817..35581366e6 100755
--- a/kubernetes/oof/components/oof-has/templates/configmap.yaml
+++ b/kubernetes/oof/components/oof-has/templates/configmap.yaml
@@ -1,3 +1,4 @@
+{{/*
# Copyright © 2017 Amdocs, Bell Canada
# Modifications Copyright © 2018 AT&T,VMware
#
@@ -12,6 +13,7 @@
# 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