X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Fportal%2Fcharts%2Fportal-mariadb%2Fvalues.yaml;h=c9acba5d9fe5d1e9b134b09c0e26c557937cf0dc;hb=0146d732319280a75a39daed993d128ef388e487;hp=ae5849eb278b4be5cc83dde9d4c37af2ceedd2cb;hpb=cb5af8db8664de8b87359a1a37f67faeab0f96bd;p=oom.git

diff --git a/kubernetes/portal/charts/portal-mariadb/values.yaml b/kubernetes/portal/charts/portal-mariadb/values.yaml
index ae5849eb27..c9acba5d9f 100644
--- a/kubernetes/portal/charts/portal-mariadb/values.yaml
+++ b/kubernetes/portal/charts/portal-mariadb/values.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2018 AT&T
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -23,11 +24,11 @@ global: # global defaults
 
 # application image
 repository: nexus3.onap.org:10001
-image: onap/portal-db:v2.2.0
+image: onap/portal-db:2.3.0
 pullPolicy: Always
 
 readinessImage: readiness-check:2.0.0
-mariadbInitImage: "mariadb-client-init:2.0.0"
+mariadbInitImage: "mariadb-client-init:3.0.0"
 
 # application configuration
 config:
@@ -43,12 +44,12 @@ config:
   papPort: "30219"
   # application's front end hostname.  Must be resolvable on the client side environment
   papHostName: "policy.api.simpledemo.onap.org"
-  # vid ui  assignment for port 8080
+  # vid ui  assignment for port 8443
   vidPort: "30200"
   # application's front end hostname.  Must be resolvable on the client side environment
   vidHostName: "vid.api.simpledemo.onap.org"
   # aai sparky ui assignment for port 8080
-  aaiSparkyPort: "" # TODO: populate with
+  aaiSparkyPort: "30220"
   # application's front end hostname.  Must be resolvable on the client side environment
   aaiSparkyHostName: "aai.api.sparky.simpledemo.onap.org"
   # cli ui  assignment for port 8080
@@ -56,17 +57,17 @@ config:
   # application's front end hostname.  Must be resolvable on the client side environment
   cliHostName: "cli.api.simpledemo.onap.org"
   # portal sdk (demo app) ui assignment for port 8990
-  portalSdkPort: "" # TODO: populate with port
+  portalSdkPort: "30212"
   # application's front end hostname.  Must be resolvable on the client side environment
   portalSdkHostName: "portal-sdk.simpledemo.onap.org"
   # dmaap bus controller ui assignment for port ?
   dmaapBcPort: "" # TODO: populate with
   # application's front end hostname.  Must be resolvable on the client side environment
   dmaapBcHostName: "dmaap-bc.simpledemo.onap.org"
-  # msb discovery ui assignment for port ?
-  msbDiscoveryPort: "30281"
+  # msb IAG ui assignment for port 80
+  msbPort: "30280"
   # application's front end hostname.  Must be resolvable on the client side environment
-  msbDiscoveryHostName: "msb.api.discovery.simpledemo.onap.org"
+  msbHostName: "msb.api.simpledemo.onap.org"
 
 # default number of instances
 replicaCount: 1
@@ -77,14 +78,14 @@ affinity: {}
 
 # probe configuration parameters
 liveness:
-  initialDelaySeconds: 300
+  initialDelaySeconds: 450
   periodSeconds: 10
   # necessary to disable liveness probe when setting breakpoints
   # in debugger so K8s doesn't restart unresponsive container
   enabled: true
 
 readiness:
-  initialDelaySeconds: 300
+  initialDelaySeconds: 450
   periodSeconds: 10
 
 ## Persist data to a persitent volume
@@ -120,21 +121,22 @@ 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
+# Resource Limit flavor -By Default using small
+flavor: small
+# Segregation for Different environment (Small and Large)
+resources:
+  small:
+    limits:
+      cpu: 800m
+      memory: 1Gi
+    requests:
+      cpu: 400m
+      memory: 500Mi
+  large:
+    limits:
+      cpu: 2
+      memory: 2Gi
+    requests:
+      cpu: 800m
+      memory: 1Gi
+  unlimited: {}