Merge "[AAI] Add variables for HEAP and METASPACE sizes"

diff --combined kubernetes/aai/components/aai-resources/values.yaml
index 0df30ed,7615f4b..3a4d568
--- 1/kubernetes/aai/components/aai-resources/values.yaml
--- 2/kubernetes/aai/components/aai-resources/values.yaml
+++ b/kubernetes/aai/components/aai-resources/values.yaml
@@@ -75,11 -75,11 +75,11 @@@ global: # global default
        version:
          # Current version of the REST API
          api:
 -          default: v27
 +          default: v28
          # Specifies which version the depth parameter is configurable
          depth: v11
          # List of all the supported versions of the API
 -        list: v11,v12,v13,v14,v15,v16,v17,v18,v19,v20,v21,v22,v23,v24,v25,v26,v27
 +        list: v11,v12,v13,v14,v15,v16,v17,v18,v19,v20,v21,v22,v23,v24,v25,v26,v27,v28
          # Specifies from which version related link should appear
          related:
            link: v11
@@@ -123,7 -123,7 +123,7 @@@ aai_enpoints
      url: external-system
  
  # application image
 -image: onap/aai-resources:1.11.0
 +image: onap/aai-resources:1.12.3
  pullPolicy: Always
  restartPolicy: Always
  flavor: small
@@@ -175,6 -175,12 +175,12 @@@ config
      # Specifies if the bulk can be override and if it can the value
      override: false
  
+   # environment variables added to the launch of the image in deployment
+   env:
+     MIN_HEAP_SIZE: "512m"
+     MAX_HEAP_SIZE: "1024m"
+     MAX_METASPACE_SIZE: "512m"
+ 
  nodeSelector: {}
  
  affinity: {}
@@@ -245,14 -251,6 +251,14 @@@ resources
        memory: 6Gi
    unlimited: {}
  
 +tracing:
 +  collector:
 +    baseUrl: http://jaeger-collector.istio-system:9411
 +  sampling:
 +    probability: 1.0 # percentage of requests that are sampled (between 0-1/0%-100%)
 +  ignorePatterns:
 +    - /aai/util.*
 +
  metrics:
    serviceMonitor:
      enabled: false
@@@ -318,12 -316,12 +324,12 @@@ logConfigMapNamePrefix: '{{ include "co
  
  # To make logback capping values configurable
  logback:
 -  logToFileEnabled: true
 +  logToFileEnabled: false
    maxHistory: 7
    totalSizeCap: 1GB
    queueSize: 1000
  
  accessLogback:
 -  logToFileEnabled: true
 +  logToFileEnabled: false
    maxHistory: 7
    totalSizeCap: 1GB

diff --combined kubernetes/aai/components/aai-traversal/values.yaml
index 3c6714a,6230576..2b7e78f
--- 1/kubernetes/aai/components/aai-traversal/values.yaml
--- 2/kubernetes/aai/components/aai-traversal/values.yaml
+++ b/kubernetes/aai/components/aai-traversal/values.yaml
@@@ -84,11 -84,11 +84,11 @@@ global: # global default
        version:
          # Current version of the REST API
          api:
 -          default: v27
 +          default: v28
          # Specifies which version the depth parameter is configurable
          depth: v11
          # List of all the supported versions of the API
 -        list: v11,v12,v13,v14,v15,v16,v17,v18,v19,v20,v21,v22,v23,v24,v25,v26,v27
 +        list: v11,v12,v13,v14,v15,v16,v17,v18,v19,v20,v21,v22,v23,v24,v25,v26,v27,v28
          # Specifies from which version related link should appear
          related:
            link: v11
@@@ -107,7 -107,7 +107,7 @@@
        clients: SDNC,MSO,SO,robot-ete
  
  # application image
 -image: onap/aai-traversal:1.11.2
 +image: onap/aai-traversal:1.12.3
  pullPolicy: Always
  restartPolicy: Always
  flavor: small
@@@ -166,6 -166,12 +166,12 @@@ config
      # Specifies how long should it wait before timing out the REST request
      limit: 180000
  
+   # environment variables added to the launch of the image in deployment
+   env:
+     MIN_HEAP_SIZE: "512m"
+     MAX_HEAP_SIZE: "1024m"
+     MAX_METASPACE_SIZE: "512m"
+ 
    # Disables the updateQueryData script to run as part of traversal
    disableUpdateQuery: true
  
@@@ -236,13 -242,13 +242,13 @@@ serviceMesh
  
  # To make logback capping values configurable
  logback:
 -  logToFileEnabled: true
 +  logToFileEnabled: false
    maxHistory: 7
    totalSizeCap: 6GB
    queueSize: 1000
  
  accessLogback:
 -  logToFileEnabled: true
 +  logToFileEnabled: false
    maxHistory: 7
    totalSizeCap: 6GB