Merge "[CPS] New Delhi release changes"

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

diff --git a/kubernetes/multicloud/values.yaml b/kubernetes/multicloud/values.yaml
index 93d299e..033826f 100644 (file)
--- a/kubernetes/multicloud/values.yaml
+++ b/kubernetes/multicloud/values.yaml
@@ -18,16 +18,17 @@
 #################################################################
 global:
   nodePortPrefix: 302
-  artifactImage: onap/multicloud/framework-artifactbroker:1.7.0
+  artifactImage: onap/multicloud/framework-artifactbroker:1.9.0
   prometheus:
     enabled: false
   persistence: {}
+  centralizedLoggingEnabled: true
 
 #################################################################
 # Application configuration defaults.
 #################################################################
 # application image
-image: onap/multicloud/framework:1.7.0
+image: onap/multicloud/framework:1.8.1
 pullPolicy: Always
 
 #Istio sidecar injection policy
@@ -35,29 +36,32 @@ istioSidecar: true
 
 multicloud-fcaps:
   enabled: true
+  logConfigMapNamePrefix: '{{ include "common.release" . }}-multicloud'
 multicloud-k8s:
   enabled: true
 multicloud-pike:
   enabled: true
+  logConfigMapNamePrefix: '{{ include "common.release" . }}-multicloud'
 multicloud-prometheus:
   enabled: false
 multicloud-starlingx:
   enabled: false
+  logConfigMapNamePrefix: '{{ include "common.release" . }}-multicloud'
 multicloud-vio:
   enabled: false
+  logConfigMapNamePrefix: '{{ include "common.release" . }}-multicloud'
 multicloud-windriver:
   enabled: false
+  logConfigMapNamePrefix: '{{ include "common.release" . }}-multicloud'
 
 # application configuration
 config:
-  ssl_enabled: true
-  msbprotocol: https
   msbgateway: msb-iag
-  msbPort: 443
   logstashServiceName: log-ls
   logstashPort: 5044
+  msbPort: 80
   aai:
-    port: 8443
+    aaiPort: 80
     schemaVersion: v13
     username: AAI
     password: AAI
@@ -79,15 +83,41 @@ liveness:
   enabled: true
 
 service:
-  type: ClusterIP
-  name: multicloud
-  portName: multicloud-framework
-  externalPort: 9001
+  type: NodePort
   internalPort: 9001
-  nodePort: 91
+  ports:
+    - name: http
+      port: 9001
+      nodePort: '91'
+  annotations:
+    msb.onap.org/service-info: |
+      {{ if .Values.global.msbEnabled -}}[
+        {
+          "serviceName": "multicloud",
+          "version": "v0",
+          "url": "/api/multicloud/v0",
+          "protocol": "REST",
+          "port": "{{ .Values.service.internalPort }}",
+          "enable_ssl": false,
+          "visualRange": "1"
+        },
+        {
+          "serviceName": "multicloud",
+          "version": "v1",
+          "url": "/api/multicloud/v1",
+          "protocol": "REST",
+          "port": "{{ .Values.service.internalPort }}",
+          "enable_ssl": false,
+          "visualRange": "1"
+        }
+      ]{{ end }}
 
 ingress:
   enabled: false
+  service:
+    - baseaddr: 'multicloud-api'
+      name: 'multicloud'
+      port: 9001
 
 # Resource Limit flavor -By Default using small
 flavor: small
@@ -95,16 +125,26 @@ 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: {}
+
+#Pods Service Account
+serviceAccount:
+  nameOverride: multicloud
+  roles:
+    - read
+
+#Log configuration
+log:
+  path: /var/log/onap