summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFiachra Corcoran <fiachra.corcoran@est.tech>2022-12-01 08:16:27 +0000
committerGerrit Code Review <gerrit@onap.org>2022-12-01 08:16:27 +0000
commit8c26e59d30a185186cf33988a0dbb859409f73eb (patch)
treede65e2e2345192f1e9b6871f08644eae4d42974f
parent760f7d111e5ad6973a708a270f81bfff49ba0808 (diff)
parentb6229deb55cbd45682e7a9475728d379fc956b12 (diff)
Merge "[UUI] Service Mesh Compliance for UUI"
-rw-r--r--kubernetes/uui/components/uui-server/values.yaml2
-rw-r--r--kubernetes/uui/resources/config/server.xml4
-rw-r--r--kubernetes/uui/values.yaml3
3 files changed, 5 insertions, 4 deletions
diff --git a/kubernetes/uui/components/uui-server/values.yaml b/kubernetes/uui/components/uui-server/values.yaml
index 3ded200378..44f4399d10 100644
--- a/kubernetes/uui/components/uui-server/values.yaml
+++ b/kubernetes/uui/components/uui-server/values.yaml
@@ -143,7 +143,7 @@ readiness:
service:
type: NodePort
name: uui-server
- portName: uui-server
+ portName: http
internalPort: 8082
nodePort: 99
diff --git a/kubernetes/uui/resources/config/server.xml b/kubernetes/uui/resources/config/server.xml
index 2260bb8cf5..275fcd8b14 100644
--- a/kubernetes/uui/resources/config/server.xml
+++ b/kubernetes/uui/resources/config/server.xml
@@ -61,10 +61,10 @@
APR (HTTP/AJP) Connector: /docs/apr.html
Define a non-SSL/TLS HTTP/1.1 Connector on port 8080
-->
- <!--Connector port="8080" protocol="HTTP/1.1"
+ <Connector port="8080" protocol="HTTP/1.1"
connectionTimeout="20000"
redirectPort="8443" />
- -->
+
<Connector port="8443" protocol="org.apache.coyote.http11.Http11NioProtocol" maxThreads="150" SSLEnabled="true" scheme="https" secure="true" clientAuth="false" sslProtocol="TLS" keystoreFile="{{ .Values.certInitializer.credsPath }}/{{ .Values.certInitializer.fqi_namespace }}.p12" keystorePass="${KEYSTORE_PASSWORD}" />
<!-- A "Connector" using the shared thread pool-->
diff --git a/kubernetes/uui/values.yaml b/kubernetes/uui/values.yaml
index 48fb5b6b44..55dc6a16ce 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.
@@ -90,7 +91,7 @@ readiness:
service:
type: NodePort
name: uui
- portName: uui
+ portName: http
internalPort: 8443
nodePort: 98