From 47eb4d2c38499bd60cdfb01010319ed5bf4ac45f Mon Sep 17 00:00:00 2001
From: Sylvain Desbureaux <sylvain.desbureaux@orange.com>
Date: Thu, 10 Dec 2020 12:15:27 +0100
Subject: [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
---
 .../aai/components/aai-schema-service/config/aaiconfig.properties    | 2 ++
 .../aai/components/aai-schema-service/config/application.properties  | 2 ++
 .../aai-schema-service/config/localhost-access-logback.xml           | 5 ++++-
 kubernetes/aai/components/aai-schema-service/config/logback.xml      | 2 ++
 4 files changed, 10 insertions(+), 1 deletion(-)

(limited to 'kubernetes/aai/components/aai-schema-service/config')

diff --git a/kubernetes/aai/components/aai-schema-service/config/aaiconfig.properties b/kubernetes/aai/components/aai-schema-service/config/aaiconfig.properties
index 2172d715de..b107cd4f3a 100644
--- a/kubernetes/aai/components/aai-schema-service/config/aaiconfig.properties
+++ b/kubernetes/aai/components/aai-schema-service/config/aaiconfig.properties
@@ -1,3 +1,4 @@
+{{/*
 #
 # ============LICENSE_START=======================================================
 # org.onap.aai
@@ -16,6 +17,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # ============LICENSE_END=========================================================
+*/}}
 
 aai.server.url.base=https://aai.{{ include "common.namespace" . }}:8443/aai/
 aai.server.url=https://aai.{{ include "common.namespace" . }}:8443/aai/{{ .Values.global.config.schema.version.api.default }}/
diff --git a/kubernetes/aai/components/aai-schema-service/config/application.properties b/kubernetes/aai/components/aai-schema-service/config/application.properties
index a639c41343..499fa96cd5 100644
--- a/kubernetes/aai/components/aai-schema-service/config/application.properties
+++ b/kubernetes/aai/components/aai-schema-service/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-schema-service
 info.build.name=schema-service
 info.build.description=Schema Service Microservice
diff --git a/kubernetes/aai/components/aai-schema-service/config/localhost-access-logback.xml b/kubernetes/aai/components/aai-schema-service/config/localhost-access-logback.xml
index 447f2390b1..c2099d6b77 100644
--- a/kubernetes/aai/components/aai-schema-service/config/localhost-access-logback.xml
+++ b/kubernetes/aai/components/aai-schema-service/config/localhost-access-logback.xml
@@ -1,3 +1,4 @@
+{{/*
 <!--
     ============LICENSE_START=======================================================
     org.onap.aai
@@ -17,6 +18,7 @@
     limitations under the License.
     ============LICENSE_END=========================================================
 -->
+*/}}
 <configuration>
 	<property name="AJSC_HOME" value="${AJSC_HOME:-.}" />
 	<appender name="ACCESS"
@@ -32,7 +34,7 @@
 	</appender>
 	<appender-ref ref="ACCESS" />
 </configuration>
-
+{{/*
 <!-- 
 %a - Remote IP address
 %A - Local IP address
@@ -56,3 +58,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-schema-service/config/logback.xml b/kubernetes/aai/components/aai-schema-service/config/logback.xml
index 9cfffe9c37..cfcd3c02e6 100644
--- a/kubernetes/aai/components/aai-schema-service/config/logback.xml
+++ b/kubernetes/aai/components/aai-schema-service/config/logback.xml
@@ -1,3 +1,4 @@
+{{/*
 <!--
 
   ============LICENSE_START=======================================================
@@ -21,6 +22,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"/>
 
-- 
cgit