From 019b59c486b07007875976862807a6acaa92be82 Mon Sep 17 00:00:00 2001 From: ChrisC Date: Fri, 3 Apr 2020 13:58:44 +0200 Subject: Portal-app auto cert gen Migrate to auto cert gen using latest templates Minor updates to align portal-sdk to latest templates Issue-ID: PORTAL-847 Depends-On: Ie3f5ae5c2a37d816afc42d2c67ebe8e40e749c79 Signed-off-by: ChrisC Change-Id: Ib457b0940d549168ebc173d9b1f953bb933088a1 --- .../resources/certs/keystoreONAPPortal.p12 | Bin 4175 -> 0 bytes .../resources/certs/truststoreONAPall.jks | Bin 117990 -> 0 bytes .../properties/ONAPPORTAL/system.properties | 13 ++-- .../charts/portal-app/resources/server/server.xml | 24 +++++--- .../charts/portal-app/templates/configmap.yaml | 15 +++++ .../charts/portal-app/templates/deployment.yaml | 54 +++++++---------- .../portal/charts/portal-app/templates/secret.yaml | 15 +---- kubernetes/portal/charts/portal-app/values.yaml | 33 +++++++++- .../charts/portal-sdk/resources/server/server.xml | 2 +- .../charts/portal-sdk/templates/configmap.yaml | 18 +++++- .../charts/portal-sdk/templates/deployment.yaml | 67 +++------------------ kubernetes/portal/charts/portal-sdk/values.yaml | 40 ++++++------ kubernetes/portal/values.yaml | 11 +--- 13 files changed, 141 insertions(+), 151 deletions(-) delete mode 100644 kubernetes/portal/charts/portal-app/resources/certs/keystoreONAPPortal.p12 delete mode 100644 kubernetes/portal/charts/portal-app/resources/certs/truststoreONAPall.jks (limited to 'kubernetes') diff --git a/kubernetes/portal/charts/portal-app/resources/certs/keystoreONAPPortal.p12 b/kubernetes/portal/charts/portal-app/resources/certs/keystoreONAPPortal.p12 deleted file mode 100644 index 9f52189096..0000000000 Binary files a/kubernetes/portal/charts/portal-app/resources/certs/keystoreONAPPortal.p12 and /dev/null differ diff --git a/kubernetes/portal/charts/portal-app/resources/certs/truststoreONAPall.jks b/kubernetes/portal/charts/portal-app/resources/certs/truststoreONAPall.jks deleted file mode 100644 index ff844b109d..0000000000 Binary files a/kubernetes/portal/charts/portal-app/resources/certs/truststoreONAPall.jks and /dev/null differ diff --git a/kubernetes/portal/charts/portal-app/resources/config/deliveries/properties/ONAPPORTAL/system.properties b/kubernetes/portal/charts/portal-app/resources/config/deliveries/properties/ONAPPORTAL/system.properties index 8d21859b29..63348f02d6 100755 --- a/kubernetes/portal/charts/portal-app/resources/config/deliveries/properties/ONAPPORTAL/system.properties +++ b/kubernetes/portal/charts/portal-app/resources/config/deliveries/properties/ONAPPORTAL/system.properties @@ -1,4 +1,5 @@ # Copyright © 2018 Amdocs, Bell Canada, AT&T +# Modifications Copyright © 2020 AT&T # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -111,14 +112,16 @@ auditlog_del_day_from = 365 #External system notification URL external_system_notification_url= https://jira.onap.org/browse/ +#cookie domain +cookie_domain = onap.org + +{{- if .Values.global.aafEnabled }} # External Access System Basic Auth Credentials & Rest endpoint(These credentials doesn't work as these are place holders for now) ext_central_access_user_name = aaf_admin@people.osaaf.org -ext_central_access_password = VTCIC7wfMI0Zy61wkqKQC0bF0EK2YmL2JLl1fQU2YC4= -ext_central_access_url = https://aaf-service:8100/authz/ +ext_central_access_password = thiswillbereplacedatruntime +ext_central_access_url = {{ .Values.aafURL }}/authz/ ext_central_access_user_domain = @people.osaaf.org # External Central Auth system access remote_centralized_system_access = true - -#cookie domain -cookie_domain = onap.org +{{- end }} diff --git a/kubernetes/portal/charts/portal-app/resources/server/server.xml b/kubernetes/portal/charts/portal-app/resources/server/server.xml index c9515c1f41..dec68376d2 100644 --- a/kubernetes/portal/charts/portal-app/resources/server/server.xml +++ b/kubernetes/portal/charts/portal-app/resources/server/server.xml @@ -14,7 +14,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. - + Modifications to this file for use in ONAP are also subject to the Apache-2.0 license. --> - + @@ -70,7 +70,10 @@ --> + {{ if .Values.global.aafEnabled }} + redirectPort="8443" + {{ end }} + /> - - - + {{ end }} - +