Merge "[AAI] Make aai log level configurable"

[oom.git] / kubernetes / multicloud / components / multicloud-fcaps / values.yaml

diff --git a/kubernetes/multicloud/components/multicloud-fcaps/values.yaml b/kubernetes/multicloud/components/multicloud-fcaps/values.yaml
index 39ddbae..f6adfba 100644 (file)
--- a/kubernetes/multicloud/components/multicloud-fcaps/values.yaml
+++ b/kubernetes/multicloud/components/multicloud-fcaps/values.yaml
@@ -22,20 +22,18 @@ global:
 # Application configuration defaults.
 #################################################################
 # application image
-image: onap/multicloud/openstack-fcaps:1.5.6
+image: onap/multicloud/openstack-fcaps:1.5.7
 pullPolicy: Always
 
 #Istio sidecar injection policy
-istioSidecar: false
+istioSidecar: true
 
 # application configuration
 config:
-  ssl_enabled: true
-  msbprotocol: https
   msbgateway: msb-iag
-  msbPort: 443
+  msbPort: 80
   aai:
-    port: 8443
+    aaiPort: 80
     schemaVersion: v13
     username: AAI
     password: AAI
@@ -57,15 +55,42 @@ liveness:
   enabled: true
 
 service:
-  type: ClusterIP
-  name: multicloud-fcaps
-  portName: multicloud-fcaps
-  externalPort: 9011
+  type: NodePort
   internalPort: 9011
-  nodePort: 87
+  ports:
+    - name: http
+      port: 9011
+      nodePort: '87'
+      useNodePortExt: true
+  annotations:
+    msb.onap.org/service-info: |
+      {{ if .Values.global.msbEnabled -}}[
+        {
+          "serviceName": "multicloud-fcaps",
+          "version": "v0",
+          "url": "/api/multicloud-fcaps/v0",
+          "protocol": "REST",
+          "port": "{{ .Values.service.internalPort }}",
+          "enable_ssl": false,
+          "visualRange": "1"
+        },
+        {
+          "serviceName": "multicloud-fcaps",
+          "version": "v1",
+          "url": "/api/multicloud-fcaps/v1",
+          "protocol": "REST",
+          "port": "{{ .Values.service.internalPort }}",
+          "enable_ssl": false,
+          "visualRange": "1"
+        }
+      ]{{ end }}
 
 ingress:
   enabled: false
+  service:
+    - baseaddr: 'multicloud-fcaps-api'
+      name: 'multicloud-fcaps'
+      port: 9011
 
 # Resource Limit flavor -By Default using small
 flavor: small
@@ -73,25 +98,33 @@ flavor: small
 resources:
   small:
     limits:
-      cpu: 1
-      memory: 4Gi
+      cpu: "1"
+      memory: "4Gi"
     requests:
-      cpu: 10m
-      memory: 1Gi
+      cpu: "10m"
+      memory: "1Gi"
   large:
     limits:
-      cpu: 2
-      memory: 8Gi
+      cpu: "2"
+      memory: "8Gi"
     requests:
-      cpu: 20m
-      memory: 2Gi
+      cpu: "20m"
+      memory: "2Gi"
   unlimited: {}
 
 # rabbit-mq image resource
 rabbitmq: rabbitmq:alpine
 
+# memcached image resource
+memcached: memcached:alpine3.15
+
 #Pods Service Account
 serviceAccount:
   nameOverride: multicloud-fcaps
   roles:
     - read
+
+#Log configuration
+log:
+  path: /var/log/onap
+logConfigMapNamePrefix: '{{ include "common.fullname" . }}'