From 94cd5f225d338f748d3134535e4160bd60c5b868 Mon Sep 17 00:00:00 2001 From: st782s Date: Tue, 9 Oct 2018 17:19:21 -0400 Subject: [PATCH] Updates to OOM Portal Issue-ID: PORTAL-429 Failed to access Policy GUI from Portal Change-Id: I01422d16507ce8d5369e50623c559a54a8dc7328 Signed-off-by: st782s --- .../resources/certs/keystoreONAP.keystore | Bin 2228 -> 0 bytes .../resources/certs/keystoreONAPPortal.jks | Bin 0 -> 3629 bytes .../charts/portal-app/resources/server/server.xml | 2 +- .../charts/portal-app/templates/configmap.yaml | 1 - .../charts/portal-app/templates/deployment.yaml | 11 ++- .../portal/charts/portal-app/templates/secret.yaml | 27 +++++++ .../resources/config/mariadb/oom_updates.sql | 82 ++++++++++----------- kubernetes/portal/values.yaml | 5 +- 8 files changed, 79 insertions(+), 49 deletions(-) delete mode 100644 kubernetes/portal/charts/portal-app/resources/certs/keystoreONAP.keystore create mode 100644 kubernetes/portal/charts/portal-app/resources/certs/keystoreONAPPortal.jks create mode 100644 kubernetes/portal/charts/portal-app/templates/secret.yaml diff --git a/kubernetes/portal/charts/portal-app/resources/certs/keystoreONAP.keystore b/kubernetes/portal/charts/portal-app/resources/certs/keystoreONAP.keystore deleted file mode 100644 index ff0f0d76a4c596872be1c40b01642ab746e8d971..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2228 zcmchYS5(v48pZP`2`D852@s?OAw;Q(Vj$8)Q5cGVz!;HUM0&3Z3;|-HNS7jAB29Xe zfFK>|N&pocdKVZ0X%dE+>%Di@y6^X4Km7JO=d82#IctCPuk^1V5QyPez~6$nx>&j$ zgY72oI1U7Yg0LjW4=jw4S%MLO0OAZB000F+NRY+Nd$ath&?pq+YC%}#E1pI}u9K)h z$DC@1jZ6K&gTvM;jZat8-Q4r7`oKql%O>hy>lC+-^jq}nZ{&55K{!p<2(;?wOLo~N zvBMXG%Tw8L`_a4vTl!FIu10c#@Q+=JrL$74upS%nfuGZGHgm+Ic#%N;jk8JRsgL1W z`6=}9(D73H-`pEU>XNvyA}aV&(v!=kND$)jgY^cgaMEqkU2X)Xe8)^SuZiHk3?0+x z3kl8H7$+m@T^1e`f+Y|-hTsyFu{sl7zS!@tpSxJz#c?+kN z&9{7@QC}ew-H{UPhQqi0w+4TeKZUeSAK5&ssw}i%)yTn_779U(D-3l3TD>Pn=3L~G zU*vfk8C_Y=vHf(2roA$^7T}A_SQ9aw;=W5s_xlx`?z5bRnP`fKE_s|o>4<9FC;F~O zTArThnO!5tt9e*P+#Q4)~3-dq{ciRUh@>YyxLiZp%(+_rQX~ggZAcIQn z&MQ63qu0$ooQ{^E<+Z+5#IV_`rS*$CW9;{vigThNKD&qk@>l~i)JRdXvV?&Yj2b{A$qOz>t z$d@HL&HmxmE=xz%Yi?0qj9q>>$IuX~H<36dR1&|cr6nQwd;z6iX9qP<+KBf-ypU{} z=^MSeI?*4r#WUx$_%ymtN1)8tWi-aMr}sdGlyUm{vqJCZ(8%aVMf5TG0kE@wd8Pnc zz-!irA&(qwDlG)<2e@ZO?#vXxE}JJg76yd|Xn(Ze0{5XyNw?Q3YWg2tb4ZMj7nAw@ zwuJvZ`}zwnzb#YpmKx zSAVNiH${?X+s$bd7x9p>cjn21Wz$dA&utECk0#HH87jCMt{k91a-UJko9iS>#%w@d z@>ss<8k%#%X@5+2Gef^37F<{HZreqwpm+zp!1^WkuGuWQ)Y^U6rY3|{#NP(0Lin%` zYOss)woA7L2{PUC{;f`zw>XL%cB0<#%SOx6ostF~j!Y4>nN|k;3bAlA?STF+(qs*& z6y;5!aP)KqD!&MLEK>**p7zR@?j_SZh+AUXY+W@cz)%fdwT}Dn_Kff}zLQon!ywqp zY6HAF!*ymye5mSu+w1}oi6e^%wHll+*CP*Kl*06%M!=PaJrt}4XF_E?g0-6JoAQcWZxsj*1iIQ~hcl9)VWg#v-haJan_3?y019a1g z?|_tayfgwV-Q!L*3w?SC9osfCZ@>B`7uM!E;r>O?P_x>ZrG$20mAHFO+$TXhPPDzs z#YL3gIU%|?RP}H_k>w};JQMt%^;kh3Hk>?`fFt1KFW_*p#(yF1{IULp|F?UP zfHVJ$;CMcONdWut-~gBzNB{t;+93^2+D=+)@squbi)_|-kmlkYF}1^2oo1$~@J6-9 z-4f~wB>WWS@%Cq@qQg{Uy7 z5)NOHq7-y+{_<rzh*YhnNcARt#5D})s|eqR9?gd2kR0_Ygg7Y3e5ng)+OJb#9UHjZle zXNbrD=r}|GR9PaMsE<5*`c`m{bO`Ux8wnfWNb7yvz+Ho0n38BPQsv8f1PyE6yXkZ^ zCk66cInp&6*WaxwQ7F%sN-z?^Qn_VOxe$;kv!(FLBzK=i-a8(90zS~{jlvCXXexNo zpxZwHxp7E-*;&Qb*`Mh3Qn{^;-t9~LrG;&qNW46+nlujMmx(le^2! zFQ$3jMDrU?$tnmfu`>o~WyFl4VpIE%E2&wcL4NU$cTYre(k?wJUy{1f#uvk+t}iib zFmcl)Ir)|;v?%M^TlPl&W^c;7J(I`x60mbCX0^`Ox8r87oo(EZpHV3%jUTBNUwrz+ dllFc`#LFO@`E~q!t)F+X#~Ip{IG&wXe*zNy%M$ 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 y@b@~|Uae0|&ehboGR5~!%V diff --git a/kubernetes/portal/charts/portal-app/templates/configmap.yaml b/kubernetes/portal/charts/portal-app/templates/configmap.yaml index d4ef698f71..28de588aa0 100644 --- a/kubernetes/portal/charts/portal-app/templates/configmap.yaml +++ b/kubernetes/portal/charts/portal-app/templates/configmap.yaml @@ -25,4 +25,3 @@ metadata: data: {{ tpl (.Files.Glob "resources/config/deliveries/properties/ONAPPORTAL/*").AsConfig . | indent 2 }} {{ tpl (.Files.Glob "resources/server/*").AsConfig . | indent 2 }} -{{ tpl (.Files.Glob "resources/certs/*").AsConfig . | indent 2 }} diff --git a/kubernetes/portal/charts/portal-app/templates/deployment.yaml b/kubernetes/portal/charts/portal-app/templates/deployment.yaml index 3fc2741556..fb9f35ba19 100644 --- a/kubernetes/portal/charts/portal-app/templates/deployment.yaml +++ b/kubernetes/portal/charts/portal-app/templates/deployment.yaml @@ -59,11 +59,11 @@ spec: - name: javax.net.ssl.keyStore value: {{ .Values.global.env.tomcatDir }}/{{ .Values.global.truststoreFile}} - name: javax.net.ssl.keyStorePassword - value: {{ .Values.global.keypass }} + value: {{ .Values.global.trustpass }} - name: javax.net.ssl.trustStore value: {{ .Values.global.env.tomcatDir }}/{{ .Values.global.truststoreFile}} - name: javax.net.ssl.trustStorePassword - value: {{ .Values.global.keypass }} + value: {{ .Values.global.trustpass }} ports: - containerPort: {{ .Values.service.internalPort }} - containerPort: {{ .Values.service.internalPort2 }} @@ -106,10 +106,10 @@ spec: - name: properties-onapportal mountPath: "{{ .Values.global.env.tomcatDir }}/conf/server.xml" subPath: server.xml - - name: properties-onapportal + - name: authz-onapportal mountPath: "{{ .Values.global.env.tomcatDir }}/{{ .Values.global.keystoreFile}}" subPath: {{ .Values.global.keystoreFile}} - - name: properties-onapportal + - name: authz-onapportal mountPath: "{{ .Values.global.env.tomcatDir }}/{{ .Values.global.truststoreFile}}" subPath: {{ .Values.global.truststoreFile}} - name: var-log-onap @@ -143,6 +143,9 @@ spec: configMap: name: {{ include "common.fullname" . }}-onapportal defaultMode: 0755 + - name: authz-onapportal + secret: + secretName: {{ include "common.fullname" . }}-authz-onapportal - name: filebeat-conf configMap: name: portal-filebeat diff --git a/kubernetes/portal/charts/portal-app/templates/secret.yaml b/kubernetes/portal/charts/portal-app/templates/secret.yaml new file mode 100644 index 0000000000..18f85c1698 --- /dev/null +++ b/kubernetes/portal/charts/portal-app/templates/secret.yaml @@ -0,0 +1,27 @@ +# Copyright © 2018 Amdocs, Bell Canada, AT&T +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# 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. + +apiVersion: v1 +kind: Secret +metadata: + name: {{ include "common.fullname" . }}-authz-onapportal + namespace: {{ include "common.namespace" . }} + labels: + app: {{ include "common.name" . }} + chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} + release: {{ .Release.Name }} + heritage: {{ .Release.Service }} +type: Opaque +data: +{{ tpl (.Files.Glob "resources/certs/*").AsSecrets . | indent 2 }} diff --git a/kubernetes/portal/charts/portal-mariadb/resources/config/mariadb/oom_updates.sql b/kubernetes/portal/charts/portal-mariadb/resources/config/mariadb/oom_updates.sql index 1dcf0d8606..6b9e8a957c 100644 --- a/kubernetes/portal/charts/portal-mariadb/resources/config/mariadb/oom_updates.sql +++ b/kubernetes/portal/charts/portal-mariadb/resources/config/mariadb/oom_updates.sql @@ -1,41 +1,41 @@ -/* -# Copyright © 2018 Amdocs, Bell Canada, AT&T -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# 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. - -*/ - -USE portal; -/* -Any updates required by OOM to the portaldb are made here. -1. split up SDC-FE and SDC-BE. Originally both FE and BE point to the same IP -while the OOM K8s version has these service split up. -*/ --- app_url is the FE, app_rest_endpoint is the BE ---portal-sdk => TODO: doesn't open a node port yet -update fn_app set app_url = 'http://{{.Values.config.portalSdkHostName}}:{{.Values.config.portalSdkPort}}/ONAPPORTALSDK/welcome.htm', app_rest_endpoint = 'http://portal-sdk:8990/ONAPPORTALSDK/api/v2' where app_name = 'xDemo App'; ---dmaap-bc => the dmaap-bc doesn't open a node port.. -update fn_app set app_url = 'http://{{.Values.config.dmaapBcHostName}}:{{.Values.config.dmaapBcPort}}/ECOMPDBCAPP/dbc#/dmaap', app_rest_endpoint = 'http://dmaap-bc:8989/ECOMPDBCAPP/api/v2' where app_name = 'DMaaP Bus Ctrl'; ---sdc-be => 8443:30204, 8080:30205 ---sdc-fe => 8181:30206, 9443:30207 -update fn_app set app_url = 'http://{{.Values.config.sdcFeHostName}}:{{.Values.config.sdcFePort}}/sdc1/portal', app_rest_endpoint = 'http://sdc-be:8080/api/v2' where app_name = 'SDC'; ---pap => 8443:30219 -update fn_app set app_url = 'http://{{.Values.config.papHostName}}:{{.Values.config.papPort}}/onap/policy', app_rest_endpoint = 'http://pap:8443/onap/api/v2' where app_name = 'Policy'; ---vid => 8080:30200 -update fn_app set app_url = 'https://{{.Values.config.vidHostName}}:{{.Values.config.vidPort}}/vid/welcome.htm', app_rest_endpoint = 'https://vid:8443/vid/api/v2' where app_name = 'Virtual Infrastructure Deployment'; ---sparky => TODO: sparky doesn't open a node port yet -update fn_app set app_url = 'http://{{.Values.config.aaiSparkyHostName}}:{{.Values.config.aaiSparkyPort}}/services/aai/webapp/index.html#/viewInspect', app_rest_endpoint = 'http://aai-sparky-be.{{.Release.Namespace}}:9517/api/v2' where app_name = 'A&AI UI'; ---cli => 8080:30260 -update fn_app set app_url = 'http://{{.Values.config.cliHostName}}:{{.Values.config.cliPort}}/', app_type = 1 where app_name = 'CLI'; ---msb-discovery => 10081:30281 this is clearly incorrect -update fn_app set app_url = 'http://{{.Values.config.msbDiscoveryHostName}}:{{.Values.config.msbDiscoveryPort}}/iui/microservices/default.html' where app_name = 'MSB'; +/* +# Copyright © 2018 Amdocs, Bell Canada, AT&T +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# 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. + +*/ + +USE portal; +/* +Any updates required by OOM to the portaldb are made here. +1. split up SDC-FE and SDC-BE. Originally both FE and BE point to the same IP +while the OOM K8s version has these service split up. +*/ +-- app_url is the FE, app_rest_endpoint is the BE +--portal-sdk => TODO: doesn't open a node port yet +update fn_app set app_url = 'http://{{.Values.config.portalSdkHostName}}:{{.Values.config.portalSdkPort}}/ONAPPORTALSDK/welcome.htm', app_rest_endpoint = 'http://portal-sdk:8990/ONAPPORTALSDK/api/v2' where app_name = 'xDemo App'; +--dmaap-bc => the dmaap-bc doesn't open a node port.. +update fn_app set app_url = 'http://{{.Values.config.dmaapBcHostName}}:{{.Values.config.dmaapBcPort}}/ECOMPDBCAPP/dbc#/dmaap', app_rest_endpoint = 'http://dmaap-bc:8989/ECOMPDBCAPP/api/v2' where app_name = 'DMaaP Bus Ctrl'; +--sdc-be => 8443:30204, 8080:30205 +--sdc-fe => 8181:30206, 9443:30207 +update fn_app set app_url = 'http://{{.Values.config.sdcFeHostName}}:{{.Values.config.sdcFePort}}/sdc1/portal', app_rest_endpoint = 'http://sdc-be:8080/api/v2' where app_name = 'SDC'; +--pap => 8443:30219 +update fn_app set app_url = 'https://{{.Values.config.papHostName}}:{{.Values.config.papPort}}/onap/policy', app_rest_endpoint = 'https://pap:8443/onap/api/v2' where app_name = 'Policy'; +--vid => 8080:30200 +update fn_app set app_url = 'https://{{.Values.config.vidHostName}}:{{.Values.config.vidPort}}/vid/welcome.htm', app_rest_endpoint = 'https://vid:8443/vid/api/v2' where app_name = 'Virtual Infrastructure Deployment'; +--sparky => TODO: sparky doesn't open a node port yet +update fn_app set app_url = 'http://{{.Values.config.aaiSparkyHostName}}:{{.Values.config.aaiSparkyPort}}/services/aai/webapp/index.html#/viewInspect', app_rest_endpoint = 'http://aai-sparky-be.{{.Release.Namespace}}:9517/api/v2' where app_name = 'A&AI UI'; +--cli => 8080:30260 +update fn_app set app_url = 'http://{{.Values.config.cliHostName}}:{{.Values.config.cliPort}}/', app_type = 1 where app_name = 'CLI'; +--msb-discovery => 10081:30281 this is clearly incorrect +update fn_app set app_url = 'http://{{.Values.config.msbDiscoveryHostName}}:{{.Values.config.msbDiscoveryPort}}/iui/microservices/default.html' where app_name = 'MSB'; diff --git a/kubernetes/portal/values.yaml b/kubernetes/portal/values.yaml index ecb7d5ecf6..719116b7dd 100644 --- a/kubernetes/portal/values.yaml +++ b/kubernetes/portal/values.yaml @@ -20,9 +20,10 @@ global: portalPort: "8989" # application's front end hostname. Must be resolvable on the client side environment portalHostName: "portal.api.simpledemo.onap.org" - keystoreFile: "keystoreONAP.keystore" - truststoreFile: "keystoreONAPall.jks" + keystoreFile: "keystoreONAPPortal.jks" + truststoreFile: "truststoreONAPall.jks" keypass: "changeit" + trustpass: "changeit" config: logstashServiceName: log-ls -- 2.16.6