[AAI] Release 14.0.1 chart with Janusgraph update to 0.6.0

- 1.14.5 images for resources, traversal and graphadmin with Janusgraph update (0.5.3 -> 0.6.0)
- cleanup janusgraph-realtime.properties file since the 'cassandra' storage.backend option is not supported anymore
- use more descriptive port names for schema-service
- reduce terminationGracePeriodSeconds of pods to enable quicker deployment
- declare pod revisionHistoryLimit for all components
- make root log level configurable for all components (via log.level.root)

Issue-ID: AAI-3950
Change-Id: I6221963139fcf4b748167940b6e59367661ba1e5
Signed-off-by: Fiete Ostkamp <Fiete.Ostkamp@telekom.de>

4 files changed, 16 insertions, 38 deletions

diff --git a/kubernetes/aai/components/aai-resources/Chart.yaml b/kubernetes/aai/components/aai-resources/Chart.yaml
index 92d5bc241f..c67329d234 100644
--- a/kubernetes/aai/components/aai-resources/Chart.yaml
+++ b/kubernetes/aai/components/aai-resources/Chart.yaml
@@ -18,7 +18,7 @@
 apiVersion: v2
 description: ONAP AAI resources
 name: aai-resources
-version: 14.0.1
+version: 14.0.2
 
 dependencies:
   - name: common
diff --git a/kubernetes/aai/components/aai-resources/resources/config/janusgraph-realtime.properties b/kubernetes/aai/components/aai-resources/resources/config/janusgraph-realtime.properties
index adc7f6a4af..36940a8921 100644
--- a/kubernetes/aai/components/aai-resources/resources/config/janusgraph-realtime.properties
+++ b/kubernetes/aai/components/aai-resources/resources/config/janusgraph-realtime.properties
@@ -15,9 +15,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # ============LICENSE_END=========================================================
-#
-# ECOMP is a trademark and service mark of AT&T Intellectual Property.
-#
 */}}
 
 query.fast-property=true
@@ -27,40 +24,31 @@ query.smart-limit=false
 
 storage.backend=cql
 storage.hostname={{.Values.global.cassandra.serviceName}}
-storage.cql.keyspace=aaigraph
 storage.username={{.Values.global.cassandra.username}}
 storage.password={{.Values.global.cassandra.password}}
 
+storage.cql.keyspace=aaigraph
+storage.cql.local-datacenter={{ .Values.global.cassandra.localDataCenter }}
 storage.cql.read-consistency-level=LOCAL_QUORUM
 storage.cql.write-consistency-level=LOCAL_QUORUM
 storage.cql.replication-factor={{.Values.global.cassandra.replicas}}
 storage.cql.only-use-local-consistency-for-system-operations=true
 
+{{ if .Values.global.cassandra.partitionerName }}
+storage.cql.partitioner-name={{ .Values.global.cassandra.partitionerName }}
+{{ end }}
+
 {{ else }}
 
 {{ if .Values.global.config.storage }}
 
 storage.backend={{ .Values.global.config.storage.backend }}
 
-{{ if eq .Values.global.config.storage.backend "cassandra" }}
-
-storage.hostname={{ .Values.global.config.storage.hostname }}
-storage.cassandra.keyspace={{ .Values.global.config.storage.name }}
-
-storage.cassandra.read-consistency-level={{ .Values.global.config.storage.cassandra.readConsistency }}
-storage.cassandra.write-consistency-level={{ .Values.global.config.storage.cassandra.writeConsistency }}
-storage.cassandra.replication-factor={{ .Values.global.config.storage.cassandra.replicationFactor | int }}
-storage.cassandra.astyanax.cluster-name= {{ .Values.global.config.storage.clusterName }}
-storage.cassandra.astyanax.local-datacenter= {{ .Values.global.config.storage.localDataCenter }}
-
-storage.connection-timeout={{ .Values.global.config.storage.connectionTimeout | int }}
-cache.tx-cache-size={{ .Values.global.config.storage.cacheSize | int }}
-log.tx.key-consistent={{ .Values.global.config.storage.keyConsistent }}
-
-{{ else if eq .Values.global.config.storage.backend "cql" }}
+{{ if eq .Values.global.config.storage.backend "cql" }}
 
 storage.hostname={{ .Values.global.config.storage.hostname }}
 storage.cql.keyspace={{ .Values.global.config.storage.name }}
+storage.cql.local-datacenter={{ .Values.global.config.storage.localDataCenter }}
 
 storage.cql.read-consistency-level={{ .Values.global.config.storage.cql.readConsistency }}
 storage.cql.write-consistency-level={{ .Values.global.config.storage.cql.readConsistency }}
diff --git a/kubernetes/aai/components/aai-resources/templates/aai-kafka-user.yml b/kubernetes/aai/components/aai-resources/templates/aai-kafka-user.yml
index e4fa84a041..6b703e7cdd 100644
--- a/kubernetes/aai/components/aai-resources/templates/aai-kafka-user.yml
+++ b/kubernetes/aai/components/aai-resources/templates/aai-kafka-user.yml
@@ -28,4 +28,5 @@ spec:
     - resource:
         type: topic
         name: AAI-EVENT
-      operation: All
\ No newline at end of file
+      operations:
+        - All
diff --git a/kubernetes/aai/components/aai-resources/values.yaml b/kubernetes/aai/components/aai-resources/values.yaml
index b028829027..14ae2debbc 100644
--- a/kubernetes/aai/components/aai-resources/values.yaml
+++ b/kubernetes/aai/components/aai-resources/values.yaml
@@ -98,10 +98,6 @@ global: # global defaults
     # Specifies which clients should always default to realtime graph connection
     realtime:
       clients: SDNC,MSO,SO,robot-ete
-      kafkaBootstrap: strimzi-kafka-bootstrap
-      jaasConfExternalSecret: '{{ include "common.release" . }}-{{ .Values.global.aaiKafkaUser }}'
-      someConfig: random
-      aaiTopic: AAI-EVENT
 api_list:
   - 11
   - 12
@@ -138,7 +134,7 @@ aai_enpoints:
     url: external-system
 
 # application image
-image: onap/aai-resources:1.14.4
+image: onap/aai-resources:1.14.6
 pullPolicy: Always
 restartPolicy: Always
 flavor: small
@@ -261,7 +257,7 @@ service:
   metricsPort: 8448
   profilingPortName: jmx-9999
   profilingPort: 9999
-  terminationGracePeriodSeconds: 60
+  terminationGracePeriodSeconds: 30
   sessionAffinity: None
 
 ingress:
@@ -283,13 +279,6 @@ serviceMesh:
   # ref: http://kubernetes.io/docs/user-guide/compute-resources/
   # Minimum memory for development is 2 CPU cores and 4GB memory
   # Minimum memory for production is 4 CPU cores and 8GB memory
-#resources:
-#  limits:
-#    cpu: "2"
-#    memory: "4Gi"
-#  requests:
-#    cpu: "2"
-#    memory: "4Gi"
 resources:
   small:
     limits:
@@ -300,10 +289,10 @@ resources:
       memory: "3Gi"
   large:
     limits:
-      cpu: "4"
-      memory: "8Gi"
+      cpu: "8"
+      memory: "12Gi"
     requests:
-      cpu: "2"
+      cpu: "4"
       memory: "6Gi"
   unlimited: {}