1 files changed, 42 insertions, 31 deletions

diff --git a/kubernetes/aai/components/aai-graphadmin/values.yaml b/kubernetes/aai/components/aai-graphadmin/values.yaml
index 74751e8585..dd95c8b67a 100644
--- a/kubernetes/aai/components/aai-graphadmin/values.yaml
+++ b/kubernetes/aai/components/aai-graphadmin/values.yaml
@@ -32,6 +32,8 @@ global: # global defaults
     localCluster: false
     # flag to enable the DB creation via k8ssandra-operator
     useOperator: true
+    #Cassandra datacenter name
+    localDataCenter: dc1
   initContainers:
     enabled: true
   jobs:
@@ -44,25 +46,21 @@ global: # global defaults
     duplicates:
       enabled: false
   config:
-
     # Specifies that the cluster connected to a dynamic
     # cluster being spinned up by kubernetes deployment
     cluster:
       cassandra:
         dynamic: true
-
     # Specifies if the basic authorization is enabled
     basic:
       auth:
         enabled: true
         username: AAI
         passwd: AAI
-
     # Notification event specific properties
     notification:
       eventType: AAI-EVENT
       domain: dev
-
     # Schema specific properties that include supported versions of api
     schema:
       # Specifies if the connection should be one way ssl, two way ssl or no auth
@@ -100,17 +98,16 @@ global: # global defaults
         # Specifies from which version the edge label appeared in API
         edge:
           label: v12
-
     # Specifies which clients should always default to realtime graph connection
     realtime:
       clients: SDNC,-1|MSO,-1|SO,-1|robot-ete,-1
 
 # application image
-image: onap/aai-graphadmin:1.14.0
+image: onap/aai-graphadmin:1.14.7
 pullPolicy: Always
 restartPolicy: Always
 flavor: small
-flavorOverride: small
+
 # default number of instances
 replicaCount: 1
 
@@ -128,14 +125,11 @@ updateStrategy:
 
 # Configuration for the graphadmin deployment
 config:
-  projectHome: /opt/app/aai-graphadmin
   # Specify the profiles for the graphadmin microservice
   profiles:
     active: kafka
-    kafkaBootstrap: strimzi-kafka-bootstrap
     jaasConfExternalSecret: '{{ include "common.release" . }}-{{ .Values.global.aaiGraphKafkaUser }}'
     someConfig: graphrandom
-    aaiTopic: AAI-EVENT
   # Specifies the timeout limit for the REST API requests
   timeout:
     enabled: true
@@ -144,17 +138,18 @@ config:
     # temporarily enable this to update the graph storage version
     # see: https://docs.janusgraph.org/changelog/#upgrade-instructions_9
     allowUpgrade: true
-
+    # config override for the cassandra driver
+    # see: https://docs.janusgraph.org/master/configs/configuration-reference/#storagecqlinternal
+    cassandraDriver:
+      configuration: advanced.metadata.schema.debouncer.window = 1 second
   # Default maximum records to fix for the data grooming and dupeTool
   maxFix:
     dataGrooming: 150
     dupeTool: 25
-
   # Default number of sleep minutes for dataGrooming and dupeTool
   sleepMinutes:
     dataGrooming: 7
     dupeTool: 7
-
   # Cron specific attributes to be triggered for the graphadmin spring cron tasks
   cron:
     # Specifies that the data grooming tool which runs duplicates should be enabled
@@ -164,10 +159,8 @@ config:
     dataSnapshot:
       enabled: true
       params: JUST_TAKE_SNAPSHOT
-
     # Data cleanup which zips snapshots older than x days and deletes older than y days
     dataCleanup:
-
       dataGrooming:
         enabled: true
         # Zips up the dataGrooming files older than 5 days
@@ -190,7 +183,6 @@ config:
   debug:
     enabled: false
     args: "-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5005"
-
   # adds jvm args for remote profiling the application
   profiling:
     enabled: false
@@ -209,16 +201,28 @@ affinity: {}
 
 # probe configuration parameters
 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
+  path: /actuator/health/liveness
+  periodSeconds: 10
 
 readiness:
-  initialDelaySeconds: 60
+  path: /actuator/health/readiness
   periodSeconds: 10
 
+startup:
+  path: /actuator/health/liveness
+  failureThreshold: 60
+  periodSeconds: 5
+
+readinessCheck:
+  waitForWithCreateSchemaEnabled:
+    jobs:
+      - '{{ include "common.release" . }}-aai-graphadmin-create-db-schema'
+  waitForWithCreateSchemaDisabled:
+    services:
+      - '{{ .Values.global.cassandra.serviceName }}'
+      - aai-schema-service
+
 service:
   type: ClusterIP
   # REST API port for the graphadmin microservice
@@ -228,9 +232,9 @@ service:
   debugPort: 5005
   profilingPortName: jxm-9999
   profilingPort: 9999
-  portName3: http-graphadmin
-  internalPort3: 8448
-  terminationGracePeriodSeconds: 120
+  actuatorPortName: http-graphadmin
+  actuatorPort: 8448
+  terminationGracePeriodSeconds: 45
 
 ingress:
   enabled: false
@@ -288,12 +292,19 @@ resources:
       memory: "8Gi"
     requests:
       cpu: "1"
-      memory: "3.2Gi"
+      memory: "4Gi"
   unlimited: {}
 
+# define the heap size for the JVM
+# according to the resource flavor
+small:
+  maxHeapSize: "1g"
+large:
+  maxHeapSize: "5g"
+
 metrics:
   serviceMonitor:
-    enabled: false
+    enabled: true
     targetPort: 8448
     path: /actuator/prometheus
     basicAuth:
@@ -311,8 +322,8 @@ metrics:
 
 # Not fully used for now
 securityContext:
-  user_id: 1000
-  group_id: 1000
+  user_id: 65534
+  group_id: 65534
 
 #Pods Service Account
 serviceAccount:
@@ -323,8 +334,8 @@ serviceAccount:
 log:
   path: /var/log/onap
   level:
-    root: DEBUG
-    base: DEBUG
+    root: INFO
+    base: INFO
 logConfigMapNamePrefix: '{{ include "common.fullname" . }}'
 
 #DupeTool cronjob parameters