Merge "[AAI] Make aai log level configurable"

[oom.git] / kubernetes / msb / components / msb-iag / values.yaml

diff --git a/kubernetes/msb/components/msb-iag/values.yaml b/kubernetes/msb/components/msb-iag/values.yaml
index 9b9f805..19b500a 100644 (file)
--- a/kubernetes/msb/components/msb-iag/values.yaml
+++ b/kubernetes/msb/components/msb-iag/values.yaml
@@ -18,41 +18,11 @@
 global:
   nodePortPrefix: 302
 
-#################################################################
-# AAF part
-#################################################################
-certInitializer:
-  nameOverride: msb-iag-cert-initializer
-  aafDeployFqi: deployer@people.osaaf.org
-  aafDeployPass: demo123456!
-  # aafDeployCredsExternalSecret: some secret
-  fqdn: msb-iag
-  fqi: msb-iag@msb-iag.onap.org
-  fqi_namespace: org.onap.msb-iag
-  public_fqdn: msb-iag.onap.org
-  cadi_longitude: "0.0"
-  cadi_latitude: "0.0"
-  app_ns: org.osaaf.aaf
-  credsPath: /opt/app/osaaf/local
-  aaf_add_config: |
-    mkdir -p {{ .Values.credsPath }}/certs
-    echo "*** retrieve certificate from pkcs12"
-    openssl pkcs12 -in {{ .Values.credsPath }}/{{ .Values.fqi_namespace }}.p12 \
-      -out {{ .Values.credsPath }}/certs/cert.crt -nokeys \
-      -passin pass:$cadi_keystore_password_p12 \
-      -passout pass:$cadi_keystore_password_p12
-    echo "*** copy key to relevant place"
-    cp {{ .Values.credsPath }}/{{ .Values.fqi_namespace }}.key {{ .Values.credsPath }}/certs/cert.key
-    echo "*** change ownership and read/write attributes"
-    chown -R 1000 {{ .Values.credsPath }}/certs
-    chmod 600 {{ .Values.credsPath }}/certs/cert.crt
-    chmod 600 {{ .Values.credsPath }}/certs/cert.key
-
 #################################################################
 # Application configuration defaults.
 #################################################################
 # application image
-image: onap/msb/msb_apigateway:1.3.1
+image: onap/msb/msb_apigateway:1.6.0
 pullPolicy: Always
 istioSidecar: true
 
@@ -82,19 +52,21 @@ readiness:
 service:
   type: NodePort
   name: msb-iag
-  externalPort: 80
+  # for liveness and readiness probe only
+  # internalPort:
   internalPort: 80
-  nodePort: 80
-  externalPortHttps: 443
-  internalPortHttps: 443
-  nodePortHttps: 83
+  ports:
+    - name: msb-iag
+      port: 80
+      port_protocol: http
+      nodePort: '83'
 
 ingress:
   enabled: false
   service:
-    - baseaddr: "msbiag"
+    - baseaddr: "msb-iag-ui"
       name: "msb-iag"
-      port: 443
+      port: 80
   config:
     ssl: "redirect"
 
@@ -104,16 +76,27 @@ flavor: small
 resources:
   small:
     limits:
-      cpu: 100m
-      memory: 400Mi
+      cpu: "1"
+      memory: "500Mi"
     requests:
-      cpu: 50m
-      memory: 200Mi
+      cpu: "0.5"
+      memory: "500Mi"
   large:
     limits:
-      cpu: 200m
-      memory: 800Mi
+      cpu: "2"
+      memory: "1Gi"
     requests:
-      cpu: 100m
-      memory: 400Mi
+      cpu: "1"
+      memory: "1Gi"
   unlimited: {}
+
+#Pods Service Account
+serviceAccount:
+  nameOverride: msb-iag
+  roles:
+    - read
+
+#Logs configuration
+log:
+  path: /var/log/onap
+logConfigMapNamePrefix: '{{ include "common.fullname" . }}'