[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
diff --git a/kubernetes/aai/components/aai-graphadmin/resources/config/aaiconfig.properties b/kubernetes/aai/components/aai-graphadmin/resources/config/aaiconfig.properties
index e9ec685..e62ba07 100644
--- a/kubernetes/aai/components/aai-graphadmin/resources/config/aaiconfig.properties
+++ b/kubernetes/aai/components/aai-graphadmin/resources/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.config.checktime=1000
diff --git a/kubernetes/aai/components/aai-graphadmin/resources/config/application.properties b/kubernetes/aai/components/aai-graphadmin/resources/config/application.properties
index 7cc354a..8cefebc 100644
--- a/kubernetes/aai/components/aai-graphadmin/resources/config/application.properties
+++ b/kubernetes/aai/components/aai-graphadmin/resources/config/application.properties
@@ -1,8 +1,9 @@
+{{/*
#
# ============LICENSE_START=======================================================
# org.onap.aai
# ================================================================================
-# Copyright © 2018 AT&T Intellectual Property. All rights reserved.
+# Copyright � 2018 AT&T Intellectual Property. All rights reserved.
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -18,6 +19,7 @@
# ============LICENSE_END=========================================================
# The following info parameters are being referenced by ajsc6
+*/}}
info.build.artifact=aai-graphadmin
info.build.name=resources
info.build.description=Resources Microservice
diff --git a/kubernetes/aai/components/aai-graphadmin/resources/config/janusgraph-cached.properties b/kubernetes/aai/components/aai-graphadmin/resources/config/janusgraph-cached.properties
index 232262e..5962ebd 100644
--- a/kubernetes/aai/components/aai-graphadmin/resources/config/janusgraph-cached.properties
+++ b/kubernetes/aai/components/aai-graphadmin/resources/config/janusgraph-cached.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=========================================================
+*/}}
query.fast-property=true
query.smart-limit=false
diff --git a/kubernetes/aai/components/aai-graphadmin/resources/config/janusgraph-realtime.properties b/kubernetes/aai/components/aai-graphadmin/resources/config/janusgraph-realtime.properties
index 923611d..61550e7 100644
--- a/kubernetes/aai/components/aai-graphadmin/resources/config/janusgraph-realtime.properties
+++ b/kubernetes/aai/components/aai-graphadmin/resources/config/janusgraph-realtime.properties
@@ -1,3 +1,4 @@
+{{/*
#
# ============LICENSE_START=======================================================
# Copyright © 2018 AT&T Intellectual Property. All rights reserved.
@@ -14,6 +15,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
# ============LICENSE_END=========================================================
+*/}}
query.fast-property=true
query.smart-limit=false
diff --git a/kubernetes/aai/components/aai-graphadmin/resources/config/localhost-access-logback.xml b/kubernetes/aai/components/aai-graphadmin/resources/config/localhost-access-logback.xml
index 95d4123..c84cb5a 100644
--- a/kubernetes/aai/components/aai-graphadmin/resources/config/localhost-access-logback.xml
+++ b/kubernetes/aai/components/aai-graphadmin/resources/config/localhost-access-logback.xml
@@ -1,5 +1,5 @@
<!--
-
+{{/*
============LICENSE_START=======================================================
org.onap.aai
================================================================================
@@ -17,7 +17,7 @@
See the License for the specific language governing permissions and
limitations under the License.
============LICENSE_END=========================================================
-
+*/}}
-->
<configuration>
<property name="AJSC_HOME" value="${AJSC_HOME:-.}" />
diff --git a/kubernetes/aai/components/aai-graphadmin/resources/config/logback.xml b/kubernetes/aai/components/aai-graphadmin/resources/config/logback.xml
index 553de3f..7f055cf 100644
--- a/kubernetes/aai/components/aai-graphadmin/resources/config/logback.xml
+++ b/kubernetes/aai/components/aai-graphadmin/resources/config/logback.xml
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<!--
-
+{{/*
============LICENSE_START=======================================================
org.onap.aai
================================================================================
@@ -18,7 +18,7 @@
See the License for the specific language governing permissions and
limitations under the License.
============LICENSE_END=========================================================
-
+*/}}
-->
<configuration scan="true" scanPeriod="60 seconds" debug="false">
<statusListener class="ch.qos.logback.core.status.NopStatusListener"/>
diff --git a/kubernetes/aai/components/aai-graphadmin/resources/config/migration/janusgraph-migration-cached.properties b/kubernetes/aai/components/aai-graphadmin/resources/config/migration/janusgraph-migration-cached.properties
index b8f9a7f..155f872 100644
--- a/kubernetes/aai/components/aai-graphadmin/resources/config/migration/janusgraph-migration-cached.properties
+++ b/kubernetes/aai/components/aai-graphadmin/resources/config/migration/janusgraph-migration-cached.properties
@@ -1,3 +1,4 @@
+{{/*
#
# ============LICENSE_START=======================================================
# Copyright © 2018 AT&T Intellectual Property. All rights reserved.
@@ -14,6 +15,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
# ============LICENSE_END=========================================================
+*/}}
query.fast-property=true
query.smart-limit=false
diff --git a/kubernetes/aai/components/aai-graphadmin/resources/config/migration/janusgraph-migration-real.properties b/kubernetes/aai/components/aai-graphadmin/resources/config/migration/janusgraph-migration-real.properties
index 4b7261e..fb0e274 100644
--- a/kubernetes/aai/components/aai-graphadmin/resources/config/migration/janusgraph-migration-real.properties
+++ b/kubernetes/aai/components/aai-graphadmin/resources/config/migration/janusgraph-migration-real.properties
@@ -1,3 +1,4 @@
+{{/*
#
# ============LICENSE_START=======================================================
# Copyright © 2018 AT&T Intellectual Property. All rights reserved.
@@ -14,6 +15,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
# ============LICENSE_END=========================================================
+*/}}
query.fast-property=true
query.smart-limit=false
diff --git a/kubernetes/aai/components/aai-graphadmin/resources/config/realm.properties b/kubernetes/aai/components/aai-graphadmin/resources/config/realm.properties
index 97627ea..ccd9864 100644
--- a/kubernetes/aai/components/aai-graphadmin/resources/config/realm.properties
+++ b/kubernetes/aai/components/aai-graphadmin/resources/config/realm.properties
@@ -1,8 +1,9 @@
+{{/*
#
# ============LICENSE_START=======================================================
# org.onap.aai
# ================================================================================
-# Copyright © 2018 AT&T Intellectual Property. All rights reserved.
+# Copyright � 2018 AT&T Intellectual Property. All rights reserved.
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -18,6 +19,7 @@
# ============LICENSE_END=========================================================
# 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-graphadmin/templates/configmap.yaml b/kubernetes/aai/components/aai-graphadmin/templates/configmap.yaml
index e704743..91cd748 100644
--- a/kubernetes/aai/components/aai-graphadmin/templates/configmap.yaml
+++ b/kubernetes/aai/components/aai-graphadmin/templates/configmap.yaml
@@ -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=========================================================
+*/}}
apiVersion: v1
kind: ConfigMap
diff --git a/kubernetes/aai/components/aai-graphadmin/templates/deployment.yaml b/kubernetes/aai/components/aai-graphadmin/templates/deployment.yaml
index 7991ced..5e6f2bc 100644
--- a/kubernetes/aai/components/aai-graphadmin/templates/deployment.yaml
+++ b/kubernetes/aai/components/aai-graphadmin/templates/deployment.yaml
@@ -1,3 +1,4 @@
+{{/*
#
# ============LICENSE_START=======================================================
# org.onap.aai
@@ -18,6 +19,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
# ============LICENSE_END=========================================================
+*/}}
apiVersion: apps/v1
kind: Deployment
metadata:
diff --git a/kubernetes/aai/components/aai-graphadmin/templates/job-copy-db-backup.yaml b/kubernetes/aai/components/aai-graphadmin/templates/job-copy-db-backup.yaml
index 98fc98d..154ad30 100644
--- a/kubernetes/aai/components/aai-graphadmin/templates/job-copy-db-backup.yaml
+++ b/kubernetes/aai/components/aai-graphadmin/templates/job-copy-db-backup.yaml
@@ -1,3 +1,4 @@
+{{/*
#
# ============LICENSE_START=======================================================
# org.onap.aai
@@ -30,6 +31,7 @@
# that resources traversal and graphadmin wait until this job is done
# If you are using an existing cassandra cluster not coming from oom
# then it is your job to ensure that there are no connections to the database
+*/}}
{{- if .Values.global.jobs.migration.enabled }}
---
diff --git a/kubernetes/aai/components/aai-graphadmin/templates/job-create-db.yaml b/kubernetes/aai/components/aai-graphadmin/templates/job-create-db.yaml
index dce8324..7914468 100644
--- a/kubernetes/aai/components/aai-graphadmin/templates/job-create-db.yaml
+++ b/kubernetes/aai/components/aai-graphadmin/templates/job-create-db.yaml
@@ -1,3 +1,4 @@
+{{/*
#
# ============LICENSE_START=======================================================
# org.onap.aai
@@ -30,6 +31,7 @@
# that resources traversal and graphadmin wait until this job is done
# If you are using an existing cassandra cluster not coming from oom
# then it is your job to ensure that there are no connections to the database
+*/}}
{{- if and ( not .Values.global.jobs.migration.enabled ) ( .Values.global.jobs.createSchema.enabled ) }}
apiVersion: batch/v1
diff --git a/kubernetes/aai/components/aai-graphadmin/templates/job-migration.yaml b/kubernetes/aai/components/aai-graphadmin/templates/job-migration.yaml
index d5dbeef..4b100dd 100644
--- a/kubernetes/aai/components/aai-graphadmin/templates/job-migration.yaml
+++ b/kubernetes/aai/components/aai-graphadmin/templates/job-migration.yaml
@@ -1,3 +1,4 @@
+{{/*
#
# ============LICENSE_START=======================================================
# org.onap.aai
@@ -30,6 +31,7 @@
# that resources traversal and graphadmin wait until this job is done
# If you are using an existing cassandra cluster not coming from oom
# then it is your job to ensure that there are no connections to the database
+*/}}
{{- if .Values.global.jobs.migration.enabled }}
---
diff --git a/kubernetes/aai/components/aai-graphadmin/templates/service.yaml b/kubernetes/aai/components/aai-graphadmin/templates/service.yaml
index ab6c677..2f7aaa9 100644
--- a/kubernetes/aai/components/aai-graphadmin/templates/service.yaml
+++ b/kubernetes/aai/components/aai-graphadmin/templates/service.yaml
@@ -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=========================================================
+*/}}
apiVersion: v1
kind: Service