Merge "[AAI] Make aai log level configurable"

[oom.git] / kubernetes / policy / components / policy-gui / values.yaml

diff --git a/kubernetes/policy/components/policy-gui/values.yaml b/kubernetes/policy/components/policy-gui/values.yaml
index 330d1fc..6d9b712 100644 (file)
--- a/kubernetes/policy/components/policy-gui/values.yaml
+++ b/kubernetes/policy/components/policy-gui/values.yaml
@@ -22,52 +22,6 @@
 global: # global defaults
   nodePortPrefix: 304
   centralizedLoggingEnabled: true
-  #AAF service
-  aafEnabled: true
-
-#################################################################
-# Secrets metaconfig
-#################################################################
-secrets:
-  - uid: keystore-password
-    type: password
-    externalSecret: '{{ tpl (default "" .Values.certStores.keyStorePasswordExternalSecret) . }}'
-    password: '{{ .Values.certStores.keyStorePassword }}'
-    passwordPolicy: required
-  - uid: truststore-password
-    type: password
-    externalSecret: '{{ tpl (default "" .Values.certStores.trustStorePasswordExternalSecret) . }}'
-    password: '{{ .Values.certStores.trustStorePassword }}'
-    passwordPolicy: required
-
-certStores:
-  keyStorePassword: Pol1cy_0nap
-  keystoreLocation: /opt/app/policy/gui/etc/ssl/policy-keystore
-  truststoreLocation: /opt/app/policy/gui/etc/ssl/policy-truststore
-  trustStorePassword: Pol1cy_0nap
-
-#################################################################
-# AAF part
-#################################################################
-certInitializer:
-  nameOverride: policy-gui-cert-initializer
-  aafDeployFqi: deployer@people.osaaf.org
-  aafDeployPass: demo123456!
-  fqdn: policy
-  fqi: policy@policy.onap.org
-  public_fqdn: policy.onap.org
-  cadi_latitude: "0.0"
-  cadi_longitude: "0.0"
-  credsPath: /opt/app/osaaf/local
-  app_ns: org.osaaf.aaf
-  uid: 100
-  gid: 101
-  aaf_add_config: >
-    echo "export KEYSTORE='{{ .Values.credsPath }}/org.onap.policy.p12'" > {{ .Values.credsPath }}/.ci;
-    echo "export TRUSTSTORE='{{ .Values.credsPath }}/org.onap.policy.trust.jks'" >> {{ .Values.credsPath }}/.ci;
-    echo "export KEYSTORE_PASSWD='${cadi_keystore_password_p12}'" >> {{ .Values.credsPath }}/.ci;
-    echo "export TRUSTSTORE_PASSWD='${cadi_truststore_password}'" >> {{ .Values.credsPath }}/.ci;
-    chown -R {{ .Values.uid }}:{{ .Values.gid }} $(dirname {{ .Values.credsPath }});
 
 subChartsOnly:
   enabled: true
@@ -75,7 +29,7 @@ subChartsOnly:
 flavor: small
 
 # application image
-image: onap/policy-gui:2.3.1
+image: onap/policy-gui:3.1.2
 pullPolicy: Always
 
 # flag to enable debugging - application support required
@@ -118,9 +72,11 @@ readiness:
 service:
   type: NodePort
   name: policy-gui
-  portName: http
   internalPort: 2443
-  nodePort: 43
+  ports:
+    - name: http
+      port: 2443
+      nodePort: 43
 
   # see https://wiki.onap.org/display/DW/OOM+NodePort+List
 
@@ -128,12 +84,18 @@ ingress:
   enabled: false
   service:
     - baseaddr: "policy-ui"
-      name: "policygui"
+      name: "policy-gui"
       port: 2443
   config:
     ssl: "redirect"
 
-#resources: {}
+serviceMesh:
+  authorizationPolicy:
+    authorizedPrincipals:
+      - serviceAccount: istio-ingress
+        namespace: istio-ingress
+
+  #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
@@ -147,18 +109,18 @@ ingress:
 resources:
   small:
     limits:
-      cpu: 1
-      memory: 200Mi
+      cpu: "1"
+      memory: "700Mi"
     requests:
-      cpu: 1m
-      memory: 50Mi
+      cpu: "0.5"
+      memory: "700Mi"
   large:
     limits:
-      cpu: 1
-      memory: 500Mi
+      cpu: "2"
+      memory: "1.4Gi"
     requests:
-      cpu: 10m
-      memory: 50Mi
+      cpu: "1"
+      memory: "1.4Gi"
   unlimited: {}
 
 #Pods Service Account