Merge "[AAI] Make aai log level configurable"

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

diff --git a/kubernetes/multicloud/components/multicloud-k8s/values.yaml b/kubernetes/multicloud/components/multicloud-k8s/values.yaml
index 3e97c67..5c9c0ad 100644 (file)
--- a/kubernetes/multicloud/components/multicloud-k8s/values.yaml
+++ b/kubernetes/multicloud/components/multicloud-k8s/values.yaml
@@ -19,6 +19,15 @@ global:
   nodePortPrefixExt: 304
   persistence: {}
   artifactImage: onap/multicloud/framework-artifactbroker:1.9.0
+  # Docker Repository used by RepositoryGenerator
+  dockerHubRepository: docker.io
+  # Additions for MongoDB****************************
+  # If dockerHubRepository is changes the following entry needs
+  # to be changed as well
+  imageRegistry: docker.io
+  imagePullSecrets:
+    - '{{ include "common.names.namespace" . }}-docker-registry-key'
+  # *************************************************
 
 #################################################################
 # Application configuration defaults.
@@ -69,6 +78,7 @@ service:
     - name: http
       port: 9015
       nodePort: '98'
+      useNodePortExt: true
   annotations:
     msb.onap.org/service-info: |
       {{ if .Values.global.msbEnabled -}}[
@@ -91,34 +101,20 @@ ingress:
       port: 9015
 
 #Mongo chart overrides for k8splugin
-mongo:
+mongodb:
   nameOverride: multicloud-k8s-mongo
   service:
-    name: multicloud-k8s-mongo
-    internalPort: 27017
-  nfsprovisionerPrefix: multicloud-k8s
-  sdnctlPrefix: multicloud-k8s
-  persistence:
-    mountSubPath: multicloud-k8s/mongo/data
-    enabled: true
-  disableNfsProvisioner: true
-  flavor: &storage_flavor large
-  resources: &storage_resources
-    small:
-      limits:
-        cpu: 100m
-        memory: 300Mi
-      requests:
-        cpu: 10m
-        memory: 75Mi
-    large:
-      limits:
-        cpu: 200m
-        memory: 1Gi
-      requests:
-        cpu: 50m
-        memory: 300Mi
-    unlimited: {}
+    nameOverride: multicloud-k8s-mongo
+    port: 27017
+  auth:
+    enabled: false
+  resources:
+    limits:
+      cpu: "2"
+      memory: "2Gi"
+    requests:
+      cpu: "500m"
+      memory: "2Gi"
 
 #etcd chart overrides for k8splugin
 etcd:
@@ -130,8 +126,24 @@ etcd:
   persistence:
     mountSubPath: multicloud-k8s/etcd/data
     enabled: true
-  flavor: *storage_flavor
-  resources: *storage_resources
+  flavor: large
+  resources:
+    small:
+      limits:
+        cpu: "100m"
+        memory: "300Mi"
+      requests:
+        cpu: "10m"
+        memory: "70Mi"
+    large:
+      limits:
+        cpu: "200m"
+        memory: "1Gi"
+      requests:
+        cpu: "50m"
+        memory: "300Mi"
+    unlimited: {}
+
 
 # No persistence right now as we rely on Mongo to handle that
 persistence:
@@ -150,18 +162,18 @@ flavor: large
 resources:
   small:
     limits:
-      cpu: 200m
-      memory: 500Mi
+      cpu: "200m"
+      memory: "500Mi"
     requests:
-      cpu: 10m
-      memory: 10Mi
+      cpu: "10m"
+      memory: "10Mi"
   large:
     limits:
-      cpu: 400m
-      memory: 1Gi
+      cpu: "400m"
+      memory: "1Gi"
     requests:
-      cpu: 10m
-      memory: 100Mi
+      cpu: "10m"
+      memory: "100Mi"
   unlimited: {}
 
 #Pods Service Account