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-data-router/resources/config/schemaIngest.properties           | 2 ++
 .../aai-data-router/resources/dynamic/conf/entity-event-policy.xml     | 3 ++-
 kubernetes/aai/components/aai-data-router/templates/configmap.yaml     | 2 ++
 kubernetes/aai/components/aai-data-router/templates/deployment.yaml    | 2 ++
 kubernetes/aai/components/aai-data-router/templates/secret.yaml        | 2 ++
 5 files changed, 10 insertions(+), 1 deletion(-)

(limited to 'kubernetes/aai/components/aai-data-router')

diff --git a/kubernetes/aai/components/aai-data-router/resources/config/schemaIngest.properties b/kubernetes/aai/components/aai-data-router/resources/config/schemaIngest.properties
index b94ce51e81..33f79fb810 100644
--- a/kubernetes/aai/components/aai-data-router/resources/config/schemaIngest.properties
+++ b/kubernetes/aai/components/aai-data-router/resources/config/schemaIngest.properties
@@ -1,3 +1,4 @@
+{{/*
 #
 # ============LICENSE_START=======================================================
 # org.onap.aai
@@ -23,6 +24,7 @@
 
 # Properties for the SchemaLocationsBean
 # Files named aai_oxm_v*.xml are unpacked here:
+*/}}
 nodeDir=/opt/app/data-router/onap/oxm
 # Dummy folder/directory:
 edgeDir=
diff --git a/kubernetes/aai/components/aai-data-router/resources/dynamic/conf/entity-event-policy.xml b/kubernetes/aai/components/aai-data-router/resources/dynamic/conf/entity-event-policy.xml
index b5e4129595..039738a50d 100644
--- a/kubernetes/aai/components/aai-data-router/resources/dynamic/conf/entity-event-policy.xml
+++ b/kubernetes/aai/components/aai-data-router/resources/dynamic/conf/entity-event-policy.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.
 -->
-
+*/}}
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:schemaLocation="
diff --git a/kubernetes/aai/components/aai-data-router/templates/configmap.yaml b/kubernetes/aai/components/aai-data-router/templates/configmap.yaml
index 93b498ac00..e6b31fcf97 100644
--- a/kubernetes/aai/components/aai-data-router/templates/configmap.yaml
+++ b/kubernetes/aai/components/aai-data-router/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-data-router/templates/deployment.yaml b/kubernetes/aai/components/aai-data-router/templates/deployment.yaml
index 9e2844c082..55cf572b36 100644
--- a/kubernetes/aai/components/aai-data-router/templates/deployment.yaml
+++ b/kubernetes/aai/components/aai-data-router/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-data-router/templates/secret.yaml b/kubernetes/aai/components/aai-data-router/templates/secret.yaml
index 292e03571a..d6013c832e 100644
--- a/kubernetes/aai/components/aai-data-router/templates/secret.yaml
+++ b/kubernetes/aai/components/aai-data-router/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
-- 
cgit 1.2.3-korg