Merge "[AAI] Make AAI helm3 compatible"

11 files changed, 24 insertions, 1 deletions

diff --git a/kubernetes/aai/components/aai-resources/resources/config/aaiconfig.properties b/kubernetes/aai/components/aai-resources/resources/config/aaiconfig.properties
index f2e7caaa29..70e8bec01a 100644
--- a/kubernetes/aai/components/aai-resources/resources/config/aaiconfig.properties
+++ b/kubernetes/aai/components/aai-resources/resources/config/aaiconfig.properties
@@ -1,3 +1,4 @@
+{{/*
 #
 # ============LICENSE_START=======================================================
 # org.onap.aai
@@ -29,6 +30,7 @@
 #  REMEMBER TO THINK ABOUT ENVIRONMENTAL DIFFERENCES AND CHANGE THE
 #  TEMPLATE AND *ALL* DATAFILES
 ####################################################################
+*/}}
 
 aai.config.checktime=1000
 
diff --git a/kubernetes/aai/components/aai-resources/resources/config/application.properties b/kubernetes/aai/components/aai-resources/resources/config/application.properties
index d0a9c14345..61410c551e 100644
--- a/kubernetes/aai/components/aai-resources/resources/config/application.properties
+++ b/kubernetes/aai/components/aai-resources/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-resources
 info.build.name=resources
 info.build.description=Resources Microservice
diff --git a/kubernetes/aai/components/aai-resources/resources/config/janusgraph-cached.properties b/kubernetes/aai/components/aai-resources/resources/config/janusgraph-cached.properties
index 1db2774d52..b6fdd4c58f 100644
--- a/kubernetes/aai/components/aai-resources/resources/config/janusgraph-cached.properties
+++ b/kubernetes/aai/components/aai-resources/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-resources/resources/config/janusgraph-realtime.properties b/kubernetes/aai/components/aai-resources/resources/config/janusgraph-realtime.properties
index 36cbc4201d..836dc7b176 100644
--- a/kubernetes/aai/components/aai-resources/resources/config/janusgraph-realtime.properties
+++ b/kubernetes/aai/components/aai-resources/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-resources/resources/config/localhost-access-logback.xml b/kubernetes/aai/components/aai-resources/resources/config/localhost-access-logback.xml
index 4cf6c74333..7f6a03168e 100644
--- a/kubernetes/aai/components/aai-resources/resources/config/localhost-access-logback.xml
+++ b/kubernetes/aai/components/aai-resources/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-resources/resources/config/logback.xml b/kubernetes/aai/components/aai-resources/resources/config/logback.xml
index f24e86d8d0..df35aaa0ed 100644
--- a/kubernetes/aai/components/aai-resources/resources/config/logback.xml
+++ b/kubernetes/aai/components/aai-resources/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-resources/resources/config/realm.properties b/kubernetes/aai/components/aai-resources/resources/config/realm.properties
index 0499b34f1c..9fbd122492 100644
--- a/kubernetes/aai/components/aai-resources/resources/config/realm.properties
+++ b/kubernetes/aai/components/aai-resources/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-resources/resources/rproxy/config/cadi.properties b/kubernetes/aai/components/aai-resources/resources/rproxy/config/cadi.properties
index 4980071db6..fb3d1ccd3e 100644
--- a/kubernetes/aai/components/aai-resources/resources/rproxy/config/cadi.properties
+++ b/kubernetes/aai/components/aai-resources/resources/rproxy/config/cadi.properties
@@ -1,3 +1,4 @@
+{{/*
 # This is a normal Java Properties File
 # Comments are with Pound Signs at beginning of lines,
 # and multi-line expression of properties can be obtained by backslash at end of line
@@ -7,6 +8,7 @@
 #may be used automatically by cadi. However, if it is not, you will need to use hostname=mywebserver.att.com and add mywebserver.att.com
 #to your hosts file on your machine.
 #hostname=test.aic.cip.att.com
+*/}}
 
 cadi_loglevel=DEBUG
 
diff --git a/kubernetes/aai/components/aai-resources/templates/configmap.yaml b/kubernetes/aai/components/aai-resources/templates/configmap.yaml
index 1a1192abfc..2927031eb5 100644
--- a/kubernetes/aai/components/aai-resources/templates/configmap.yaml
+++ b/kubernetes/aai/components/aai-resources/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-resources/templates/deployment.yaml b/kubernetes/aai/components/aai-resources/templates/deployment.yaml
index 4c3a0c1649..84d3df3927 100644
--- a/kubernetes/aai/components/aai-resources/templates/deployment.yaml
+++ b/kubernetes/aai/components/aai-resources/templates/deployment.yaml
@@ -1,3 +1,4 @@
+{{/*
 # Copyright (c) 2017 Amdocs, Bell Canada
 # Modifications Copyright (c) 2018 AT&T
 # Modifications Copyright (c) 2020 Nokia
@@ -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-resources/templates/service.yaml b/kubernetes/aai/components/aai-resources/templates/service.yaml
index 68d767b380..66dfd493dd 100644
--- a/kubernetes/aai/components/aai-resources/templates/service.yaml
+++ b/kubernetes/aai/components/aai-resources/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