From 94cf4aed9fda6385e321718ac32a99f02d1caf00 Mon Sep 17 00:00:00 2001 From: Ravi Geda Date: Fri, 26 Oct 2018 17:32:48 +0100 Subject: [PATCH] Update gizmo fproxy client cert This cert is to authenticate with AAF, which the downstream rproxy calls. Also, a fix to the service description. Change-Id: Ib4c57fa3ba3fa613f1124bfdd0e9af0e6c8574d7 Issue-ID: AAF-588 Signed-off-by: Ravi Geda --- .../resources/fproxy/config/auth/client-cert.p12 | Bin 2556 -> 3591 bytes .../aai/charts/aai-gizmo/templates/service.yaml | 3 ++- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/kubernetes/aai/charts/aai-gizmo/resources/fproxy/config/auth/client-cert.p12 b/kubernetes/aai/charts/aai-gizmo/resources/fproxy/config/auth/client-cert.p12 index dbf4fcacecf190fb0244dce0d1b438e6fea4500d..7a4979a7a3d67b382f54260eb82e0c986a386631 100644 GIT binary patch literal 3591 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 DTcV<- literal 2556 zcmY+EdpHw{8^>p6vvN1q+;S^Iwz0#F1O>%q@$`lt@_`#}p!mZsr!v zrA;)F+=b00##|C}&vBmT_dDk~f4tB8JfH9PegFKR2+$26A3ur!eGP_c+_bv6F3bnv zqY$7^K?G>QJ|?3G0>A$!5^w_%1YGv9lQ! z2xbYdREtLj!#tMeXTuU~Y}^mN=>q~m01yH6;iwV9rpF(${h@HJ?@grEMCee9ri-P) zwzE2^?>3>tjiqo5*=`e>dbXiy^X|@E0$!PKLudIJtgh4W8suwce{PMLt2sx-*UI6F z!=)~#bGYY1wTtBr?TXBfjP2}S>r)?dXjlH6NdFDxJivFEjLiGlmGFMS9SiW?*?m-# z6vbW7ozLnRpnP1x;1qCc*giY4axyE6+VS)Ztd?rL6ea=|uIDxv(Z78GS8#VoK1cJ8 z!FSDn*aO*Dx^Bf(*PeI%;F-7^_85~7(P(TNt(ZEztJE{opI(0q0k#DB4{pJ@<7p|) zpZtoQpC34>S1l`7lj$C)&u8Bd-;@;d-QOjbY?tfoBF&HJ^-Eb@v9|e~4pp?YJgza+-^?9hj4GbOZGiTk*` zAbxe_30a7E8x*F}ckf`o3;K=T_4}P|dc-SD@KbApw{&dRXeRFAiP&yTX{gAZtFhiU;|2D-kJHZr4^2}y z-yy;3?Oqd%Tw_%HZhrrHwr3!+%>6}3Z#<07>lT!6<@ucUdq}KG>~?qu!KmL5y8*bE zLav3Fm)&ApK@K!c7u`27&VN1E-;l89F>JcyJToKFXt1jFa!+dZZf`;1)h>Zi`b+$| zOatMJv&P|yQuXMBaP1FqCUN`b9IyHbW9vytIu}WAz32`X(@&jJe|%8_c9qTdYIHw z3fZtxHhk>d{+J@y6QH!L5;&97BmG4fersW56HO~_aff2xrb14q;B$h>Dl>!u-0^#3 zNM)Lp-+>qA%2{haKilb6wE~VGeF98WyTD%5*2t#3y@legMFULBxF@-nUq$W=S2R<) zI48ac)-CNcs?~L2;SJ0qALf6G&Rw5L^MCbG^vC>37XW*fZee2c>60$!G%;(z%l36t zVR3dNTR{B=kNDllFa+A>A}pnZyHmD?-})}8SjYUd6ghk(<8u1b8VN5Z(jz!uX<@xQ z?gc*Y;wbUR8lJ2rgmFlsgovS9poe; z%0J?oiYmm1E;^?_bV$$TeAa6(KcIHD^=++kgqXG4qb+YU#nLPjzn3`@-VW&ZQ;i&q zQ+=P9?vT$%MXeFKXZMQjXR(BZ77X~0DuFSsn@PzYuW*6-_qZ0DEnz99sZ)ti;* z%*hSuCsbrr8!5ub?T^D8^E{C%|5*w!^qc(G$nIGG>bz3GL;o&GkPg9Z*648Z&9>g4 zxgSFPB5mlK@GzB8nxxlmWRilyg#ccoTDp=D`f8@fW=Uharxj&N8gb2qChAMuxN-e` z@z=#64FA;6o|9IL_x#8ZI(1z(LlCrbIV;B|yf?ti?AILK$%L3pqW_gUAxcv+G_s$C z>&IhLG?_i%%Moj~pI!leKDom7$j?gD`J@t-uW%TSMtJ1I5Y>bsno58xjYj38Ok z#dww61flet6${l96L3ai^70CVZGPYGD<*B_QpKhmaPi`3gUVa&Rkow~faF)WiAIf{ zw!VVbLBOewjxYw*#ZPy-u+{ImT1YqQ$$b;6$<*anGHM4j&i57=^Z96?+pCw6>}QGd-<8Iza65dzA2s5Elcr`LwveyTFFUwuyNMqbe>8zPTb$EBtzuSv%NFNd5cYEh{uDhjr)({@X`vvX!;d%ccy~WAQpexeVZ|F3K zh+iEDrjnV#qVX%yh#DKUexv+rS0|4)+YYs{K9=l0;8pDe`nY>J&-|1qBOe zitqzv1OOly$@=nb#PO1w+DFZwsfNPY!%h`*Aebw;+{L0$LiiNyc&sYG#@NT=%=+JI F_zSHP#{>WX diff --git a/kubernetes/aai/charts/aai-gizmo/templates/service.yaml b/kubernetes/aai/charts/aai-gizmo/templates/service.yaml index ac34ed9248..a584800bb8 100644 --- a/kubernetes/aai/charts/aai-gizmo/templates/service.yaml +++ b/kubernetes/aai/charts/aai-gizmo/templates/service.yaml @@ -29,8 +29,9 @@ spec: ports: {{ if .Values.global.installSidecarSecurity }} {{if eq .Values.service.type "NodePort" -}} - - port: {{ .Values.global.rproxy.port }} + - port: {{ .Values.service.internalPort }} nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort }} + targetPort: {{ .Values.global.rproxy.port }} name: {{ .Values.service.portName }} {{- else -}} - port: {{ .Values.service.externalPort }} -- 2.16.6