[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

7 files changed, 15 insertions, 3 deletions

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
 
diff --git a/kubernetes/aai/components/aai-search-data/templates/configmap.yaml b/kubernetes/aai/components/aai-search-data/templates/configmap.yaml
index 0ef6aa9b10..28cf730930 100644
--- a/kubernetes/aai/components/aai-search-data/templates/configmap.yaml
+++ b/kubernetes/aai/components/aai-search-data/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-search-data/templates/deployment.yaml b/kubernetes/aai/components/aai-search-data/templates/deployment.yaml
index 25145ac434..eb4aefeeb3 100644
--- a/kubernetes/aai/components/aai-search-data/templates/deployment.yaml
+++ b/kubernetes/aai/components/aai-search-data/templates/deployment.yaml
@@ -1,3 +1,4 @@
+{{/*
 # Copyright © 2017 Amdocs, Bell Canada
 # Modifications Copyright © 2018 AT&T
 # Modifications Copyright © 2020 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-search-data/templates/secret.yaml b/kubernetes/aai/components/aai-search-data/templates/secret.yaml
index 1ae4f4d61d..eacae25647 100644
--- a/kubernetes/aai/components/aai-search-data/templates/secret.yaml
+++ b/kubernetes/aai/components/aai-search-data/templates/secret.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: Secret
diff --git a/kubernetes/aai/components/aai-search-data/templates/service.yaml b/kubernetes/aai/components/aai-search-data/templates/service.yaml
index 889807930a..940222cd3e 100644
--- a/kubernetes/aai/components/aai-search-data/templates/service.yaml
+++ b/kubernetes/aai/components/aai-search-data/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
@@ -25,7 +27,7 @@ metadata:
 spec:
   type: {{ .Values.service.type }}
   ports:
- {{ if .Values.global.installSidecarSecurity }}
+{{ if .Values.global.installSidecarSecurity }}
       {{if eq .Values.service.type "NodePort" -}}
       - port: {{ .Values.service.internalPort }}
         nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort }}