[UUI] Update image version 16.0.1 of components of UUI

[oom.git] / kubernetes / uui / values.yaml

diff --git a/kubernetes/uui/values.yaml b/kubernetes/uui/values.yaml
index 1ed9b47..a931c1e 100644 (file)
--- a/kubernetes/uui/values.yaml
+++ b/kubernetes/uui/values.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2017 Amdocs, Bell Canada
 # 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.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.


@@ -16,40 +17,10 @@
 # This is a YAML-formatted file.
 # Declare variables to be passed into your templates.
 global:
 # This is a YAML-formatted file.
 # Declare variables to be passed into your templates.
 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 }}
+  tracing:
+    enabled: false
+    collectorHost: jaeger-collector.istio-system
+    collectorPort: 9411

 
 subChartsOnly:
   enabled: true
 
 subChartsOnly:
   enabled: true


@@ -57,7 +28,7 @@ subChartsOnly:
 flavor: small
 
 # application image
 flavor: small
 
 # application image

-image: onap/usecase-ui:4.0.6
+image: onap/usecase-ui:16.0.1

 pullPolicy: Always
 
 # application configuration
 pullPolicy: Always
 
 # application configuration


@@ -88,18 +59,18 @@ readiness:
   periodSeconds: 10
 
 service:
   periodSeconds: 10
 
 service:

-  type: NodePort
+  type: ClusterIP

   name: uui
   name: uui

-  portName: uui
-  internalPort: 8443
-  nodePort: 98
+  ports:
+    - name: http
+      port: 8080

 
 ingress:
 
 ingress:

-  enabled: false
+  enabled: true

   service:
   service:

-    - baseaddr: "uui.api"
-      name: "uui"
-      port: 8443
+    - baseaddr: uui
+      name: uui-proxy
+      port: 80

   config:
     ssl: "redirect"
 
   config:
     ssl: "redirect"
 


@@ -116,16 +87,63 @@ ingress:
 resources:
   small:
     limits:
 resources:
   small:
     limits:

-      cpu: 250m
-      memory: 1Gi
+      cpu: "250m"
+      memory: "1Gi"

     requests:
     requests:

-      cpu: 250m
-      memory: 1Gi
+      cpu: "250m"
+      memory: "1Gi"

   large:
     limits:
   large:
     limits:

-      cpu: 500m
-      memory: 1Gi
+      cpu: "500m"
+      memory: "1Gi"

     requests:
     requests:

-      cpu: 500m
-      memory: 1Gi
+      cpu: "500m"
+      memory: "1Gi"

   unlimited: {}
   unlimited: {}

+
+nginx:
+  fullnameOverride: uui-proxy
+  serverBlock: |-
+    server {
+      listen 8080;
+      listen [::]:8080;
+
+      # Redirect root path to /usecase-ui
+      location = / {
+          return 301 /usecase-ui;
+      }
+
+      # frontend
+      location /usecase-ui {
+          proxy_pass http://uui:8080;
+          proxy_set_header Host $host;
+          proxy_set_header X-Real-IP $remote_addr;
+          proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+          proxy_set_header X-Forwarded-Proto $scheme;
+      }
+
+      # uui-server
+      location /api/usecaseui-server {
+          proxy_pass http://uui-server:8082;
+          proxy_set_header Host $host;
+          proxy_set_header X-Real-IP $remote_addr;
+          proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+          proxy_set_header X-Forwarded-Proto $scheme;
+      }
+      # intent-service
+      location /api/usecaseui-intent-analysis {
+          proxy_pass http://uui-intent-analysis:8083;
+          proxy_set_header Host $host;
+          proxy_set_header X-Real-IP $remote_addr;
+          proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+          proxy_set_header X-Forwarded-Proto $scheme;
+      }
+      # llm-service
+      location /api/usecaseui-llm-adaptation {
+          proxy_pass http://uui-nlp:33011;
+          proxy_set_header Host $host;
+          proxy_set_header X-Real-IP $remote_addr;
+          proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+          proxy_set_header X-Forwarded-Proto $scheme;
+      }
+    }