Merge "[AAI] Release version 1.14.0 of AAI"

7 files changed, 101 insertions, 78 deletions

diff --git a/kubernetes/aai/components/aai-resources/.helmignore b/kubernetes/aai/components/aai-resources/.helmignore
index daebc7da77..f0c1319444 100644
--- a/kubernetes/aai/components/aai-resources/.helmignore
+++ b/kubernetes/aai/components/aai-resources/.helmignore
@@ -1,21 +1,21 @@
-# Patterns to ignore when building packages.

-# This supports shell glob matching, relative path matching, and

-# negation (prefixed with !). Only one pattern per line.

-.DS_Store

-# Common VCS dirs

-.git/

-.gitignore

-.bzr/

-.bzrignore

-.hg/

-.hgignore

-.svn/

-# Common backup files

-*.swp

-*.bak

-*.tmp

-*~

-# Various IDEs

-.project

-.idea/

-*.tmproj

+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
diff --git a/kubernetes/aai/components/aai-resources/Chart.yaml b/kubernetes/aai/components/aai-resources/Chart.yaml
index 3594492675..51684cfb87 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: 13.0.1
+version: 14.0.0
 
 dependencies:
   - name: common
diff --git a/kubernetes/aai/components/aai-resources/resources/config/aaiconfig.properties b/kubernetes/aai/components/aai-resources/resources/config/aaiconfig.properties
index adabae3ac7..0f6f2923af 100644
--- a/kubernetes/aai/components/aai-resources/resources/config/aaiconfig.properties
+++ b/kubernetes/aai/components/aai-resources/resources/config/aaiconfig.properties
@@ -5,7 +5,7 @@
 # ================================================================================
 # Copyright © 2017 AT&T Intellectual Property. All rights reserved.
 # Modifications Copyright © 2020 Orange
-# Modifications Copyright © 2023 Nordix Foundation
+# Modifications Copyright © 2023 Nordix Foundation
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -97,4 +97,4 @@ aai.graph.checker.task.enabled=true
 aai.graph.checker.task.delay=5
 
 # Period, in seconds, between two consecutive executions of the scheduled task, if enabled
-aai.graph.checker.task.period=10
\ No newline at end of file
+aai.graph.checker.task.period=10
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 4835560665..adc7f6a4af 100644
--- a/kubernetes/aai/components/aai-resources/resources/config/janusgraph-realtime.properties
+++ b/kubernetes/aai/components/aai-resources/resources/config/janusgraph-realtime.properties
@@ -104,3 +104,7 @@ cache.db-cache-clean-wait={{ .Values.config.janusgraph.caching.dbCacheCleanWait
 
 #load graphson file on startup
 load.snapshot.file=false
+
+{{ if .Values.config.janusgraph.allowUpgrade }}
+graph.allow-upgrade=true
+{{ end }}
diff --git a/kubernetes/aai/components/aai-resources/templates/deployment.yaml b/kubernetes/aai/components/aai-resources/templates/deployment.yaml
index 7cccfb11a8..47bbaef0ca 100644
--- a/kubernetes/aai/components/aai-resources/templates/deployment.yaml
+++ b/kubernetes/aai/components/aai-resources/templates/deployment.yaml
@@ -36,6 +36,7 @@ metadata:
     heritage: {{ .Release.Service }}
 spec:
   replicas: {{ .Values.replicaCount }}
+  revisionHistoryLimit: {{ .Values.revisionHistoryLimit }}
   minReadySeconds: {{ .Values.minReadySeconds }}
   strategy:
     type: {{ .Values.updateStrategy.type }}
@@ -157,11 +158,11 @@ spec:
         - name: LOCAL_GROUP_ID
           value: {{ .Values.global.config.groupId | quote }}
         - name: INTERNAL_PORT_1
-          value: {{ .Values.service.internalPort | quote }}
+          value: {{ .Values.service.resourcesPort | quote }}
         - name: INTERNAL_PORT_2
-          value: {{ .Values.service.internalPort2 | quote }}
+          value: {{ .Values.service.debugPort | quote }}
         - name: INTERNAL_PORT_3
-          value: {{ .Values.service.internalPort3 | quote }}
+          value: {{ .Values.service.metricsPort | quote }}
         - name: BOOTSTRAP_SERVERS
           value: {{ include "common.release" . }}-strimzi-kafka-bootstrap:9092
         - name: JAAS_CONFIG
@@ -197,19 +198,18 @@ spec:
           name: {{ include "common.fullname" . }}-config
           subPath: application-keycloak.properties
         ports:
-        - containerPort: {{ .Values.service.internalPort }}
-          name: {{ .Values.service.portName }}
+        - containerPort: {{ .Values.service.resourcesPort }}
+          name: {{ .Values.service.resourcesPortName }}
         {{- if .Values.config.debug.enabled }}
-        - containerPort: {{ .Values.service.internalPort2 }}
-          name: {{ .Values.service.portName2 }}
+        - containerPort: {{ .Values.service.debugPort }}
+          name: {{ .Values.service.debugPortName }}
         {{- end }}
-        - containerPort: {{ .Values.service.internalPort3 }}
-          name: {{ .Values.service.portName3 }}
+        - containerPort: {{ .Values.service.metricsPort }}
+          name: {{ .Values.service.metricsPortName }}
         {{- if .Values.config.profiling.enabled }}
-        - containerPort: {{ .Values.service.internalPort4 }}
-          name: {{ .Values.service.portName4 }}
+        - containerPort: {{ .Values.service.profilingPort }}
+          name: {{ .Values.service.profilingPortName }}
         {{- end }}
-
         lifecycle:
           # wait for active requests (long-running tasks) to be finished
           # Before the SIGTERM is invoked, Kubernetes exposes a preStop hook in the Pod.
@@ -219,16 +219,16 @@ spec:
                 - sh
                 - -c
                 - |
-                  while (netstat -an | grep ESTABLISHED | grep -e $INTERNAL_PORT_1 -e $INTERNAL_PORT_2)
+                  while (netstat -an | grep ESTABLISHED | grep -e $INTERNAL_PORT_1)
                   do sleep 10
                   done
-        # disable liveness probe when breakpoints set in debugger
-        # so K8s doesn't restart unresponsive container
-        {{- if .Values.liveness.enabled }}
+        # disable liveness probe when
+        # debugging.enable=true or profiling.enabled=true
+        {{- if and .Values.liveness.enabled (not (or .Values.config.debug.enabled .Values.config.profiling.enabled)) }}
         livenessProbe:
           httpGet:
             path: /aai/util/echo?action=checkDB
-            port: {{ .Values.service.internalPort }}
+            port: {{ .Values.service.resourcesPort }}
             scheme: HTTP
             httpHeaders:
             - name: X-FromAppId
@@ -243,7 +243,7 @@ spec:
         readinessProbe:
           httpGet:
             path: /aai/util/echo?action=checkDB
-            port: {{ .Values.service.internalPort }}
+            port: {{ .Values.service.resourcesPort }}
             scheme: HTTP
             httpHeaders:
             - name: X-FromAppId
diff --git a/kubernetes/aai/components/aai-resources/templates/service.yaml b/kubernetes/aai/components/aai-resources/templates/service.yaml
index 0613129aac..308dc052c8 100644
--- a/kubernetes/aai/components/aai-resources/templates/service.yaml
+++ b/kubernetes/aai/components/aai-resources/templates/service.yaml
@@ -29,28 +29,30 @@ spec:
   type: {{ .Values.service.type }}
   ports:
   {{ if eq .Values.service.type "NodePort" -}}
-  - port: {{ .Values.service.internalPort }}
+  - port: {{ .Values.service.resourcesPort }}
     nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort }}
-    name: {{ .Values.service.portName }}
-    targetPort: {{ .Values.service.portName }}
-  - port: {{ .Values.service.internalPort2 }}
+    name: {{ .Values.service.resourcesPortName }}
+    targetPort: {{ .Values.service.resourcesPortName }}
+  - port: {{ .Values.service.debugPort }}
     nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort2 }}
-    name: {{ .Values.service.portName2 }}
-    targetPort: {{ .Values.service.portName2 }}
-  - port: {{ .Values.service.internalPort3 }}
+    name: {{ .Values.service.debugPortName }}
+    targetPort: {{ .Values.service.debugPortName }}
+  - port: {{ .Values.service.metricsPort }}
     nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort3 }}
-    name: {{ .Values.service.portName3 }}
-    targetPort: {{ .Values.service.portName3 }}
+    name: {{ .Values.service.metricsPortName }}
+    targetPort: {{ .Values.service.metricsPortName }}
   {{- else -}}
-  - port: {{ .Values.service.internalPort }}
-    name: {{ .Values.service.portName }}
-    targetPort: {{ .Values.service.portName }}
-  - port: {{ .Values.service.internalPort2 }}
-    name: {{ .Values.service.portName2 }}
-    targetPort: {{ .Values.service.portName2 }}
-  - port: {{ .Values.service.internalPort3 }}
-    name: {{ .Values.service.portName3 }}
-    targetPort: {{ .Values.service.portName3 }}
+  - port: {{ .Values.service.resourcesPort }}
+    name: {{ .Values.service.resourcesPortName }}
+    targetPort: {{ .Values.service.resourcesPortName }}
+  {{- if .Values.config.debug.enabled }}
+  - port: {{ .Values.service.debugPort }}
+    name: {{ .Values.service.debugPortName }}
+    targetPort: {{ .Values.service.debugPortName }}
+  {{- end }}
+  - port: {{ .Values.service.metricsPort }}
+    name: {{ .Values.service.metricsPortName }}
+    targetPort: {{ .Values.service.metricsPortName }}
   {{- end }}
   selector:
     app: {{ include "common.name" . }}
diff --git a/kubernetes/aai/components/aai-resources/values.yaml b/kubernetes/aai/components/aai-resources/values.yaml
index 6229992e94..b7acd64610 100644
--- a/kubernetes/aai/components/aai-resources/values.yaml
+++ b/kubernetes/aai/components/aai-resources/values.yaml
@@ -98,11 +98,10 @@ 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
-
+      kafkaBootstrap: strimzi-kafka-bootstrap
+      jaasConfExternalSecret: '{{ include "common.release" . }}-{{ .Values.global.aaiKafkaUser }}'
+      someConfig: random
+      aaiTopic: AAI-EVENT
 api_list:
   - 11
   - 12
@@ -113,6 +112,16 @@ api_list:
   - 17
   - 18
   - 19
+  - 20
+  - 21
+  - 22
+  - 23
+  - 24
+  - 25
+  - 26
+  - 27
+  - 28
+  - 29
 
 aai_enpoints:
   - name: aai-cloudInfrastructure
@@ -129,13 +138,17 @@ aai_enpoints:
     url: external-system
 
 # application image
-image: onap/aai-resources:1.13.5
+image: onap/aai-resources:1.14.0
 pullPolicy: Always
 restartPolicy: Always
 flavor: small
 flavorOverride: small
 # default number of instances
 replicaCount: 1
+
+# number of ReplicaSets that should be retained for the Deployment
+revisionHistoryLimit: 2
+
 # the minimum number of seconds that a newly created Pod should be ready
 minReadySeconds: 30
 updateStrategy:
@@ -166,11 +179,15 @@ config:
       # modifications to graph done by this service/janusgraph instance will immediately invalidate the cache
       # modifications to graph done by other services (traversal) will only be visible
       # after time specified in db-cache-time
-      enabled: false
+      enabled: true
       # Documentation: https://docs.janusgraph.org/operations/cache/#database-level-caching
       dbCacheTime: 180000 # in milliseconds
       dbCacheSize: 0.1 # percentage (expressed as a decimal between 0 and 1) of the total heap space available to the JVM running
       dbCacheCleanWait: 20 # in milliseconds
+    # temporarily enable this to update the graph storage version
+    # see: https://docs.janusgraph.org/changelog/#upgrade-instructions_9
+    allowUpgrade: true
+
 
 
   # Specifies crud related operation timeouts and overrides
@@ -196,7 +213,7 @@ config:
   # environment variables added to the launch of the image in deployment
   env:
     MIN_HEAP_SIZE: "512m"
-    MAX_HEAP_SIZE: "1024m"
+    MAX_HEAP_SIZE: "2g"
     MAX_METASPACE_SIZE: "512m"
 
   # adds jvm args for remote debugging the application
@@ -228,9 +245,7 @@ affinity: {}
 liveness:
   initialDelaySeconds: 60
   periodSeconds: 60
-  # necessary to disable liveness probe when setting breakpoints
-  # in debugger so K8s doesn't restart unresponsive container
-  enabled: false
+  enabled: true
 
 readiness:
   initialDelaySeconds: 60
@@ -238,13 +253,15 @@ readiness:
 
 service:
   type: ClusterIP
-  portName: http
-  internalPort: 8447
-  portName2: tcp-5005
-  internalPort2: 5005
-  portName3: http-resources
-  internalPort3: 8448
-  terminationGracePeriodSeconds: 120
+  resourcesPortName: http
+  resourcesPort: 8447
+  debugPortName: tcp-5005
+  debugPort: 5005
+  metricsPortName: metrics
+  metricsPort: 8448
+  profilingPortName: jmx-9999
+  profilingPort: 9999
+  terminationGracePeriodSeconds: 60
   sessionAffinity: None
 
 ingress: