commit c20e4dcc49a37d645e66d211e12891280f9aa4cc
author Andreas Geissler <andreas-geissler@telekom.de> Mon Mar 20 17:56:12 2023 +0100
committer Andreas Geissler <andreas-geissler@telekom.de> Mon Mar 20 17:57:38 2023 +0100
tree 104459a998bed5c2fc2fb38aaffc6aecc31d0a2f
parent 0879dfcaad420fcc7a6adc77b2b9c72b9522e3cb

[UUI] Cleanup Helmcharts from TLS/AAF

Cleanup charts and remove AAF options

Issue-ID: OOM-3123

Signed-off-by: Andreas Geissler <andreas-geissler@telekom.de>
Change-Id: I0c67789bcae2187fef424edfca7eabb3e8625b30

kubernetes/uui/resources/config/server.xml

diff --git a/kubernetes/uui/resources/config/server.xml b/kubernetes/uui/resources/config/server.xml
index 9bb10fe..f464074 100644
--- a/kubernetes/uui/resources/config/server.xml
+++ b/kubernetes/uui/resources/config/server.xml
@@ -24,7 +24,7 @@
   <Listener className="org.apache.catalina.security.SecurityListener" />
   -->
   <!--APR library loader. Documentation at /docs/apr.html -->
-  <Listener className="org.apache.catalina.core.AprLifecycleListener" SSLEngine="{{ (eq "true" (include "common.needTLS" .)) | ternary "on" "off" }}" />
+  <Listener className="org.apache.catalina.core.AprLifecycleListener" SSLEngine="off" />
   <!-- Prevent memory leaks due to use of particular java/javax APIs-->
   <Listener className="org.apache.catalina.core.JreMemoryLeakPreventionListener" />
   <Listener className="org.apache.catalina.mbeans.GlobalResourcesLifecycleListener" />
@@ -61,15 +61,7 @@
          APR (HTTP/AJP) Connector: /docs/apr.html
          Define a non-SSL/TLS HTTP/1.1 Connector on port 8080
     -->
-    {{ if (include "common.needTLS" .) }}
-    <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}" />
-    {{ else }}
     <Connector port="8080" protocol="HTTP/1.1" connectionTimeout="20000" />
-    {{ end }}
 
     <!-- A "Connector" using the shared thread pool-->
     <!--
@@ -115,12 +107,7 @@
     -->
 
     <!-- Define an AJP 1.3 Connector on port 8009 -->
-    {{ if (include "common.needTLS" .) }}
-    <Connector port="8009" protocol="AJP/1.3" redirectPort="8443" />
-    {{ else }}
     <Connector port="8009" protocol="AJP/1.3" secretRequired="false" />
-    {{ end }}
-
 
     <!-- An Engine represents the entry point (within Catalina) that processes
          every request.  The Engine implementation for Tomcat stand alone