summaryrefslogtreecommitdiffstats
path: root/kubernetes/aai/components/aai-traversal
diff options
context:
space:
mode:
authorSylvain Desbureaux <sylvain.desbureaux@orange.com>2020-12-10 12:15:27 +0100
committerSylvain Desbureaux <sylvain.desbureaux@orange.com>2020-12-11 10:52:10 +0100
commit47eb4d2c38499bd60cdfb01010319ed5bf4ac45f (patch)
tree8c22acd7b3d8620e2243c8225987481f1e0cf594 /kubernetes/aai/components/aai-traversal
parent490b37494e74cbd16118bf686936e497f43ad047 (diff)
[AAI] Make AAI helm3 compatible
Helm3 doesn't like empty components with only license headers so we remove them as much as possible. Issue-ID: OOM-2562 Signed-off-by: Sylvain Desbureaux <sylvain.desbureaux@orange.com> Change-Id: I26b790965d2926792f801b87294d15a074de7be6
Diffstat (limited to 'kubernetes/aai/components/aai-traversal')
-rw-r--r--kubernetes/aai/components/aai-traversal/resources/config/aaiconfig.properties2
-rw-r--r--kubernetes/aai/components/aai-traversal/resources/config/application.properties2
-rw-r--r--kubernetes/aai/components/aai-traversal/resources/config/janusgraph-cached.properties2
-rw-r--r--kubernetes/aai/components/aai-traversal/resources/config/janusgraph-realtime.properties2
-rw-r--r--kubernetes/aai/components/aai-traversal/resources/config/localhost-access-logback.xml5
-rw-r--r--kubernetes/aai/components/aai-traversal/resources/config/logback.xml2
-rw-r--r--kubernetes/aai/components/aai-traversal/resources/config/realm.properties2
-rw-r--r--kubernetes/aai/components/aai-traversal/templates/configmap.yaml2
-rw-r--r--kubernetes/aai/components/aai-traversal/templates/deployment.yaml2
-rw-r--r--kubernetes/aai/components/aai-traversal/templates/job.yaml2
-rw-r--r--kubernetes/aai/components/aai-traversal/templates/service.yaml2
11 files changed, 24 insertions, 1 deletions
diff --git a/kubernetes/aai/components/aai-traversal/resources/config/aaiconfig.properties b/kubernetes/aai/components/aai-traversal/resources/config/aaiconfig.properties
index 0f23eda515..c7771e1133 100644
--- a/kubernetes/aai/components/aai-traversal/resources/config/aaiconfig.properties
+++ b/kubernetes/aai/components/aai-traversal/resources/config/aaiconfig.properties
@@ -1,3 +1,4 @@
+{{/*
#
# ============LICENSE_START=======================================================
# org.onap.aai
@@ -19,6 +20,7 @@
#
# ECOMP is a trademark and service mark of AT&T Intellectual Property.
#
+*/}}
aai.config.checktime=1000
diff --git a/kubernetes/aai/components/aai-traversal/resources/config/application.properties b/kubernetes/aai/components/aai-traversal/resources/config/application.properties
index 4a025bacd2..31ed2be3fe 100644
--- a/kubernetes/aai/components/aai-traversal/resources/config/application.properties
+++ b/kubernetes/aai/components/aai-traversal/resources/config/application.properties
@@ -1,3 +1,4 @@
+{{/*
# Copyright © 2018 Amdocs, Bell Canada, AT&T
#
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,6 +14,7 @@
# limitations under the License.
# The following info parameters are being referenced by ajsc6
+*/}}
info.build.artifact=aai-traversal
info.build.name=traversal
info.build.description=Traversal Microservice
diff --git a/kubernetes/aai/components/aai-traversal/resources/config/janusgraph-cached.properties b/kubernetes/aai/components/aai-traversal/resources/config/janusgraph-cached.properties
index 1db2774d52..b6fdd4c58f 100644
--- a/kubernetes/aai/components/aai-traversal/resources/config/janusgraph-cached.properties
+++ b/kubernetes/aai/components/aai-traversal/resources/config/janusgraph-cached.properties
@@ -1,3 +1,4 @@
+{{/*
#
# ============LICENSE_START=======================================================
# org.onap.aai
@@ -19,6 +20,7 @@
#
# ECOMP is a trademark and service mark of AT&T Intellectual Property.
#
+*/}}
query.fast-property=true
query.smart-limit=false
diff --git a/kubernetes/aai/components/aai-traversal/resources/config/janusgraph-realtime.properties b/kubernetes/aai/components/aai-traversal/resources/config/janusgraph-realtime.properties
index 36cbc4201d..836dc7b176 100644
--- a/kubernetes/aai/components/aai-traversal/resources/config/janusgraph-realtime.properties
+++ b/kubernetes/aai/components/aai-traversal/resources/config/janusgraph-realtime.properties
@@ -1,3 +1,4 @@
+{{/*
#
# ============LICENSE_START=======================================================
# Copyright © 2017 AT&T Intellectual Property. All rights reserved.
@@ -17,6 +18,7 @@
#
# ECOMP is a trademark and service mark of AT&T Intellectual Property.
#
+*/}}
query.fast-property=true
query.smart-limit=false
diff --git a/kubernetes/aai/components/aai-traversal/resources/config/localhost-access-logback.xml b/kubernetes/aai/components/aai-traversal/resources/config/localhost-access-logback.xml
index 4cf6c74333..7f6a03168e 100644
--- a/kubernetes/aai/components/aai-traversal/resources/config/localhost-access-logback.xml
+++ b/kubernetes/aai/components/aai-traversal/resources/config/localhost-access-logback.xml
@@ -1,3 +1,4 @@
+{{/*
<!--
============LICENSE_START=======================================================
@@ -22,6 +23,7 @@
ECOMP is a trademark and service mark of AT&T Intellectual Property.
-->
+*/}}
<configuration>
<property name="AJSC_HOME" value="${AJSC_HOME:-.}" />
<appender name="ACCESS"
@@ -37,7 +39,7 @@
</appender>
<appender-ref ref="ACCESS" />
</configuration>
-
+{{/*
<!--
%a - Remote IP address
%A - Local IP address
@@ -61,3 +63,4 @@
%z - Custom pattern that parses the cert for the subject
%y - Custom pattern determines rest or dme2
-->
+*/}} \ No newline at end of file
diff --git a/kubernetes/aai/components/aai-traversal/resources/config/logback.xml b/kubernetes/aai/components/aai-traversal/resources/config/logback.xml
index f24e86d8d0..df35aaa0ed 100644
--- a/kubernetes/aai/components/aai-traversal/resources/config/logback.xml
+++ b/kubernetes/aai/components/aai-traversal/resources/config/logback.xml
@@ -1,3 +1,4 @@
+{{/*
<!--
============LICENSE_START=======================================================
@@ -22,6 +23,7 @@
ECOMP is a trademark and service mark of AT&T Intellectual Property.
-->
+*/}}
<configuration scan="true" scanPeriod="60 seconds" debug="false">
<statusListener class="ch.qos.logback.core.status.NopStatusListener" />
diff --git a/kubernetes/aai/components/aai-traversal/resources/config/realm.properties b/kubernetes/aai/components/aai-traversal/resources/config/realm.properties
index 0499b34f1c..9fbd122492 100644
--- a/kubernetes/aai/components/aai-traversal/resources/config/realm.properties
+++ b/kubernetes/aai/components/aai-traversal/resources/config/realm.properties
@@ -1,3 +1,4 @@
+{{/*
# Copyright © 2018 Amdocs, Bell Canada, AT&T
#
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,6 +14,7 @@
# limitations under the License.
# format : username: password[,rolename ...]
# default username/password: AAI/AAI, MSO/MSO, ModelLoader/ModelLoader...
+*/ -}}
AAI:OBF:1gfr1ev31gg7,admin
MSO:OBF:1jzx1lz31k01,admin
SDNC:OBF:1itr1i0l1i151isv,admin
diff --git a/kubernetes/aai/components/aai-traversal/templates/configmap.yaml b/kubernetes/aai/components/aai-traversal/templates/configmap.yaml
index 08bd2b3cbc..5c6dc7293d 100644
--- a/kubernetes/aai/components/aai-traversal/templates/configmap.yaml
+++ b/kubernetes/aai/components/aai-traversal/templates/configmap.yaml
@@ -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.
+*/}}
apiVersion: v1
kind: ConfigMap
diff --git a/kubernetes/aai/components/aai-traversal/templates/deployment.yaml b/kubernetes/aai/components/aai-traversal/templates/deployment.yaml
index f890d71b40..ab1cb309d8 100644
--- a/kubernetes/aai/components/aai-traversal/templates/deployment.yaml
+++ b/kubernetes/aai/components/aai-traversal/templates/deployment.yaml
@@ -1,3 +1,4 @@
+{{/*
# Copyright (c) 2017 Amdocs, Bell Canada
# Modifications Copyright (c) 2018 AT&T
# Modifications Copyright (c) 2020 Nokia, Orange
@@ -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/aai/components/aai-traversal/templates/job.yaml b/kubernetes/aai/components/aai-traversal/templates/job.yaml
index bd121af953..16e7022c0d 100644
--- a/kubernetes/aai/components/aai-traversal/templates/job.yaml
+++ b/kubernetes/aai/components/aai-traversal/templates/job.yaml
@@ -1,3 +1,4 @@
+{{/*
# Copyright (c) 2017-2018 AT&T
# Modifications Copyright (c) 2018 Amdocs, Bell Canada
# Modifications Copyright (c) 2020 Nokia, Orange
@@ -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.
+*/}}
{{ if .Values.global.jobs.updateQueryData.enabled }}
diff --git a/kubernetes/aai/components/aai-traversal/templates/service.yaml b/kubernetes/aai/components/aai-traversal/templates/service.yaml
index 68d767b380..66dfd493dd 100644
--- a/kubernetes/aai/components/aai-traversal/templates/service.yaml
+++ b/kubernetes/aai/components/aai-traversal/templates/service.yaml
@@ -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.
+*/}}
apiVersion: v1
kind: Service