X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Faai%2Fvalues.yaml;h=d382b80ba07ef0196834b73ca1c54e7751d9de2b;hb=c87dbc30928b4a9d05062ac842ec6749ee25ab3c;hp=42b0fa622aa02fcc88452fa1b02c9990dd9df3f9;hpb=713b8580259faac67b7b4f3533c96785e54284df;p=oom.git

diff --git a/kubernetes/aai/values.yaml b/kubernetes/aai/values.yaml
index 42b0fa622a..d382b80ba0 100644
--- a/kubernetes/aai/values.yaml
+++ b/kubernetes/aai/values.yaml
@@ -231,11 +231,11 @@ global: # global defaults
       version:
         # Current version of the REST API
         api:
-          default: v24
+          default: v27
         # 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
+        list: v11,v12,v13,v14,v15,v16,v17,v18,v19,v20,v21,v22,v23,v24,v25,v26,v27
         # Specifies from which version related link should appear
         related:
           link: v11
@@ -277,12 +277,16 @@ global: # global defaults
         # since when this is enabled, it prints a lot of information to console
         enabled: false
 
+  aaiSdcListenerKafkaUser: aai-sdc-list-user
+
 aai-babel:
   logConfigMapNamePrefix: '{{ include "common.release" . }}-aai'
 aai-graphadmin:
   logConfigMapNamePrefix: '{{ include "common.release" . }}-aai'
 aai-modelloader:
   logConfigMapNamePrefix: '{{ include "common.release" . }}-aai'
+  config:
+    jaasConfExternalSecret: '{{ include "common.release" . }}-{{ .Values.global.aaiSdcListenerKafkaUser }}'
 aai-resources:
   logConfigMapNamePrefix: '{{ include "common.release" . }}-aai'
 aai-schema-service:
@@ -328,7 +332,7 @@ certInitializer:
 
 # application image
 dockerhubRepository: registry.hub.docker.com
-image: aaionap/haproxy:1.4.2
+image: onap/aai-haproxy:1.9.5
 pullPolicy: Always
 
 flavor: small
@@ -345,10 +349,28 @@ config:
 # default number of instances
 replicaCount: 1
 
+updateStrategy:
+  type: RollingUpdate
+  maxUnavailable: 0
+  maxSurge: 1
+
 nodeSelector: {}
 
 affinity: {}
 
+# HAProxy configuration to block HTTP requests to AAI based on configurable URL patterns
+haproxy:
+  initContainers:
+    resources:
+      memory: 100Mi
+      cpu: 50m
+  requestBlocking:
+    enabled: false
+    customConfigs: []
+  replicas:
+    aaiResources: 1
+    aaiTraversal: 1
+
 # probe configuration parameters
 liveness:
   initialDelaySeconds: 10
@@ -383,19 +405,43 @@ service:
   externalPort: 8443
   internalPort: 8443
   nodePort: 33
-  # POLICY hotfix - Note this must be temporary
-  # See https://jira.onap.org/browse/POLICY-510
-  aaiServiceClusterIp:
   externalPlainPort: 80
   internalPlainPort: 8080
   nodeport: 33
+  aaiServiceClusterIp:
+  sessionAffinity: None
+
+metricsService:
+  type: ClusterIP
+  portName: prometheus
+  externalPort: 8448
+  internalPort: 8448
+
+metrics:
+  serviceMonitor:
+    enabled: false
+    targetPort: 8448
+    path: /metrics
+    basicAuth:
+      enabled: false
+
+    selector:
+      app: '{{ include "common.name" . }}-metrics'
+      chart: '{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}'
+      release: '{{ include "common.release" . }}'
+      heritage: '{{ .Release.Service }}'
+
+    relabelings: []
+
+    metricRelabelings: []
 
 ingress:
   enabled: false
   service:
-    - baseaddr: "aai.api"
+    - baseaddr: "aai-api"
       name: "aai"
       port: 8443
+      plain_port: 80
       config:
        ssl: "redirect"