X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Fuui%2Fcomponents%2Fuui-server%2Fvalues.yaml;h=d1bc3379d03d03ed35cccbc6efa5cd7c3eb19975;hb=refs%2Fheads%2Fmaster;hp=c477d03c54dee00fae30b1b39bf3bbd4536f4bbb;hpb=8778cc162677eac7d2db8302f035efc37878fdec;p=oom.git

diff --git a/kubernetes/uui/components/uui-server/values.yaml b/kubernetes/uui/components/uui-server/values.yaml
index c477d03c54..d1bc3379d0 100644
--- 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,12 +48,12 @@ flavor: small
 
 # application image
 repository: nexus3.onap.org:10001
-image: onap/usecase-ui-server:5.1.1
+image: onap/usecase-ui-server:5.2.2
 pullPolicy: Always
 
 # application configuration
 
-msbaddr: msb-iag.{{include "common.namespace" .}}:443
+msbaddr: msb-iag.{{include "common.namespace" .}}:80
 mraddr: message-router.{{include "common.namespace" .}}:3904
 
 # application configuration override for postgres
@@ -143,18 +103,33 @@ readiness:
 service:
   type: NodePort
   name: uui-server
-  portName: uui-server
   internalPort: 8082
-  nodePort: 99
+  nodePortPrefixOverride: 303
+  ports:
+    - name: http
+      port: 8082
+      nodePort: '99'
+  annotations:
+    msb.onap.org/service-info: |
+      {{ if .Values.global.msbEnabled -}}[
+        {
+          "serviceName": "usecaseui-server",
+          "version": "v1",
+          "url": "/api/usecase-server/v1",
+          "path":"/iui/usecaseui",
+          "protocol": "REST",
+          "visualRange":"1",
+          "port": "{{ include "common.getPort" (dict "global" . "name" "http" "getPlain" true) }}",
+          "enable_ssl": false
+        }
+      ]{{ end }}
 
 ingress:
   enabled: false
   service:
-    - baseaddr: uui-server-api
+    - baseaddr: "uui-server-api"
       name: "uui-server"
       port: 8082
-  config:
-    ssl: "redirect"
 
   # 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
@@ -169,18 +144,18 @@ ingress:
 resources:
   small:
     limits:
-      cpu: 1.5
-      memory: 350Mi
+      cpu: "1.5"
+      memory: "2Gi"
     requests:
-      cpu: 1
-      memory: 245Mi
+      cpu: "1"
+      memory: "1Gi"
   large:
     limits:
-      cpu: 2
-      memory: 500Mi
+      cpu: "2"
+      memory: "4Gi"
     requests:
-      cpu: 1
-      memory: 500Mi
+      cpu: "1"
+      memory: "2Gi"
   unlimited: {}
 
 serviceAccount:
@@ -190,4 +165,8 @@ serviceAccount:
 
 securityContext:
   user_id: 100
-  group_id: 655533
\ No newline at end of file
+  group_id: 655533
+
+wait_for_job_container:
+  containers:
+    - '{{ include "common.name" . }}-job'