From 23a95e5f939e5efea231f4423ac0b098ee370c1c Mon Sep 17 00:00:00 2001 From: Amarpreet Minhas Date: Sun, 8 Jan 2023 00:16:53 +0000 Subject: [PATCH] ghetto common chart --- .../sudoscientist-go-backend}/.helmignore | 0 .../sudoscientist-go-backend}/Chart.lock | 0 .../sudoscientist-go-backend}/Chart.yaml | 0 .../charts/common-0.1.0.tgz | Bin 0 -> 5643 bytes .../templates/NOTES.txt | 0 .../templates/_helpers.tpl | 0 .../templates/deployment.yaml | 0 .../templates/external-secrets.yaml | 1 + .../templates/istio.yaml | 1 + .../templates/service.yaml | 0 library/common/common-0.1.0.tgz | Bin 14269 -> 0 bytes library/common/templates/_deployment.yaml | 21 ++--- .../common/templates/_external-secrets.yaml | 83 ++++++++++++++++++ .../{_helpers.tpl.bak => _helpers.tpl} | 0 library/common/templates/_istio.yaml | 63 +++++++++++++ library/common/templates/_service.yaml | 2 + 16 files changed, 161 insertions(+), 10 deletions(-) rename {sudoscientist-go-backend => apps/sudoscientist-go-backend}/.helmignore (100%) rename {sudoscientist-go-backend => apps/sudoscientist-go-backend}/Chart.lock (100%) rename {sudoscientist-go-backend => apps/sudoscientist-go-backend}/Chart.yaml (100%) create mode 100644 apps/sudoscientist-go-backend/charts/common-0.1.0.tgz rename {sudoscientist-go-backend => apps/sudoscientist-go-backend}/templates/NOTES.txt (100%) rename {sudoscientist-go-backend => apps/sudoscientist-go-backend}/templates/_helpers.tpl (100%) rename {sudoscientist-go-backend => apps/sudoscientist-go-backend}/templates/deployment.yaml (100%) create mode 100644 apps/sudoscientist-go-backend/templates/external-secrets.yaml create mode 100644 apps/sudoscientist-go-backend/templates/istio.yaml rename {sudoscientist-go-backend => apps/sudoscientist-go-backend}/templates/service.yaml (100%) delete mode 100644 library/common/common-0.1.0.tgz create mode 100644 library/common/templates/_external-secrets.yaml rename library/common/templates/{_helpers.tpl.bak => _helpers.tpl} (100%) create mode 100644 library/common/templates/_istio.yaml diff --git a/sudoscientist-go-backend/.helmignore b/apps/sudoscientist-go-backend/.helmignore similarity index 100% rename from sudoscientist-go-backend/.helmignore rename to apps/sudoscientist-go-backend/.helmignore diff --git a/sudoscientist-go-backend/Chart.lock b/apps/sudoscientist-go-backend/Chart.lock similarity index 100% rename from sudoscientist-go-backend/Chart.lock rename to apps/sudoscientist-go-backend/Chart.lock diff --git a/sudoscientist-go-backend/Chart.yaml b/apps/sudoscientist-go-backend/Chart.yaml similarity index 100% rename from sudoscientist-go-backend/Chart.yaml rename to apps/sudoscientist-go-backend/Chart.yaml diff --git a/apps/sudoscientist-go-backend/charts/common-0.1.0.tgz b/apps/sudoscientist-go-backend/charts/common-0.1.0.tgz new file mode 100644 index 0000000000000000000000000000000000000000..215ce2f91046417db4b46e005e0f7a40a4dc7211 GIT binary patch literal 5643 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 literal 0 HcmV?d00001 diff --git a/sudoscientist-go-backend/templates/NOTES.txt b/apps/sudoscientist-go-backend/templates/NOTES.txt similarity index 100% rename from sudoscientist-go-backend/templates/NOTES.txt rename to apps/sudoscientist-go-backend/templates/NOTES.txt diff --git a/sudoscientist-go-backend/templates/_helpers.tpl b/apps/sudoscientist-go-backend/templates/_helpers.tpl similarity index 100% rename from sudoscientist-go-backend/templates/_helpers.tpl rename to apps/sudoscientist-go-backend/templates/_helpers.tpl diff --git a/sudoscientist-go-backend/templates/deployment.yaml b/apps/sudoscientist-go-backend/templates/deployment.yaml similarity index 100% rename from sudoscientist-go-backend/templates/deployment.yaml rename to apps/sudoscientist-go-backend/templates/deployment.yaml diff --git a/apps/sudoscientist-go-backend/templates/external-secrets.yaml b/apps/sudoscientist-go-backend/templates/external-secrets.yaml new file mode 100644 index 0000000..c0cfb91 --- /dev/null +++ b/apps/sudoscientist-go-backend/templates/external-secrets.yaml @@ -0,0 +1 @@ +{{ include "common.external-secrets" . }} diff --git a/apps/sudoscientist-go-backend/templates/istio.yaml b/apps/sudoscientist-go-backend/templates/istio.yaml new file mode 100644 index 0000000..7e551d3 --- /dev/null +++ b/apps/sudoscientist-go-backend/templates/istio.yaml @@ -0,0 +1 @@ +{{ include "common.istio" . }} diff --git a/sudoscientist-go-backend/templates/service.yaml b/apps/sudoscientist-go-backend/templates/service.yaml similarity index 100% rename from sudoscientist-go-backend/templates/service.yaml rename to apps/sudoscientist-go-backend/templates/service.yaml diff --git a/library/common/common-0.1.0.tgz b/library/common/common-0.1.0.tgz deleted file mode 100644 index 1591017194e949354e19c1eeab7b8348ce62577f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 14269 zcmV;uH$uoCiwG0|00000|0w_~VMtOiV@ORlOnEsqVl!4SWK%V1T2nbTPgYhoO;>Dc zVQyr3R8em|NM&qo0PMPTSkznBHx5dPpeQK@Lr8arbW5j*)Bpnv3^T*b(4iusfOJTA zNlAyaG)Sj(cX$6T^@PWB?)N;```pj{T<`Te>yMdX?X~t=JJx4^_VELZM)&`PXJ7=v%P^p{7VdTxVw%0N4y*0)wJ}U?>tmB?+-bqCg0F zRVo0hHV|S9Lb4)32s^L|i1jNr09;*h0RWH#9ELyvR8^!5mBp2$g=y%mY>h!CCnQvwrnPKtU)Fk`)YN z`|2p{>n%P1i z(C^5K`xVE&+WvBmKw+rgtbw*D7}5j?0YlAMK~SJE1Z4XC^gw{V!4vWiegC4AgxNw- z-_3qN7XSbWf`Cj=FvQnb0Dv_RWn!TSGzLMC-xUDBUmqiXm;S%<{q;2Yd;eeS?U%%U zn7*&_bqw}kl*Mm-z+tB1P$&%b4V;lbr0~1)SKsg6DA-e=H3Yy4Z~;KUP*V^T1>pbP z?GJMV0Q|Zde;FEV4KxR-+Cm^2AQJ=#^+WKVTmBmvd|jz;Y(d<_*bcbMsC0wGv=RFbaln1h~2i{;3%SGzYkREp?zR1odm;;&Avcwf&Xu{2b-$ z(yGEBU=znbEXDW!;J-EgF+UL0?$4tIoBieug4+Gj;VJM!YupI~rLLyZWFk{dk zv-lca7WC6D006#{Iza&2&)RS4{FE>P1T+Qz5B83P*&<9p$iLmEzghl^)%g>8Kw+jJ zjbA|cce5Y0|1H$`Q#_!V85jyi{je#2)%<(opkNRX;%7AeLHU0f?LSYA|IGg^;J|LM{@&?#n_rwjCJ+&>-_zvJ64&w=5#ziGY) z5Vr#%faahdg8a*&{MR!236%eKgi0W57{c-2IY{eoJ^pvc`CrKEuTO;kk;CE7`2Q>Y z`S+axfA{`}o8#yAKRlcqeE;D8e?tC@|G%vNpDzEu-TO7Z8~k5i`oGuQUl8u!pA`Q< ziYp^*Kh5-HhWBgtH^KkL}{Qj4h zkLREI|4#@tKoy8Wfe=t600jel-vI!73lJ1wYzu~%f}!RBIMBojXbwWM;!*=NExDI09q_ zb^w`vzgST+umV(|5JvzE`pxreN&q+r0f2y^AXZ#fDGfsn6bu2vr3OfTe;utYsR1wr zBapbP=3o@tx6kkCz_zFDBJHH83RqMY~cViFa(6eWn@L# z!*Ll|je%CUjI1c@ufJgkusJTH8!k0K8;AhIY>@zYDQP4wD;xo{1eu_4S;3|tAlr9y z1k4hb)edO_GX=5zzkn#e)c^M{mTxcYSyARr|JE4)=lbX5flyONO*NRX90+2K zw&rB76Y{K(jgchk#fuCgL$L~v3Fi<-K$Rp8`W4D+@=HpZ?@_8mDX%iPmzA7I!R~wh za)bnd6C1BUu+ojqwcRmT{N|&>a_0-V`s}A%g@aL%`_YG(?nR}tRQw?8S_|eDV#v+r zmeDpKbsr0kO+4*z2%S-A8{3}EWI%rl`F>C3G?qQ)*EQ%x~XX5IV zU9phGxZ?Fe-G&si53s>ozPOQdkIN! z0Pu*`F<^ zsKqdnRmqg;pe{mW_39Xbr%D8u&f-LM*e~*Gx60IAKH^j_7b84A-7;iiy0Ez~6n<_O z007)Q_^cTWp*YnjdpNUPsGif?}cgcJ7>9+r}P5>94)owHcQLj4rOEKdbBDszy=gk-w zvB$0(LnAsV=)(_gyg<8&hAyciaZ5*R=@9&Uix91Pvn4*tYvffLo2QxkvfHBeyN9bA z_O|y#rACGZ_XFI{BC5}>KWD$}y#tLCwY(@;rb0Wv>AdS{d+)6r9-gn%$18DhR5f@e zb%QUOZ7N>gpB~=yS4dW!+*u_b z>trd^#ct0_9TBz<&Fd^wU(`+WCRZOzIhCWhPk<*~y>-Sf+9C*KX26=n^m z3Pfu^O-l2}Ixr{bY}sdIyq5Yj=I<-4cNNTVu7u}vfgC$RUcJ1}?`A!-jgEG4*W=W# z_?&xsmH(Uq5xXfneB4;UOJl!q|SzSdV$Hg`QDtEJu zZ{BoaufH9SE+&>!Qw=m0PfXNiC(W22O7r(8#>k+a%0;`q4O+-oK*ROHnqtQw^0*n? z$Jtj;)uZZyC3dj7YN7v>rS`U0)6}bMpiU=Syy18=_S3RNff^S#^I;w2gXb=ngtHz~ zXZk^yWX6lHuVfp+>9OMRJ#1vA3tuwV+8sdv+2`9Z8gjF@T??LFXiM%r>?zb(s=*=6 zQ?FDlQdo%G8?oz{6OB6aW-L-zL|U$071xyzxHQb5pWL}zC2fu%Jpg1Ek4{?7)^t99 zU?3tM7rzr9;qAQ|e|D+TJ#f0%Qgg;{+z7;GvP6gz!EiGwaCe_=tstISZhyin_Q347 zwZ(+4)LGZzC_GtzCTAl}KlWfTIXX*quNPi?@9@>*Xx-D(Axer}BzCFKm8i#(wJ>*z z#h_Gr#xzh5L*FQv)|+c4sGwZdIcolyW32v*ayrO*w{~8(^IH|)09!d-mWcW62>a~2 zb|@&$VnxW3hPpvb;-x=#=+iXB71NMSYs*esd9A)-lc1H3@mH=?oa&FUIMv(egWp}Z zx5|6TQZ5G*pby%ag7~Wx*(i^rt!T3tI^8_9ofzjzmQ|}sg97@xZ_>t~O)tha3ekDx zu@^+=I5|7*5a*UVlld!g<6AEc$_Miw_Sw5ILU-R)q0RAUJ{`1GR=iKrYS7!%So1MY zxl*@4rM$_3?41-m?)C8v*5Q`j&~WNI3ikbW!&7!+ybr-rb0Vui6O&g@c7sY|^m^C1 ze9F)h(Uf;hNw4Q(Z!TOjcrCAlEv|(5&exMbpTPGOKg(l$wVQ_{6C(ER^UVG#)U7nv zr{7$&KE~}ut1V)QS+j$<@?GIi^ee3BaCe3lO)DzVZOg~dEbJaes+`2;vrM?Imwe!z z>3IpivVjqE4O`BtR>7h4)5muRIaT^GMQqdz3&va=xkG7 z>nIi~V?J8T!{TX*>U#WA9)dA0Pb<^pRq>_AlK*H_$iZ83(PdeVmW^j=&=6l_dVYV7 zw^f>`N}x1Q^)SaHu26i>UaV~G>IZWSpF^+JtD>MM_i;QO)f=m}GM(ZsKfHg$CNx3^ z6Nv!UTq?G|GzlD9SRYN7`^bO2Qzgs+Z$}H_qTZ7HF{4^k+CcX43m+xnW(m_WUMtn%|jY`>Cj-MZC z?*N5jdfhr$9xwpv@V?V2+j8G0`5}0P$(M_c(%YyB44F_sxPb1tTS1`)b_dZ%tXIbje-W zo$;8&m$Si;b_3Alj%B|J-I^|`sg;vMqh<$6x?yc{^F0pjO8e4hofQ7b)2+seNk)dw zw=Iv`IV9~K_M*qwIC76P3y8trM2I+47pGpFZ^6KMA8yZ2;Yawg7~?=YRSxW5=CbNN zOsRLGL7K`+wD~p!7STWdC4wwyo_$G61Uxsc|U7mNd zs{ub%mddMV|4Cu$tHb)&H}Y>^k@kiz-eftP%41VsN5KwB@%69L6bnDbolP=7Q*q$% zx|7PnJ~TU)>y5E8YcR*Zztl*~CVY7pWY6ZQV8bI8ZkelngJ>a!pP8nXBcK=7m>J?H z9-1RN@G%fjZx=){3lkdTk{fu-b||-V|0%zdJR#vh&(3;GCEvueMn}~o4y9#(LFe!@ zzcUeuc3+cbr#CcRUURPxeM%<|Zb6opl8)+LQBP;SNmkh*oaK@Y3L2pBPc!h}%#-WY z%9CeQ6@6Nod;l*Q5&c}gD7l&{y(0A##ki%Bd%#j~iksUaG$To4SAM!9g)dv*;tGtX z2CW3sMTW9(mRIr<8G(v|xt)6VeQKSi!jR`oNx7gpB=6ZI{ z5rRfh02}|1&sUSjn^mtWD8yQJiV}|1%%==9)vIC&3K^_}&Uwa%h21+2i+ntZ?S{5~ z%@?izG^@XD5$nCv(aj!7bpvCStXf}=jRh62JkA^OZytn^Bsc9AxOFYpgs+~IH!o^j zliXwoiC`_CSb_%z9RVBnMCLCxoVxV({f=21)r!q>4>_mp8pG#^s!aFQFs?~A*tPWB znz+%ZW;=Mxe6>ewXk~Dwf_kxZfSU{!`FTYRvH9-q;v>4z%Gr!*T#k^~O?#o9Y9>;u z0KX|FCn4+6ibBxbHyT6y&P>PM6lBF3`LSvD}3c`k7Q3m z0ja|R(AM-tQ!ya?$z71b?Xr?W%21P!r(T5Ub0(*wAJqsGQ@mYoarcK%oGYtY4SUQg zo){8H1~~{P-znFV?a;Xq@gloG@1s5H`~iBzFl{&Qesj4nK`HiD|)2b+0`n!~acYHKFG0RZs zO}t43RS#nQ;N>O7Syhwm7J^eaBT^tkun?~Z=^l-q&j`^%70RWvGsl#sAN%FgR`t*p z>IZky*zfFVd?L1gJGDSB627G9DU`YsQ`R&))_P4Tl<2-xLm1S63U+%Vw1#K%FyG1M z^l|iCoO7d~E$xC0qm^EILW9FX)D-@qtY_S7IfE^Y zgYj$0JXVyC8$W&lJz@(Pr5HK&PY<01CP~55h>;kEY`%RNaISJk`Qea+j8AfLBU@R{ zk>^KALy5{6`&U9@B%WF4GkM<0KHkFybuBqKc9EmzKTKV($#pz`jm2t5m#0@0xcMb3 zoMDGVHe4G1I6H54orjuBWv*vU@0na=@p5$|jVWmNhf;z_vLD&1X z=nDGbD1i1`$&I6a{6>Q(vv2(GDdA6*Ip(m7VM-JO#+#E(Wh0?R1l7*djA@bZlxyEaBq+@q-B-)k8a zoAal6DDosPZjs1vTJ@QRxaQ)~{`#taS6q*<+1SoF(B3jm=rbBQi`h_@jc}eO@mY(I zmF|Ok)$D6phs(iizS+m0lOG%0d+&O(w}CPT@38K20B4-pY#!dU5M;oVzDA_0JB=4= zeW;tum5tk?3$hW`clER_41+T#tDA)jKOFI;svO`TIfRNJA222*C^OBr(O}Zd`^7Vb zbw)-!!gC?O;j7)@pe3cVdu`ou|2^}Yg#;q{_kLBDT3&Ml*>M!zS-C?WmklA9>vi5w zRq{rd^9RyFmUJE=C8F<|?&^I0^3>V9SlA)0+y}sKLbG29vULxU7tQnrA{?!&I`~z1 z$&zU7mP=$snc8)(FQr8^UBxO9(*l)v9342{H(too+*J1NByi!MW88@(ycvYO=o$z* zt95lZv}9pi1g#}_^_Yp{F&9c~=j47gaCx9D+N-E`2WXtYPO`{D8$9SXBkg#iiZyck zOTNKNvH9|&G1yVhmaS-I6~Tpp6^&0#X=D&j}E}kN&)vIN?nc2^AL|3FBOys z)}ntD(YpX4@3L~c5%;B$F=Uegd)lef!DDaxxl?|M;Bk55`7!zmqvRQv;@#1St=-;} zr(Nv&lp6|eyApKjtBC@Hi<1@g3odx3yW0aP=2sStLcaKtmWt-;ddhS7tH|!Jhc=G+ z@2Ft{%_kO`e9Rs8MooRMPhTHY?RtVcTs$1E`r38E;xiWo1D{E6RUPC7our8)AU!C( znmNxTuvpl3XT^0F^4N3f0k8oP!N~4wPio-?nUW908F3DzSFITe26A5=?5i?7-Lf0g zWgeBJNNSZP&7)Siu{CDYsV`1qGDuX&5_REu&!s6k=N1bYOI(6R%k%Az-iEzqaMxU@NmQm%Wl?{B47e)+EO=l=XGIh?0c) zLGXP-*~4R6Pu3I}w}Y6$FE4rJNlX&;2^ z#75Ro*?A~E3RHO#T@71)?hOiRIi6>7FG|eHkSjR4ySN#3ojaydp_@|awBCAI!!mf| zbKvg#iQ*RJwwS^D=nMsd*+uXp36Mb88lGHGXh^WAO|UFD&C=`S7{4U-i3TE_P(Qgc zcH_SO^|hxLaE;H+JuNAVMbnrMv0Tx-C$lpoeEs#3pM{b)EnLv{h2I<=bX6w>ny&Tv z(Y(Dem|q${Z&UBqut^-O6Dah!I+Mulm5V}}H3lNNa0+PpF%Q6K@=*Il?`_Abs%{hi zM3UFi1BfuIFQ=UTBw=uNSZ>Ee7=e=K%(xX>v7P0;3F? z9CV4@OCN4Gv?d2@UV)ZL4QS;K18vu5wmMG0TB>gD51hmDLcA|#khgj*>XlP|r~Ff~;6&Q05}k!po|v5nteaNS8OP1Ib4%9CeR7uW}F9=N20Xg)W&s5r|BXitv;l5U!LU#8qnE^mXzIK81YPp1b{oYEd$?xoNd(ce1fqUyMtY zSZ}utQpnL=Sjl4c;{F%9=z$Wb^jn-yaWZW#8EEq=hmIDh(cPW&kDu+|ngueU=Eg;y zycSOKTVG4baVvQ3cH~~A8~EX3pIX&B(0j^V+4G}D(nPZC6D{K~XypB!<`G>?b&lqg zBEv6J*PK(BGGz2+hHbtWo5g42puefMUE~@GzVSBta@aEUaXI zdSkN5h+Cj9dsPD5y5ap^pg%L_@G5SQ`;fHPp_xUVS3~iuF8+AzAVYtDRW?TMwEpQb zOM~s;oP({i4#8-WuxsMkUh=t5VfNJc{z4!ffUxHlnbUEx9kAoBTTshqop-9B4b3*c zGzD@-^2C{3<-D+TF2C^v3RW#bjexQZ@?CyKRiu4CjshW|susXhMt<`RsfA%@N}{vjhcBL*63?_wrwrPC zdlS1Y8N|!^yLv4hiI{sW!L+pUQg29Bl}_^LdS{4_-B$>n-#U0Cm_Tpy26fi*USz59>Wj_iFT(n$oRmQ`vhqTa z++0MB<9uAM3xJtRn&;Z;(Hz&=B%ht`YU%b+o)`2+DFkiWi_%)9@L?Ms5ty!8mPXlX zYwrurt7bi`zOT_r5YE{Uf{{#PJ*u3t;M~4hd0?@#71G(hNp`1~i{>4h0&!H%4KilW zCXTB3AqpeaP7VfJ`19mQ^YuqT0_WUMfN=561t%i=1l;|V5pDC;8Lpf4+6!R>gG|ue zsE_C=#uYe`*`YxJrE%l&?>6kBtap8~yLianjkL~HpVBa9qVk%ZJ~anq-w|D`J2#(m zq@D3Ysoy#2qnMy9fCc5Qip;-7jm_P+6Of)Re4OOQTb`|vc#yoNmF&L|Xe29Sz(+re z(cUy3wU0UO*@}I9^3cQN)=o$6p`4~8mgl4>ehhay?G=ucJH#Iu=vtG9T;`^I7rb

+{;moIvOY`E6DvbRtuk_SF&9Rf3vc3n$SD>+WgEs3lAli`C;$xf7|L zrK%=uCNI|{6_K%&Fatj}lv9NyYyBtR=|B$S8iD$3o989hU$@LaLD{=};#do%_{BHE zcC8pT?W>{!_@B5Z_g`wur*pVw*!Y>oY0B!z_Y|?6l4P}3IFI;^iXC4ZDAwILEf@_C&`=cxz8?n^BN z;(oH-YrFGAJz%~7!HTGfLF>`>GAwv_KU#Z-0gb2Z<@M_a8|8bino)~4N?)N(z6huH z+2JuH^x`?JCx5@V+N%T=zR|VlH21o*;-H9i&oF{Np`cYq*f~7duCZZTmob!fJsHhH zn#0}Bad?|@M!A?jd9-aez*HCaW=VHG*+tJ$IO+kyZJW}mVy3FwwLamQ>t5$)0>*-gX?@G&B43oBGJ+pAjF2kp=;>$N4tYer{CGTceoKP!rXfN@ z$KOOv+qS)n)cJXxq_{|*kLIJeD>k!!1`6j7DGsKVBd#3X2F5dLi`82nE3{V~xk9#Q zN&r^0_smzMN!p+A^7zswI9zQ@_31KT-k4*OU?Eo0jfLK=ecLe6G^LV-e!o_O5;z$| z7r-L@=+2cmIulx-&#pc!Da+A*C`j8On=bYuq=;^}joo-7PO3VxxdfWlra>L=SXmjVDjl9`vK4+TP$Wuy^npg9? z4vU`Bm089&C(H%di|yCvv*`Ub9!(-Z`!;O_Z59d9HBEI%^%w_Z=b`LM#ktydV-W$In2 zA^l|ei#>lgx)8$9S821M?$K4jEM`G6 z!!AkUOE)Fvae#W#y1v#8%2e!va_5cYC1SP`Jo(Qb0&jZd=**ZV$@IC>!md^G^BSgf z-vd0!XZVm9>3rVnv-LrDAL>sNecyYMfAmY{?dRi}FCM=7a-w)pm=sC&<@VK@aex*k zAq;mDo9fY#vPzt8=MX`QBbFhHCCiffiUI?mnzC^Duye-%FWIC+R$uGwRJnp?z5ZNj z1libLh?zHu{QakIBhO1Bk4I*WU`Y;~I0?|q;sVE&YkU@7BUf|i-G}KdL~$*7zRZ)f zJ`5C2TmR5$Nln}hmt#&(Wx8``?e!uH0r@oz4Ez-gwY(2FAGbw!+(^1F5xG;2?TW7y zn?6bV>zb-IB&u@#6>m z_J;mauxWrsF#9@_$*{~TMdQQk9aR-;T%TDS(~3bM*!G`t9*vyDSUst64NX3#|JY}&DyowC4(UUN!%Z2M!&fbVq6Z3sOASIKP zALTHC|E8yW0*7(|-^csq__Y@sv*kh@UGdmN8QX4hS+f5oAujfKMo|4wOg;I;{II_$>EEz-JSt)1I^0xn#&VGQ~ZOs@FMGy%li6b zV&x9>#3_wVZ0phjl>?66VPy3(MvuOq?+YyD;<;0h*O6ICY-%t6EDg+_9rF=GU&X2R zy7I+YldHHbo0vLekx{#rmFd9)HW^O=^ZWg=4OQ;yajl~Ex>aZO8cJW5A|?GuMLgas z)26277c|d*Srx}eyk6H?i?nb*#CH_uGsGh3)Pky-IMZ>l0?;cA^ zG7cXlzw1cHbg#T8#RXV<+Iu|Gpe!rXNot>&%~zHG2HkpnVl?I4KpM7!XX-@XNd1T@3qfs765}=wgqmMP(lWUT(Dv=sNO6>J zReu=ydLIMV<9&fdL{c>LbXypz=g6@*>e3m2k)84EfTlX7un|H z-2*Z+`RdwBf=2@B>I9Q=pxA_i_Aet2ZcPrA#9U;9jHMjCrYq|&1rpjJEAt}PI#WGf z(Otj6=ryYGSbLS=i6TYBN1n~6C;Jgu!mg*?#G((Kw(#g^d-?hOtaUBsN)CS9XPrpkTea{AZk+{7KzIlX)4ogCt)sJ_hE^M^U!#k&^33cV zjMgoY3vW>xu6n47H~!|c5KkXP$+?KR{?3i3?6>S`Z)-o}KEg>fiRB~Mb9&p{cv~5Q z;~Ykvg-Bk#(ECy#uEb%1)4fVV5n3B8>|op|69v1Gv*j~c7x+=SbL+&)PirG*vxGBO zZyIHupuI|&atpjr918rLMYXHi{D|W{ktQOTWkNGH<>+(XYi(M0I z1R2#ju;%?-N0`3@UeV#P7USe9feJ?)U*I#u3QJ~u0jj^2Tg6_Vv%L+#_oPrhp%5=~cS)WXNfPT$JL5B-v07-9l6LAwm-`&7~m2 zaFNUQkTiVp0Ka(0?C+3hLncag`ha@==l4vICfaM{dHA^NT3>1)j*qP?I+pNMKE z6Jep%vx77GTN)PK(!li%W{EN1K|bLRty$GhWdk`-)stI$3bW{``+;wVXQ~Zmp`&+h z#Sc*+S%s{d44-YXkh|uiXSO%gTx`QnyP+3t?*|%Flw%tGi@cf@rGhIHpAmAI%g!pP z2=VCoP}ml+EGHD)G19jihb%WbSruvBpdu+*yIxjshpJbdtKWtFqa<jxNm~^4Q2vs9DKrP&}Us=332gyb)mB zv!y{F7u#*SAy6h68bC;=9%xsqW^=rt+k>O><>-ayYq~YH&(A6|_%G)f)6m;Mg@H@>b=W* zS!17J!L*`}+b>rjx9l}!cV#zwK4az$jk`AkR zFgZ8?VeQAu7lAviXgIwM;|a5o9~cTJbi|*zVyeHb8el;8+S0`_XuGlfe6c61##(WdGw`%MY=maxnHB2iSp8V2QFQqia&d$N{;nkv48L^KbX> z_-xzQyDC?UG`>GeI*^=dzN+E<^6F~!qCKYvV}vnj-&@huXTj2yw|m$$^p=}VEP>_E zeU&|ImXmX+4Og`#lC>QJicZRTrrRG8t&5zQZxNcWs@&O&u&ikdc`^yF(KzP6pIhCu zCAKzx?jXd-*-D3ITbSvd37#n+m>p)hnQSKH9!Dh*Jr)W35aPxr4+=HeZSs!*yR~s5sN{aum+8Prfd#fB3dl z3G#eo`IRXjC8$CA?K7Wkl6%sXNuP}GSNUaOArspjhoXsMO$EU!O4b>U{GuslQuk zAL-s3e|yxR-eKCmhoA2}anW>NyzH(~xTHfvySyxeuW6#G f{%`-I|3C7N{3HL!PxAi-00960p$d7x09XJ36$3w< diff --git a/library/common/templates/_deployment.yaml b/library/common/templates/_deployment.yaml index 1910db9..05c453b 100644 --- a/library/common/templates/_deployment.yaml +++ b/library/common/templates/_deployment.yaml @@ -9,14 +9,15 @@ spec: {{- end }} selector: matchLabels: - app.kubernetes.io/name: {{ .Values.common.fullname }} - app.kubernetes.io/instance: {{ .Values.common.fullname }} + {{- include "common.selectorLabels" . | nindent 6 }} template: metadata: {{- with .Values.podAnnotations }} annotations: {{- toYaml . | nindent 8 }} {{- end }} + labels: + {{- include "common.selectorLabels" . | nindent 8 }} spec: {{- with .Values.imagePullSecrets }} imagePullSecrets: @@ -39,14 +40,14 @@ spec: - name: http containerPort: {{ .Values.service.port }} protocol: TCP - livenessProbe: - httpGet: - path: / - port: http - readinessProbe: - httpGet: - path: / - port: http +# livenessProbe: +# httpGet: +# path: / +# port: http +# readinessProbe: +# httpGet: +# path: / +# port: http resources: {{- toYaml .Values.resources | nindent 12 }} {{- with .Values.nodeSelector }} diff --git a/library/common/templates/_external-secrets.yaml b/library/common/templates/_external-secrets.yaml new file mode 100644 index 0000000..db562b8 --- /dev/null +++ b/library/common/templates/_external-secrets.yaml @@ -0,0 +1,83 @@ +{{ define "common.external-secrets" }} +--- +apiVersion: v1 +kind: ServiceAccount +metadata: + name: {{ .Values.common.serviceAccountName }} +automountServiceAccountToken: false +... +--- +apiVersion: v1 +kind: Secret +type: kubernetes.io/service-account-token +metadata: + name: serviceaccounttoken + annotations: + kubernetes.io/service-account.name: "{{ .Values.common.serviceAccountName }}" +... +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRoleBinding +metadata: + name: {{ .Values.common.serviceAccountName }}-tokenreview-binding +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: ClusterRole + name: system:auth-delegator +subjects: +- kind: ServiceAccount + name: {{ .Values.common.serviceAccountName }} + namespace: {{ .Values.common.namespace }} +... +--- +apiVersion: redhatcop.redhat.io/v1alpha1 +kind: Policy +metadata: + name: {{ .Values.common.serviceAccountName }} + namespace: {{ .Values.common.namespace }} +spec: + authentication: + path: k8s-teapot + role: {{ .Values.common.serviceAccountName }} + policy: |- +{{ .Values.common.vaultPolicy | indent 4 }} +... +--- +apiVersion: external-secrets.io/v1beta1 +kind: SecretStore +metadata: + name: {{ .Values.common.serviceAccountName }} +spec: + provider: + vault: + server: "https://vault.service.masked.name:8200" + path: "kv" + version: "v2" + caBundle: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUROVENDQWgyZ0F3SUJBZ0lVWXA4eG81dDJsSkZQM1NpRDFmSmlyZ0dVUUowd0RRWUpLb1pJaHZjTkFRRUwKQlFBd0ZqRVVNQklHQTFVRUF4TUxiV0Z6YTJWa0xtNWhiV1V3SGhjTk1qQXdPREk1TVRreU16RXlXaGNOTXpBdwpPREkzTVRreU16UXlXakFXTVJRd0VnWURWUVFERXd0dFlYTnJaV1F1Ym1GdFpUQ0NBU0l3RFFZSktvWklodmNOCkFRRUJCUUFEZ2dFUEFEQ0NBUW9DZ2dFQkFNSTdvUitLSHZ2em5mbmFBWERNTzVxcFNUQ0FZQ3lmakZFb2hZSmYKbE9jbkxPTlhiM2Y2c1A1ZDFlbHRMK1VUcTBSVlU1VVAwYU5XN2hxRFRhNDFNUncwSkNEdEI2OHlLZFlxMmhaZgo5N2dBK2xqM01FSlU2UlRBS0xyZzc1R1JoL0FiTkVJZ3d2UHVIS1c2aE1idHdPeU05REZVLy9XM3hwdXNhbFh5ClJNRnpBSGZTRGo5Y2krVXlnVXQ5SElOV2QvU21NR0cvOFBnaGFSaGZFNDR3UkZNcVllemVsaUl0MkpJczQzQlYKN0hxRzBPZXY5V1BlWG1pYVpVWUtRZXRIaVFxUjE0TXhpdjFJR3pDbXd3Tis5YjR0WnRaVGE1OG9NNWRQWGZiYgpsckVMUUU1T3NQYU50TXRFUjNNZ3hvdkROM1ZTQ0dIL08vR3lhRVdWYW5ZNVVGOENBd0VBQWFON01Ia3dEZ1lEClZSMFBBUUgvQkFRREFnRUdNQThHQTFVZEV3RUIvd1FGTUFNQkFmOHdIUVlEVlIwT0JCWUVGQlk4alczZkRWVXAKVVJ0MXByaG1ETWprVmlrZ01COEdBMVVkSXdRWU1CYUFGQlk4alczZkRWVXBVUnQxcHJobURNamtWaWtnTUJZRwpBMVVkRVFRUE1BMkNDMjFoYzJ0bFpDNXVZVzFsTUEwR0NTcUdTSWIzRFFFQkN3VUFBNElCQVFBV1F6NGQzUXpFClc4TkdBMTZaUGFtbFZ1Yk9MQjVEdFp6MnFyU3JuM0RlT2JMSURTaEluVjNxdFJsRHg5SFlKTFRDQTc1S2V0MEoKTlRzeU1jVHkydHhkNEk4aGdkRjMwWEplRWNpTjl3WjBtS0VlUC9ZS0R3ZThWMlh3V3E0WFlrRGVjaGxXSHBabwpQZldjb0xwckt3VlVJNEh6YXFrTm13Y21NVUk0eEFzQytTTGUxbXJlYnNlS200OW9Pd2RRcy9vUFZMSyswbkVwClJ2RDBhT3ZvaElMSWEvMlp0S2N6dmhCL0wzZm81cGc5RXgvMEpEQmRESEllZE1hYkQzcW44SWRzZStQNURmd2EKSnUyQ3R5YituMVRUUHhSRE14czJjRmJBNWlycisyQVJKZDhqdEdTKzFmeXhvZ2pPV1MxUlI1MjNGK3FJUzNzdQpLaWJHZWwrZ0ZQcHEKLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQotLS0tLUJFR0lOIENFUlRJRklDQVRFLS0tLS0KTUlJRDB6Q0NBcnVnQXdJQkFnSVVNNTJ1aFhTZVRDaW0xcG16dWNtL2NuSWdOcDh3RFFZSktvWklodmNOQVFFTApCUUF3RmpFVU1CSUdBMVVFQXhNTGJXRnphMlZrTG01aGJXVXdIaGNOTWpBd09ESTVNVGt5TnpBd1doY05NalV3Ck9ESTRNVGt5TnpNd1dqQXRNU3N3S1FZRFZRUURFeUp0WVhOclpXUXVibUZ0WlNCSmJuUmxjbTFsWkdsaGRHVWcKUVhWMGFHOXlhWFI1TUlJQklqQU5CZ2txaGtpRzl3MEJBUUVGQUFPQ0FROEFNSUlCQ2dLQ0FRRUE4THVHbytBcwpJQ1lXZEpqQkNZMHNuRi9YK2pGMXRkY3JRek5pUktFU0ViNWRzRGl5OTc5YnVnQ2JsUFFEUStnNVdHcVhYNHBqClV5WlpFM1p3aE91ZklTbEdLMG93MWFNanFTK3BGbFE4NUtSRC9qVXRMUFJVSnVRRittMll3SWQvTWc2L0I3UWsKZDE2NnVKa054UytNR1pDaTJPWVhlb2l2bk9ZN1EwS2ovMHZJYmM1VnQza0NSVmcybGpMU1Fob0JkKzg1QUhNUgpqZVJqWk1lWUVZRjJIVFZ3cmc0RHJDL3IwME1WdERjTnFzNitNN1laL3J6bnk3M0d2ZkpXZldvQjFDNHBpWmxnCmZ2VWNTREw1SEFoaml1NWNTZUlSN0RUdVZ4N3Q0UG9LNkFxVWtQeWdEdHExWmFMeWJYVDdYNmQwNzJkUjVBWE8KbldGTFBhYUdKOTc5aXdJREFRQUJvNElCQURDQi9UQU9CZ05WSFE4QkFmOEVCQU1DQVFZd0R3WURWUjBUQVFILwpCQVV3QXdFQi96QWRCZ05WSFE0RUZnUVVJa2hWWUJhSzlDY3ZYRzhGTTJqS1ZaMTZvWkF3SHdZRFZSMGpCQmd3CkZvQVVGanlOYmQ4TlZTbFJHM1dtdUdZTXlPUldLU0F3VVFZSUt3WUJCUVVIQVFFRVJUQkRNRUVHQ0NzR0FRVUYKQnpBQ2hqVm9kSFJ3T2k4dmRtRjFiSFF1WTI5c2RXMWlhV0V1YldGemEyVmtMbTVoYldVNk9ESXdNQzkyTVM5dwphMmxmY205dmRDOWpZVEJIQmdOVkhSOEVRREErTUR5Z09xQTRoalpvZEhSd09pOHZkbUYxYkhRdVkyOXNkVzFpCmFXRXViV0Z6YTJWa0xtNWhiV1U2T0RJd01DOTJNUzl3YTJsZmNtOXZkQzlqY213d0RRWUpLb1pJaHZjTkFRRUwKQlFBRGdnRUJBSzZITWdSK2hwd2paQ21mNU5zekRTSHI3ZFlLWlhQNExyY0hQV3M5NG5MTTMzVVo1NzJ1YkdIcwpkS2pSdzhZRDBjbmNyc3lwc1ltRWdSNTdVK0RIa3lzMzk0d2tiN1VPd3kxWnZkNUlJUlhkUDBjRHlsejBRenFNCkFQblFZTitpc21rb2xqaGs5ZXkwUWJvM0NtUGpNK1VRY0F4dVpRdEE0TStyaUMxK2prdWRlMXVZTDBzekM2WTkKNEtldGZ2Yk5rZWRTYVY1eUphUktDQmhSY0M0L0dqcEJHL29kUS81QWZCUEFGalpxaGNJSldCclZZYlRRVkM3OQpoTUExaXdXSlBtVDlMc2pNU1VmeEZUUHp4Um5OWFFpS0Z6NWtUMk9pUzFucWg4YU9jeVU5WUM5Mjhwa2lmTkpWCktva3VEZXpKRk03aWUzZCtFY0JrMVY5bEh3T1dkdG89Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K + auth: + kubernetes: + mountPath: "k8s-teapot" + role: "{{ .Values.common.serviceAccountName }}" + secretRef: + name: "serviceaccounttoken" +... +--- +apiVersion: external-secrets.io/v1beta1 +kind: ExternalSecret +metadata: + name: {{ .Values.common.serviceAccountName }} +spec: + secretStoreRef: + name: {{ .Values.common.serviceAccountName }} + kind: SecretStore + data: + {{- range $v := .Values.common.secrets }} + {{- with $v }} + - secretKey: {{ .secretKey }} + remoteRef: + key: {{ .key }} + property: {{ .property }} + {{- end }} + {{- end }} +... +{{- end }} diff --git a/library/common/templates/_helpers.tpl.bak b/library/common/templates/_helpers.tpl similarity index 100% rename from library/common/templates/_helpers.tpl.bak rename to library/common/templates/_helpers.tpl diff --git a/library/common/templates/_istio.yaml b/library/common/templates/_istio.yaml new file mode 100644 index 0000000..0648d56 --- /dev/null +++ b/library/common/templates/_istio.yaml @@ -0,0 +1,63 @@ +{{- define "common.istio" }} +--- +apiVersion: cert-manager.io/v1 +kind: Certificate +metadata: + name: {{ .Values.common.fullname }}-cert + namespace: istio-system +spec: + secretName: {{ .Values.common.fullname }}-cert + commonName: {{ first .Values.common.domains }} + dnsNames: + {{- range $d := .Values.common.domains }} + - {{ $d }} + {{- end }} + issuerRef: + name: {{ .Values.common.domainIssuer }} + kind: ClusterIssuer + group: cert-manager.io +... +--- +apiVersion: networking.istio.io/v1beta1 +kind: Gateway +metadata: + name: {{ .Values.common.fullname }}-gateway +spec: + selector: + istio: ingressgateway + servers: + - port: + number: 443 + name: https + protocol: HTTPS + tls: + mode: SIMPLE + credentialName: {{ .Values.common.fullname }}-cert + hosts: + {{- range $d := .Values.common.domains }} + - {{ $d }} + {{- end }} +... +--- +apiVersion: networking.istio.io/v1beta1 +kind: VirtualService +metadata: + name: {{ .Values.common.fullname }}-gateway +spec: + hosts: + {{- range $d := .Values.common.domains }} + - {{ $d }} + {{- end }} + gateways: + - {{ .Values.common.fullname }}-gateway + http: + - match: + - uri: + prefix: / + route: + - destination: + port: + number: 80 + host: {{ .Values.common.fullname }} +... +{{- end }} diff --git a/library/common/templates/_service.yaml b/library/common/templates/_service.yaml index e52a750..6c565a5 100644 --- a/library/common/templates/_service.yaml +++ b/library/common/templates/_service.yaml @@ -4,6 +4,8 @@ kind: Service metadata: name: {{ .Values.common.fullname }} spec: + selector: + {{- include "common.selectorLabels" . | nindent 6 }} type: {{ .Values.service.type }} ports: - port: {{ .Values.service.port }}