X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Fuui%2Fvalues.yaml;h=67f135ced49a12c399e6312e0b5e4e1ca39b4c06;hb=22f3b16043de9d28461a523202018ef82fcb892d;hp=61a0b5097a085ed62c2ead6b023f012db60e6dd0;hpb=09d87009abf5367759aeb1e08de5b9205a1f3444;p=oom.git

diff --git a/kubernetes/uui/values.yaml b/kubernetes/uui/values.yaml
index 61a0b5097a..67f135ced4 100644
--- a/kubernetes/uui/values.yaml
+++ b/kubernetes/uui/values.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2017 Amdocs, Bell Canada
+# Copyright (c) 2022 Nordix Foundation.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -18,13 +19,46 @@
 global:
   uuiPortPrefix: 303
 
+#################################################################
+# AAF part
+#################################################################
+certInitializer:
+  nameOverride: uui-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 "*** 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 }}
+
 subChartsOnly:
   enabled: true
 
 flavor: small
 
 # application image
-image: onap/usecase-ui:4.0.2
+image: onap/usecase-ui:5.1.2
 pullPolicy: Always
 
 # application configuration
@@ -57,16 +91,38 @@ readiness:
 service:
   type: NodePort
   name: uui
-  portName: uui
-  internalPort: 8443
-  nodePort: 98
+  internalPort: 8080
+  ports:
+    - name: http
+      port: 8443
+      plain_port: 8080
+      nodePort: '98'
+  annotations:
+    msb.onap.org/service-info: |
+      {{ if .Values.global.msbEnabled -}}[
+        {
+          "serviceName": "usecaseui-ui",
+          "version": "v1",
+          "url": "/usecase-ui",
+          "path":"/iui/usecaseui",
+          "protocol": "UI",
+          "visualRange":"1",
+          {{ if (include "common.needTLS" .) }}
+          "port": "{{ include "common.getPort" (dict "global" . "name" "http") }}",
+          "enable_ssl": true
+          {{ else }}
+          "port": "{{ include "common.getPort" (dict "global" . "name" "http" "getPlain" true) }}"
+          {{ end }}
+        }
+      ]{{ end }}
 
 ingress:
   enabled: false
   service:
-    - baseaddr: "uui.api"
+    - baseaddr: "uui-ui"
       name: "uui"
       port: 8443
+      plain_port: 8080
   config:
     ssl: "redirect"