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-search-data/resources/config/elastic-search.properties         | 3 ++-
 .../aai/components/aai-search-data/resources/config/log/logback.xml    | 3 ++-
 .../components/aai-search-data/resources/rproxy/config/cadi.properties | 2 ++
 3 files changed, 6 insertions(+), 2 deletions(-)

(limited to 'kubernetes/aai/components/aai-search-data/resources')

diff --git a/kubernetes/aai/components/aai-search-data/resources/config/elastic-search.properties b/kubernetes/aai/components/aai-search-data/resources/config/elastic-search.properties
index 65de20de7e..e3ebbfac39 100644
--- a/kubernetes/aai/components/aai-search-data/resources/config/elastic-search.properties
+++ b/kubernetes/aai/components/aai-search-data/resources/config/elastic-search.properties
@@ -1,3 +1,4 @@
+{{/*
 # Copyright © 2018 Amdocs, Bell Canada, AT&T
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,7 +14,7 @@
 # limitations under the License.
 
 # ElasticSearch Configuration
-
+*/}}
 es.cluster-name=ES_AAI
 es.ip-address=aai-elasticsearch.{{.Release.Namespace}}
 es.http-port={{ .Values.config.elasticsearchHttpPort }}
diff --git a/kubernetes/aai/components/aai-search-data/resources/config/log/logback.xml b/kubernetes/aai/components/aai-search-data/resources/config/log/logback.xml
index adfed4aa60..58bff2a02d 100644
--- a/kubernetes/aai/components/aai-search-data/resources/config/log/logback.xml
+++ b/kubernetes/aai/components/aai-search-data/resources/config/log/logback.xml
@@ -1,3 +1,4 @@
+{{/*
 <!--
 # Copyright © 2018 Amdocs, Bell Canada, AT&T
 #
@@ -13,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 -->
-
+*/}}
 <configuration scan="true" scanPeriod="3 seconds" debug="false">
         <!--<jmxConfigurator /> -->
         <!-- directory path for all other type logs -->
diff --git a/kubernetes/aai/components/aai-search-data/resources/rproxy/config/cadi.properties b/kubernetes/aai/components/aai-search-data/resources/rproxy/config/cadi.properties
index 4980071db6..fb3d1ccd3e 100644
--- a/kubernetes/aai/components/aai-search-data/resources/rproxy/config/cadi.properties
+++ b/kubernetes/aai/components/aai-search-data/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
 
-- 
cgit 1.2.3-korg