Upgrade AAI to use readiness check 2.0.2

[oom.git] / kubernetes / aai / values.yaml

diff --git a/kubernetes/aai/values.yaml b/kubernetes/aai/values.yaml
index 16e3705..1d3a3a5 100644 (file)
--- a/kubernetes/aai/values.yaml
+++ b/kubernetes/aai/values.yaml
@@ -23,13 +23,38 @@ global: # global defaults
   busyboxImage: busybox
 
   readinessRepository: oomk8s
-  readinessImage: readiness-check:2.0.0
+  readinessImage: readiness-check:2.0.2
 
   loggingRepository: docker.elastic.co
   loggingImage: beats/filebeat:5.5.0
 
   restartPolicy: Always
 
+  installSidecarSecurity: false
+  aafEnabled: true
+
+  fproxy:
+    name: forward-proxy
+    activeSpringProfiles: noHostVerification,cadi
+    image: onap/fproxy:2.1-STAGING-latest
+    port: 10680
+
+  rproxy:
+    name: reverse-proxy
+    activeSpringProfiles: noHostVerification,cadi
+    image: onap/rproxy:2.1-STAGING-latest
+    port: 10692
+
+  tproxyConfig:
+    name: init-tproxy-config
+    image: onap/tproxy-config:2.1-STAGING-latest
+
+  # AAF server details. Only needed if the AAF DNS does not resolve from the pod
+  aaf:
+    serverIp: 10.12.6.214
+    serverHostname: aaf.osaaf.org
+    serverPort: 30247
+
   cassandra:
     serviceName: aai-cassandra
     replicas: 3
@@ -58,6 +83,8 @@ global: # global defaults
     serviceName: aai-traversal
   graphadmin:
     serviceName: aai-graphadmin
+  spike:
+    serviceName: aai-spike
 
   initContainers:
     enabled: true
@@ -124,7 +151,7 @@ global: # global defaults
 
     # Active spring profiles for the resources microservice
     profiles:
-      active: production,dmaap,one-way-ssl
+      active: production,dmaap,aaf-auth
 
     # Notification event specific properties
     notification:
@@ -133,6 +160,12 @@ global: # global defaults
 
     # 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
+      service:
+        client: one-way-ssl
+      # Specifies which translator to use if it has schema-service, then it will make a rest request to schema service
+      translator:
+        list: schema-service
       source:
         # Specifies which folder to take a look at
         name: onap
@@ -143,14 +176,14 @@ global: # global defaults
       version:
         # Current version of the REST API
         api:
-          default: v14
+          default: v16
         # Specifies which version the depth parameter is configurable
-        depth: v9
+        depth: v11
         # List of all the supported versions of the API
-        list: v8,v9,v10,v11,v12,v13,v14
+        list: v11,v12,v13,v14,v15,v16
         # Specifies from which version related link should appear
         related:
-          link: v10
+          link: v11
         # Specifies from which version the app root change happened
         app:
           root: v11
@@ -194,6 +227,8 @@ dockerhubRepository: registry.hub.docker.com
 image: aaionap/haproxy:1.2.4
 pullPolicy: Always
 
+flavor: small
+
 # flag to enable debugging - application support required
 debugEnabled: false
 
@@ -238,21 +273,19 @@ service:
 ingress:
   enabled: false
 
-resources: {}
-  # We usually recommend not to specify default resources and to leave this as a conscious
-  # choice for the user. This also increases chances charts run on environments with little
-  # resources, such as Minikube. If you do want to specify resources, uncomment the following
-  # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
-  #
-  # Example:
-  # Configure resource requests and limits
-  # 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:
+      cpu: 2
+      memory: 4Gi
+    requests:
+      cpu: 1
+      memory: 1Gi
+  large:
+    limits:
+      cpu: 4
+      memory: 8Gi
+    requests:
+      cpu: 2
+      memory: 2Gi
+  unlimited: {}