[SO][UUI] Adjust resource settings

[oom.git] / kubernetes / uui / components / uui-server / values.yaml

diff --git a/kubernetes/uui/components/uui-server/values.yaml b/kubernetes/uui/components/uui-server/values.yaml
index f5f8f9d..87756d6 100644 (file)
--- a/kubernetes/uui/components/uui-server/values.yaml
+++ b/kubernetes/uui/components/uui-server/values.yaml
@@ -20,7 +20,7 @@
 # Global configuration defaults.
 #################################################################
 global:
-  uuiPortPrefix: 303
+  nodePortPrefix: 302
 
 secrets:
   - uid: pg-root-pass
@@ -37,46 +37,6 @@ secrets:
     password: '{{ .Values.postgres.config.pgUserPassword }}'
     passwordPolicy: generate
 
-
-#################################################################
-# AAF part
-#################################################################
-certInitializer:
-  nameOverride: uui-server-cert-initializer
-  aafDeployFqi: deployer@people.osaaf.org
-  aafDeployPass: demo123456!
-  # aafDeployCredsExternalSecret: some secret
-  fqdn: uui
-  fqi: uui@uui.onap.org
-  fqi_namespace: org.onap.uui
-  public_fqdn: uui.onap.org
-  cadi_longitude: "0.0"
-  cadi_latitude: "0.0"
-  app_ns: org.osaaf.aaf
-  credsPath: /opt/app/osaaf/local
-  aaf_add_config: |
-    echo "*** changing them into shell safe ones"
-    export KEYSTORE_PASSWORD=$(tr -cd '[:alnum:]' < /dev/urandom | fold -w64 | head -n1)
-    export TRUSTSORE_PASSWORD=$(tr -cd '[:alnum:]' < /dev/urandom | fold -w64 | head -n1)
-    cd {{ .Values.credsPath }}
-    keytool -storepasswd -new "${KEYSTORE_PASSWORD}" \
-      -storepass "${cadi_keystore_password_p12}" \
-      -keystore {{ .Values.fqi_namespace }}.p12
-    keytool -storepasswd -new "${TRUSTSORE_PASSWORD}" \
-      -storepass "${cadi_truststore_password}" \
-      -keystore {{ .Values.fqi_namespace }}.trust.jks
-    echo "*** set key password as same password as keystore password"
-    keytool -keypasswd -new "${KEYSTORE_PASSWORD}" \
-      -keystore {{ .Values.fqi_namespace }}.jks \
-      -keypass "${cadi_keystore_password_p12}" \
-      -storepass "${KEYSTORE_PASSWORD}" -alias {{ .Values.fqi }}
-    echo "*** save the generated passwords"
-    echo "KEYSTORE_PASSWORD=${KEYSTORE_PASSWORD}" > mycreds.prop
-    echo "TRUSTSORE_PASSWORD=${TRUSTSORE_PASSWORD}" >> mycreds.prop
-    echo "*** change ownership of certificates to targeted user"
-    chown -R 1000 {{ .Values.credsPath }}
-
-
 #################################################################
 # Application configuration defaults.
 #################################################################
@@ -88,7 +48,7 @@ flavor: small
 
 # application image
 repository: nexus3.onap.org:10001
-image: onap/usecase-ui-server:5.1.3
+image: onap/usecase-ui-server:5.2.2
 pullPolicy: Always
 
 # application configuration
@@ -144,6 +104,7 @@ service:
   type: NodePort
   name: uui-server
   internalPort: 8082
+  nodePortPrefixOverride: 303
   ports:
     - name: http
       port: 8082
@@ -158,7 +119,8 @@ service:
           "path":"/iui/usecaseui",
           "protocol": "REST",
           "visualRange":"1",
-          "port": "{{ .Values.service.port }}",
+          "port": "{{ include "common.getPort" (dict "global" . "name" "http" "getPlain" true) }}",
+          "enable_ssl": false
         }
       ]{{ end }}
 
@@ -183,17 +145,17 @@ resources:
   small:
     limits:
       cpu: 1.5
-      memory: 350Mi
+      memory: 2Gi
     requests:
       cpu: 1
-      memory: 245Mi
+      memory: 1Gi
   large:
     limits:
       cpu: 2
-      memory: 500Mi
+      memory: 4Gi
     requests:
       cpu: 1
-      memory: 500Mi
+      memory: 2Gi
   unlimited: {}
 
 serviceAccount: