From e2798e0f5bd6df73f7ab4aa46928bb9733d5e8ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20B=C5=82aszczyk?= Date: Tue, 11 Jun 2024 15:40:45 +0200 Subject: [PATCH] feat: don't duplicate dsn if its provided by extraEnvs (#689) --- helm/charts/hydra/Chart.lock | 7 +++-- helm/charts/hydra/Chart.yaml | 5 +++- helm/charts/hydra/README.md | 1 + .../hydra/charts/hydra-maester-0.43.1.tgz | Bin 7583 -> 7580 bytes .../charts/hydra/charts/ory-commons-0.1.0.tgz | Bin 0 -> 687 bytes helm/charts/hydra/templates/deployment.yaml | 4 +++ .../hydra/templates/janitor-cron-job.yaml | 2 ++ .../charts/hydra/templates/job-migration.yaml | 2 ++ helm/charts/keto/Chart.lock | 6 +++++ helm/charts/keto/Chart.yaml | 5 ++++ helm/charts/keto/README.md | 6 +++++ helm/charts/keto/charts/ory-commons-0.1.0.tgz | Bin 0 -> 688 bytes helm/charts/keto/templates/deployment.yaml | 4 +++ helm/charts/keto/templates/job-migration.yaml | 2 ++ helm/charts/kratos/Chart.lock | 6 +++++ helm/charts/kratos/Chart.yaml | 5 ++++ helm/charts/kratos/README.md | 6 +++++ .../kratos/charts/ory-commons-0.1.0.tgz | Bin 0 -> 687 bytes helm/charts/kratos/templates/_helpers.tpl | 13 +++++++++ .../kratos/templates/deployment-kratos.yaml | 6 ++++- .../kratos/templates/job-migration.yaml | 2 ++ .../kratos/templates/statefulset-mail.yaml | 2 ++ helm/charts/ory-commons/.helmignore | 23 ++++++++++++++++ helm/charts/ory-commons/Chart.yaml | 25 ++++++++++++++++++ .../charts/ory-commons/templates/_helpers.tpl | 12 +++++++++ 25 files changed, 140 insertions(+), 4 deletions(-) create mode 100644 helm/charts/hydra/charts/ory-commons-0.1.0.tgz create mode 100644 helm/charts/keto/Chart.lock create mode 100644 helm/charts/keto/charts/ory-commons-0.1.0.tgz create mode 100644 helm/charts/kratos/Chart.lock create mode 100644 helm/charts/kratos/charts/ory-commons-0.1.0.tgz create mode 100644 helm/charts/ory-commons/.helmignore create mode 100644 helm/charts/ory-commons/Chart.yaml create mode 100644 helm/charts/ory-commons/templates/_helpers.tpl diff --git a/helm/charts/hydra/Chart.lock b/helm/charts/hydra/Chart.lock index eb6906b5e9..3a5134a0b1 100644 --- a/helm/charts/hydra/Chart.lock +++ b/helm/charts/hydra/Chart.lock @@ -1,6 +1,9 @@ dependencies: +- name: ory-commons + repository: file://../ory-commons + version: 0.1.0 - name: hydra-maester repository: file://../hydra-maester version: 0.43.1 -digest: sha256:d28f966a3e6b68126e932e9a6357aa1aea15496b5b6006f2d1d4f2f62e219a64 -generated: "2024-05-23T11:52:47.4059612Z" +digest: sha256:3ec061d9abc96913b4991d2f57557d144829945e669329e4d8723d896c9a523f +generated: "2024-06-11T14:58:01.616059+02:00" diff --git a/helm/charts/hydra/Chart.yaml b/helm/charts/hydra/Chart.yaml index 5e773ab8f7..5b1e874d61 100644 --- a/helm/charts/hydra/Chart.yaml +++ b/helm/charts/hydra/Chart.yaml @@ -22,9 +22,12 @@ maintainers: # (optional) url: https://www.ory.sh/ type: application dependencies: + - name: ory-commons + version: 0.1.0 + repository: file://../ory-commons + alias: ory - name: hydra-maester version: 0.43.1 condition: maester.enabled alias: hydra-maester repository: file://../hydra-maester - # repository: https://k8s.ory.sh/helm/charts diff --git a/helm/charts/hydra/README.md b/helm/charts/hydra/README.md index 6af1e50945..aa00e6d7c3 100644 --- a/helm/charts/hydra/README.md +++ b/helm/charts/hydra/README.md @@ -22,6 +22,7 @@ A Helm chart for deploying ORY Hydra in Kubernetes | Repository | Name | Version | |------------|------|---------| | file://../hydra-maester | hydra-maester(hydra-maester) | 0.43.1 | +| file://../ory-commons | ory(ory-commons) | 0.1.0 | ## Values diff --git a/helm/charts/hydra/charts/hydra-maester-0.43.1.tgz b/helm/charts/hydra/charts/hydra-maester-0.43.1.tgz index 2731e5c3432cd7d0be1f82d0d887fa864c16e522..43ba043a4e59e1c9478f97b77d5c49bd1aafafb7 100644 GIT binary patch delta 7469 zcmV+|9n#{TJDfX^uz&8o(ca#J-Mw!{1LOn1ev784K zWq1O$ff~qFjwgWfJS8zwm<3CR_9)uhjmE*3ChTA2s>}Zpr3Dr@tpL``|9G@J-fhVL z-o4TItNeeCYX`y*o)y^?b6_*zSWA=uLLtF<%2pYsGO&*iSwZCl#zCvrk|^O5aE5cK z>Mn?ojIRRs=6@G+|Ab^jPGH{vc(K56$f)EjO)-ZBT4Fdnd3^BVF(8`2$>W1ZfZ`Yn z0g?eqQ#i#j$5LY_7Z{Xg5IKsmfRqS{6PV(ZoksztXqw{WS^0hfuipfw)l)*}saF>= zmf#4EW?*Y+&~b&=IZ0DEM>1Y$g~zdA1y^k{nyz5RS%2mMBNB+Pq{9gidKbu?GEV3m zm|S2k0-+HoaeK-VJb@WX1r7p|p*fxe02VXN&%QAIe#Nm-UYE>MXE+Fyc^oL@AN>^sK7XS zucSf4c{kLEbrri8y$_&-I)Qr05{r0&GYo}LqGHE}MX9VC!BezS=nNEJ2Ee%aB?bY2 z&;ZON?|{B|atbjDW6UMwNE#_wc%ap2OT`Ob2ze?Q$Hz!6G+!K6XC&7U9V&zh92Xp` z;eSeIZia{QxvKC=y;_xmGh_T5@dPKwoJlruEPqt$Fc3M86)-SEDX7%jL<^LaYIOtf z;iLYy1Mn|Jt^%d$3OJ5gmSLIzWm1hE19Alko}nU@o@!9~OEO5Y(rI!*1Rw!OH7#Po z3gMu~3#NvRqL>;T%2JBpg)W~8286~OBY%N~GPr1L{&OjS7Zex;OqYZ+n&}~RPUHeo zB4vsl_!6PJAc}aQka$WcQG%v5-ij5FFgQoF)*r80K~0~{=$)}NW#@#>T>~khsuW6o zFN7|VsWvE9N*nRjT}=p%Gp5OaAuf2jf+^QJ8_kqT`nDqdw~>XLs(He)Vg~@?ynmR$ zcr?n&CmGJP^4lFfCH5i5e-v13SM8pvRw_J02uFoX&2oU>OUx-sVad`$3p{==IeMk< zj5gENjUIq(6_y26Lq-iw?47%R=E|DeI?$)8-OZ3SdPanXSjI!EaECrrRgPnnJg4bu z0+JV4cUJc{X9;LAQfg9J!I1G>OOe zcJIb}`}YT>tUO~0h7?V4Dzw&8qX`K?=2{6U`K2tur#Qv2WPD;2>CPHmLo0ymw9U?q zs2W5mlgM;eD;p&!GsY$`MSr~P5&wvE2g_u4u6wUO=^8&J6S#i zwa{<0=s5+}mLpV1HFLVM-Be4cFb@=!%A1lq0IZUc9jg%x1_PQfDFz-6dJR2+!MGBd zQ#;mGQyG>>S)X@}S>SHfssSYlP9Py1$1+_hAyMNvXNeix%IH{-`9iI^roZD@n{_!$ zo>~xY-U~x`tcQ+j&VLN0au8X}>Z()&M&5Cs;){Rj6) zo)IA|a;T6@&xqCnKZs*>_kx{a zTFrb?)uFnjpOr#5#+>L0kI_U-;Qpv&)d8Ou#+;H&8NoRc%70jPyx?rkkuoO`p9_!R zYAKr$O0pt@nKnddyaFWQd_m%cSv}&!HxN12_9Tr-iW8%bS2Q+=S>ss2_8*Q%i;nT@ z7B9&3Tu*X7DLgDa&0`inWyjh;I=J4Y9MNn>s9MLlAGWAl=shAraxyIxm>-K|jwRHV zazUO*656*5 zoaUH|Naoje1#a;F@9y1e`v33m?v1|s|31g{;luC_EJ-#2fh8!LR@t%-GewqofhTZh z`0-<)N(GPK=XzOd9dE#9#?I1vMu9CCs>Lv&7zVYG6@RH30|=`!dcho-4JWlMg6NfT zKC6=6U}{0Gej6+gIYtr#D%+S9YVH0ZJYg44w4Z@o%&lLHZOYr4`DdGzd5 zl_hkpwSU;{C^(t{$EjM$8z6RxVwdyg8Ii`*IJN#6?J!WtTWmKFSe2|3naoO>x|bzg zU76kjTM<4L6{P>totQk_p0^&JB|Qw3=)@4qR4#F?J-sx7IVV)kVDR4}{BJR6Kr`)L zX0-MFu8l&Ey-IYf_f@ghx!_6(GKSekHtVv3-hWQ{G&jHPb{<@4-#&^l489w{;O*cl zvcQ$uoFs#D4OFWoUZCPIcIW{2ZjkhV`&|?b?3Eq zOMh?RiSO6$R1~`SPkq|L8*LiW0Jf~C1<{vtgI7}u``hU**Dv4Q^<1m#cU281qAN|JI1Nm-c6*3tVuj2m~tpns|J!Y~Z{5EYc?Vz?X!XM`pb&t(>5o)cu# z+)|lJda5XWB4+1D5v04Go6#b;07__rsf0ZP!PL_`Fpe~y1bMDISKL&P?B6I$`vKai z!>xtg?!1{UY&-tmys6v0>0YbSE?}w(&m-6J#%W)<*%uG<6j40!w#h>?oAF@1$A9h; zT-oH%>zc*^oC>o&sQJd~oW4wVZmdIB=~6XbE;Yc`46^T=fbBrrrY+CoXeHtXn)H25 z+xOV_XMN6YqZ@3u@^f{x-wdLt;IzUkg6(l=^?YeJHES?DtFTFTy9wIg_YL*7<;VuN zt*6nvmey9PV3)gu!r$gAW!hg!)qlEaB6MKjHLf2;RY(qe{5Wa7mS_$iKMtCZj=jK| zR-G#9rjA3*vJBB=;yqHx51Ts6cT-oz!Z5>{b;UfNY0Ujr;8g zr7p}|sZgAeJk&u>tA~BUv40t)#q$zqw!*Qxu#~9?r79IFD-ri1xDi+<9hZL0%a%-U z1>u=ASx1M4l)ZAc#d=k7IdN0G2&DU46)5%Z7 z27+xOYa=M8j#g*H%yzwQ!tL*Si_-Ni%x9Ofv_pRrbJGrSk78I;r+;ooc@%BMo>nD0 z!cx74*Hml~rWRe(XEu60@yj=DtxH*n?OD%m_yVRN*S0qQQ1tpf997s^Jpte`){M-~H=dffNxnnS0{#SD#r1HR;2p?YLReaBNT(Qm>^4E7mwsfkZ ztmiz*I@=%4e=s1{)-S$ zPV|WqF@e{nX2kd^5{tnbbLOOUcfjibQwZI&X9@>*q5eQ0;V*=(xWs&_E6uS~MN=a5 ze;o>~e#AONN`L(-^2Gki-OB{0SYi#Tfnyh5_6St7<-R80bkqMwLK8ygpN$RS)HWyz z6V7iq(kXs=>3=1$gPrnls(WJ2>r_$g-dX3IB~jVfMp0G0IKeZ8x8uO4nf>>3 zOxD+b(E_KL&R2qOu#HXmzxK!b&HO*({oSwYzt3^)z%h~%b8{lluwI|xg=s-jr4t}W z@fn(95q||c=G>+z@|Y!aQYD97JcMe$jY>$6WHxPKFg^E|i{P0?9!Cz4qn-1$Gj4!lB~ zutLDmqsJnMa?X@K3?hjl_DvKVHA8XVQCf%boNl**p>pef~{Z7E_eW@z9nIP2rHx8RMB2ag_cbJCEUpR;n7I%ZjzBogi434KdhJYD3wq zL2v=T;uTzg>Iz(d%@Cr0mAMt+BDe_EW&XN?uYIF&(^Cyg$qQ^+zljVLO(d%Ljem7K zsi!1q!f1uQw?S=AM$-w@o*>v7o(=!+0@VnzQ>$DB?)4i5ZcUAL;cc>WH38P5p4#2n zki@77%?tf+2!lt^!Q{ioy92u?G5PROH}t6zzpTNqwxQAP`kGWP>wul&#r<; zcM7*H*xLehnbFl*dHbQ&S$)fK)vQ}j6BijduQ8&QDsDTF*B__#ecbhmxqmUgHnJV9 zhrB_dZkp}Uv>X)%zqQ1{)DxFfa}Hq zuJ`}$j&?`Q_`e6^`}e>4e?Q07POw4L+L~&eOs$uzqVdIA;P@Q(}JV4fq^;4Pw2cz5wE|~Df3y5Cr~Q! zBmg&2TU6Y!^W_+&`2vmI@tSynGgO_bVL7G;$49SrPa7`)YM3&nC%rjp@ z9}bR>JXkqrIp%&YY!?Gxj*`ZiOTYETD}aGQ+1e#0DV4#Yqrg-6XPRVlK58a8AjeC3NSsYk||z&T8Iu{v?zZ*tlIXv;vN` zwO>#VqWwq?JY~EMkI)%w6TzFYoJ_?m%L+>5YN*A7Obf}l7$$0UH56nXA|5Y@#IY50Msp?^xv`mQuk?_=6z`NIXa|)u!F1m%7O6*ynJ14=UzApa zW@DRgX5Ca)6&3Rop$VN~ZU%rh1{BnCW21|4*3T`9X-1?dlmCNc5gck2q%$e%5Sk={ zBMOHo!|5RsIBEe?to)3uQydbZV#oH(Yi6>kS1{DAy?^o(i)_VhUvHe|IIf9nf`v|_ zAS9AH^=C_SR#%?}0hg^FCx?uS=bX$5?I^PWPjwx%!02I00dbC2T1l7^aQOV>6qqT~ z0g6bRb)v8Z5&$RIIBj2^9C;%f5ODhf)ElRD<1S)Zl9`By3H)~c-DLQ~@Q2s``Axj} zuCr|K5P$JsYdW;4UnB(67+;O%wz5$O=W2xO6{Q{~P7}BmgpuVnUDn??F+7sY$uCHD zhNk(aoF%hUdp7tVsP<6pu~c-=-S)+kz7{A_}3E^$b`>q{PYHUU)89 zj3JMjHWVk?s@?H^YRI{n`!7$9t|T5UhAPoNIfj=fPYfIMqT6H^wuF-m>d72D9!P=H z8Gk6cYqBZD0;tXkn?CmWaR-D_q1^h4&9iy}ibK9#Ykin;0CeitplX7>ZzSPmoi-6%1s#+3d5TUMl!jaRT+B(z=5w4Vdj2mUGr&X*{XVWSxExKpREe+xdqnhDM&AI^YMI#ThPH31GS)W}U+HSm!IZh1w zyNA9$fZ^-C^h;x}5Kv}3t+w=mIOy>nGa!-)#*BH%&t2I1x$<4JFOMgA@1(rz3`(pf#a3O0{qfaW(fyTNS5tDovS zvW|v^aqn753*W&kMe{E8WUd#E^e|wv*}yPn#+>uX&IxQb1H8m)HtmJf)ix3CW1&6T zvq5AtFI=$M?8>CpAB?>Yfq#z~F9ksdv2G9oJJ@^SeKH}a(sRD+sgj}hBr7uWjl=!5 z6eU#RdCxpw@bp>~Rd$^vsQS4bJ)y|g%J25{Ea|pRUA^=2v#ufM6HMoFF@gJCa}r$E z&Vg;+Egeotb^U&RCSG!KrFrasOkH?nK5yZebH2db-2Kn#^JnlcJb%>z_orA^q3zu& z4x1oi?Q_=0$E*m(5}%Y{41cnxZ=rF5TD zxJgTR>PMUMDUlrUmHrBLM@?F!Hf>P(J<=|mde{r_KCB`!LTwxJB@PREM%g(H%?Ffv zVCPIov$`r>tDIcTWPd(xgE~2Cna@UF3JGSh*$K&a=2lKirx3g;`ET!E=GSG~CRX*b zqSsIOl|9wPvB((}`0DG>6CXksgR149Ypj0-X!>9sQr_A%MpQ3C?9UwpBH7`lltUL9hc-`7|bJcB%Y{bD8xD2p0Wq-F`PVe66a@quCTtxy- zRn6L-xc!oVb~}R(@dyRZk%?^6J7jET8tn6v6zWYu5 zaJx%6t!1Y71%Lc2(Y>q=TGq>BSigQRENs*D@*88FVF*y}XnZT+=#h3v=17Qh#=9(S z&v?GK-!lYVfvz!F((qeF!%_IpH@9Ag_SYTv==Kk{ev8(=zkTQ1OOyMILJ6hm^I12p;abh>`5VnZ zdOJme#9NnE_T!qujU~jIlGJ=g{r@-oHx8vEnz&VySxk2>rSwuRDZh_u&8lu4sAnB# z7FZs+3BlW@AY(N--*WTG3V7MA}&RX zlQx{j+6U`r+T3DsTyTyP8+p;Y4zDAp1W%ctT_)28k=#O&Y~|neQ*V$m$gzA>Ivjko z`?Y`~$U3Q8Cs#&l4q4JGoLhD1P%pVmPYg)23hV62bueBdtv#`2@bBZMv0f|+Kg_OCN z42K+@M{^<<#k3HZ$Bar$WfZe)$oOiQuviQ;q(`0pEhLg89)FT-K1|u1g?eB{VmS{e z%J2kg12vGV98Un{c}ilWFbkFr?NPM18;yf6P1wK4RhR!IN((G*S^=z=|M6&dyxWlf zy?dj3U*-RETsshk@T|zDm;;*u$6BHU5DE#-Q?|-5m4SVH$O5WjLq;WMX^J^4&=SMp$>W0;j{(sHP97gT0u;ws z2#^d=n!+iLIhGnbxxk<_gUC^g1*AksoWK;P>^urEMbi`~&&u}`c>N|Yt)3D(PrbU3 zu>?nOGy_{pgN`e_&PkfWIg;^0D?E+`E4XTt(R2kf&VMow7?D7PB^^$H(7Qn9lyO4m zz~lmR5eSVyiQ7|_;0er7DsT{x49)Q*0MMvD=PUTd7f{ge15kWof+&(sfbmr_tgFY~ z`c_K@020kh6(6E3xxeRX9jP`TFVYlpmXdfCfWAA{HxoFTJ!A5iW1&Vy(5xa1i%d_B zi!`-7^M5#S%o4~sVVuZSu(MOn7-!{F5)o!*g_zM8=TiTek$J(jvLEIw2_1wm=NM;t zdKw1q;bDq|c%~A#3GD6d?NeZ?goEhWih$lEX=1j7QWBH>}hk?j(tblQJDLW^0?ixr5Ri#k! zdm(g@OtnF=Qrd{G?rK7CoH0!X3~|BJ6->F-*=VLz(zg}qzl|*1RLv8X6*~YB=YPcn z#-mYIKFM&VmEZ2@DX|YZ{-eNRyK47TwNl|3LO3d9YL)~1USdvB3QLw2THx_}$Xy0f~sIZHr`ky4Y&Dt~V@R)2C@e`v@!6F+lSwG5M5;Oihae zU6L2{Ks;mmjcv1h{8C^(f&2UWyL&!V|B)`&dMa=nvn)U6Y(`RSPy#U4|4Bh5$?zj1 zd{qb4)Qt$myrY|^U_l~8G3(uhR>CiZ^+{+ z{fd<;u{TlOR{N7tr=HFin7*U}Ng`%M+0zqv#GWy!Opl~UT`}FQa(|eVYEtVH+sX1F zsD*x`Mb9a)wj7~Cs+rT3?WS5ng?XT;RNj=_0brGk>{yLpFc{E;Nipzn&}--k491nv zoZ7Ljn#!<5%KE%(%mR0-Rt+dgZ~_V8IF{*335goVIZMpgRz}By%ol3SHT@mO+N{f2 z^3;NG^IjOjV?A_KbAM(im4nC<-VMB-;`Kob{(Uv{oYii8Jle5Sk>3AFgeb5W?mxIc z8kaVsHgPKVjZj)!8Rx=v`|NuG2ggTNs{bem$HLG9^Na{#kwb-KdPcMs_(2@2yBF*X z(`x3Est(mH{j3ziG3G>1c#I}u0{2HHs}A_QFy@qG$_UPpP=Cg<;{|7Pj+8lp_*{4d zS4-K9P?8lH%(Njw;}swY=L-@q%<2&*zJbWGwkK&!Qk)odyrQu|%o@iEw*PQET6BzG zw|GIO=X#R!N#SAXX&$rqDLd8%(!upE<%ni8Le)CX{jf#dLhlg~l9Oqn!2DPwb1b2@ zlne4?I?*c^y?^$urYAK&7}PUD50;3eMwwX3Wa#}%ifWI)v@7K=dDZ=Y5@&gel+eCi z;55fvL^8j&D{zDVe|PU*)Bk^ecW?aF|Mxkr4WRVsM=KG(}y>v#h;Gj^8VGYV|EP%VZD#W1Litba(=7(iH+(F^9tY&fZ95k#+y z^I4UAzQml91jB_=;WUQ(yZR@|PK()$yoW(p0aFWd_1j>1$T5-_P}#<;P;2);3Y3x= z!HJr6H2zWWFKnRe@=~>-`XXS8V^jzXf@Rp--!Q$N5u7GQf9qAMn;eLMTho=M$fIYc zsw|;%t$)RCN5RnyI8N0{-T<*n6uX=^&xkah#;NtsXorD9-eS9fz^Y`O$YfU1)V(a} z>dN#M*oyF}s3859?!@Hb_Pq7*Ea_pOL??z=rgDjE?dhcv%sHWQ27~_=;eU%k1Da{~ zGNY~UcWo4U>{X&;y|0S3&IMOWkTJ|QvRRiM^nZ5Br@8rUxAWja`}R?cVes7m25$#f zku8>Gj5=#_1E!{w0o7-}fA|1|#%YoC=!*zGehd~k%_6ZF>aMS=V`-x+ty>9v_|V|K zCoqO+2jw`5AQGsezxqv?kCQGo2hMiC{M9~~4;dE8U$vKmoJTOf78B6Q9tvj!^ zTYq{3Pkg_2r=rlsf9lf~-e}X12C!vCEr`CH8@!rQ*xycfxqkWXuIE}^C%<2MLjKHG zpZ!;P$FIK|ykY-$d~Y;r*nba3`}<$*zt3@5`B$^kEm}>~zM_cCrjOkZy1iXFF}Q6- z3ucI92%1yDj0OeO3Y2&SIifpMhqB*=5!x#FgRWdBB4+7Hl9 z9d0e`cIVA>VcYTd=1tx1P4`-rb^%jWcpkZyH%|M?&Axb;r-JS%poy+fC5^zHg|vEk`!E zZ9R?VwY0WU1-slO6#h0}DbxN+s(;o^6QKhGuW|h-szP$$N#A3V`UbbX< zD_Ex4(j{gg3!s{c#`m_uyAde1UAxu3Uw?bvy!8|dq2>k?PEVLrQ*r5*a4n45NpdlbW(I)8OL%A;s2_OvS5 z5tiyTyryD{FtzBKKC{v5iC?~HYhB7pY|naj!`Cz7-4^iHt!!$;H|wgf8_z)WVsSoA zqdfsLJ_>y?HJ<{ZGB%|`pbA&{6b-iH0(~LvQ4N=9|4aM7{_atq*IedJRx7M#_S$MNM@A^c?M9dKiAazR=aD|M?WfH#Grl(Es~; zt@Gde_s3uN|31srRPd!{udjTrq13(QSm_j+Kuc|UZlUXM$A7J}XzNSMwlBZ66|sJ! zuAxuKOvh<&@Rlj68!{iJh3d=+OL2`4TK-TW7mSlXH8#=N_a^pad>v+R)etXIPM_Yq<_?}B2VnE+`UY2iY3;d8aQ_0Wsg8LTkdP}O*j32Bs3v({@K_NPHlst zFyZ`$Bc0->m;P50JJ=}?r@ANRyiOI>?wxhcSrV0vZ4_12ixWIkcsm}gAz1*>9`jcl zz@E@mto*z(v@MBxMC}s8c!L0S$jJYLa$INA7ZbHDxqtR|lgMj`Vm$;=buNcD|z}f!c*(z8u_@2IFzt&bi{iD=H^Cvo!Ngs z$7Fr|7cFp_>3k*l2HV(_|7(A|-^~9r-rxJW{`(x)4jdyXF*hdy4eRw8UYHgnRXPE3 z6rZ6v7JpH&W6o`gBF`C@0>lERDa=zgH9k5*=XZhQ6iKqgCKpKc9ML4$0gC5ZF5y*QN{NweDX70WXEvWLLSA3f`4%&GPH?&gK2whgJP3;81x@?HSj#3-S zW(|T1_!Y0<0#sMv0&Ip5{j1Ea2p7Rcs4nx@{j2@bcfkd8N1R=NkUG)W1-u*76F?2# z!Ns+6P;JOR1ue`vLYFRJ%2=u})CavaT7O%me`-UwQG->VDM?K?s{>K(S~{Zd0t~(0 z?d|RD`*qCQW*r;DSfj5#456!DE2mbwv359BtzF&b#*|wItc%dNun8j+fDa!PfSyzQ zx>_SZu3mdkh06^lgMkLNRnCMi(0=S)M<=hBQ=!%1x|p77SV~@C)A~(hsAwWl#eZ+C z<4HXwNfSmZ^t}ygb26Gvp!Nj8*6?ije;24mkeyoPDsZpgC~#|Pv}MsbD}Rtig0d~aRtdJQhL)eqt3#!13*n`}{Avi)vy(;A zm>V8l>M6=P>Eg$#Ho4s_+lT;*`f`zVP5YZ*`B~YbgtPqh=uN#d2Tz`K_Mi!=%6@hg zJi1f3ZNc6apv#P|&dS>ltFZ|w)VKFgeLq3xq@g8O8tpLP3< zb1ofg1YN9k$f`C3{WQmV0JicXdqBLyUo{}@+{_wOPhw{ephWXJq*|)x9w08iND0P2 zI@q$SS~;6_JwF1lPh0lIvVXO0_(pL*O0BPOD;U0A&`%%@H<>?LV^BL#UCQBD8;%jdi`%O4Ksna#6uJDnr74#QQX$}`b5MJsE4hqTUm@3VL6VsycqLg-Vp*jz* z7dXvA#Y_WY>+Y?dVhYPARW3i^`Pg-Ut6!95Mf^DX~9w2z`&g2Cv;wj z6DXB<5`deiEh_HV`ErcXe1XR9cul;(8LCdzupHBaw}+ApXF(S9Tco-*EsN9c^TiQvsxPNrg(Wd$X2HPqrkriEl&3=_4w8VWKG5sw!{ z;#d|O4^d7+-G4c14EZeCDJShgqdAj|+}KRDS9-`_ig!v9w1di-V7l)Wi_{~<%#+8b zFG?#yv$4%Lvu-M@ii&xP(1gw~Hv>Q$0}5)nvC+ji>*p55G$T@!$^SvJ2oALh(wP)> z2u%{f5rspP;q(v*9JPQcR(?j-DGrHHv15DYH8a`ND}Na3)?WFEMYiI$uQyI}9M{A( z!9u4|5E4n9`m?1utE*3gfXh~olS9VEb57=jc9hwGr@9VWVDvDhfH+4htt3ndIDCF` z3e1%007WFuI#JjH34jx9oVG7dj=Yf#2)KO#>W$O7aTl>H$xOt<1b#dJZZiB~_`~b} z{3hOf*MC{IcZm3}H67a2FA{=jjITy>TiGatb2Y;Cic${~rwLpO!pQQPF6(cc7#>OH z|V6sJ$voE7pE>&=@Jn>wVMSlTh=e@)?%)ckQntMDUZ zDMr+)T>H6%?%wIF`)Va-l<~2@9fhRQ-Xwur!hbXXM~`m9VTwow(=N=x1#u?M*JAJk zvr{G+kVNUS*~+!%0G|`N=w{9W!}DVkR-}F_ipQq!Z&MBYZNZ5e5rxpodIl^bQsU%p zFFcnl#*jx%8;TQc)$VvdHRRmP{g)?4R}zmFLzU>C9K*|#Cx#7r(QPsdTf#{O^<)kn z4}YY<=?oOzHQAJ60aRy&O&|OGxC26|P;UL_zb^ixC$S$U!(nvib}xl`gvW^RGyAox zOOxfWtnO^lMUf#Ia*Pt~2eOt$Ev0n7*04LwM$=ZC%$O!&Auxxe(9r5JpqK6Pj58`f zze@ONQ?oay6NnISOMjVx-`3WyuOd3ZDSx%`M}heYa>P-FCDy63D{axQ8M@IUa?#QZ zn)3as;nLFG=HykyyUm;%m2Zw|g1OPThys}@5?2x)!2wk~>x5PEvB4hA*AC^ci}jcx zuIkf+f7h5>Vxl@_yoyyXJ7MW`pUPNN#oY96zl)Y&v-^Q#9$U7TvSumIiT!QO)qBW?caHqLGJLCp1iptk13vZ8zS= z94ChT-9uj=!0>hb+n6QY?Wv+9%YRc6lkTZS72tTru~@v-X6RK6%?!Oi(iDWfuD68R zx8qA1soIfskYuEDfNUH;zm(P8ENs4Lgwp!wSnR;iOBS6;p>J|oZ{4q30Rnj6sqA6I z7E3RH$Id-qdsMm$+X)f%3;03T z0?avE5<4}%tJ43ygIm^E(Aw+Wz>Cr(-J=ey)$0YMb*Ug|>8u`I1)E1QK=YfL-C(xj z)lc;uSw};|xOc6jh3{aNqIs8kGS>@7dKj?TY+x8OW6t?x=L9yJ0bXJ?oAyHLYMTi6 zvCtmv*&wo+7cSUrc4boQ4}Zp9hrq{-mx7>!ST_iP9qhgEKA8|y={eu^RLRhLk`1g#<#&5}mULUEuHJe1S=W&B38r(on85w6 zISDRn=fJk^mJX++x_&=D6E8Wr(meJ*rY<}(pSN(#IbUFI?*8ZW`F}I`7oO^X`%^5d z(DrT>hfNT%_Bm@qJjZ;-c;@_BIVVdb@!K=Jdi(piT(>k;c8Ic7Y`l7g<-(n0yau(` zQo7G6+@vKu^`lMslt_;FN`D2rqb4mMKY9%&a&J?sT|A6AhVp|%bA5{CsnqwJi9 z<^xJSuyZD)SzVQ`Rew&dW-=eQL7g16%x9x7g#@$M?1bbyb1SE%QwZLa{I~Zn^XoEg z6RUbz(d#Gt%AV@tSmcZfeD!tci4UQRLDlllHP*iZG<~oRDR1o>BdQl6_GxW>w{|&k zjrD9VhpYbfE_7=>b-lX6nwKPN)}4A$yl!o~x#~7WHsat4Tz>}GnzCCjr+063Ico>U8qkdi7i4Ol#2jO4=f2WabouQ$Jv^PKM}LXHQ*Bmvp@h=(`K%k)aINO` z{EcQHy`3UK;;l<7`*BU-#u8#pNoqc${{I{P8;8;nP28%vQi z)U%E=3oa)*ymyZ;^t|{TFS}KI=qbLS3yH4K9i4#d>cKm@dM$j1P4yz|`tdt4qX}sw zT(7R{8Gl`C&0RHDH!rGdyw({@#sW(U&pR=07W@9beqBN*O-Dc zVQyr3R8em|NM&qo0PI%LPuo5a?z8`j`_W4LR)OQTp-7eXRFJlpF^P#+npJVNQ+#3Nm;s&h~S}mZO5^l_+ z$ta_YBtIZlImRmxDM;Zw#9DbSlmi{zVeH8`*lfspeF_PtLLnS!TT^`SmS3uB`I~&H zsxQ32BRJh`2tY$0Z8;7WA3>-DAAkb;gVC+(&rf>uma7b5v^s%N)o^+{cBGCbQo!#p zs%TSSo;KZ508(A5BZPu{qbuj5o)Y%3nUc@@}Q$zeMe~JVx3^{p6bW} V2ORMB@GAfS|NrE`vL65t005 * +## Requirements + +| Repository | Name | Version | +|------------|------|---------| +| file://../ory-commons | ory(ory-commons) | 0.1.0 | + ## Values | Key | Type | Default | Description | diff --git a/helm/charts/keto/charts/ory-commons-0.1.0.tgz b/helm/charts/keto/charts/ory-commons-0.1.0.tgz new file mode 100644 index 0000000000000000000000000000000000000000..345a34b3a19b6f8aafcabd620b228410522da6fb GIT binary patch literal 688 zcmV;h0#E%PiwG0|00000|0w_~VMtOiV@ORlOnEsqVl!4SWK%V1T2nbTPgYhoO;>Dc zVQyr3R8em|NM&qo0PI##Yuh>$&a-~SxlN$=hE`VMBo_jEN(@og~(s^zN?5|_(f7}}ZH{u4Z6Iv~yni6iz zqsb_vj3nq{D~xYlrz~##R5hI5jvc9^i4^b~ zj4Ij`n5Rv56o6EhDtV-%N_sJNR)753NqIr^^-pt@g~*h)c+eQn>3<&X>pxs9{y*yf zB`}09+iBAKF)>8 z&cLGNUQ`H%`@HApDj`EqnDO?l@UO9$iU&;KUicjT`H#Ytk~L`6u56A3&ErA}g_O{X z>)UIuEs`Ou+Up88t7}Mvb%bWZ2W{IOpU~*L4cd0+$g`kncBZRT@U&6H<8^5u6%rj8 zQ+IF3m_~d}#?%+hSX+^i@eeYD8*YUz9eldDbc7nK+X6{Nf;{NxR^Jg?xmYI{yr(*H W#1TilJ^Ty+0RR6?2X@E+5C8zbR7rCH literal 0 HcmV?d00001 diff --git a/helm/charts/keto/templates/deployment.yaml b/helm/charts/keto/templates/deployment.yaml index 2eb928bfd4..6a1d4149ab 100644 --- a/helm/charts/keto/templates/deployment.yaml +++ b/helm/charts/keto/templates/deployment.yaml @@ -94,11 +94,13 @@ spec: {{- end }} env: {{- if not (empty ( include "keto.dsn" . )) }} + {{- if not (include "ory.extraEnvContainsEnvName" (list $migrationExtraEnv "DSN")) }} - name: DSN valueFrom: secretKeyRef: name: {{ include "keto.secretname" . }} key: dsn + {{- end }} {{- end }} {{- with $migrationExtraEnv }} {{- toYaml . | nindent 12 }} @@ -185,11 +187,13 @@ spec: {{- toYaml $resources | nindent 12 }} env: {{- if not (empty ( include "keto.dsn" . )) }} + {{- if not (include "ory.extraEnvContainsEnvName" (list .Values.deployment.extraEnv "DSN")) }} - name: DSN valueFrom: secretKeyRef: name: {{ include "keto.secretname" . }} key: dsn + {{- end }} {{- end }} {{- with .Values.deployment.extraEnv }} {{- toYaml . | nindent 12 }} diff --git a/helm/charts/keto/templates/job-migration.yaml b/helm/charts/keto/templates/job-migration.yaml index 01ae561594..18b7f57592 100644 --- a/helm/charts/keto/templates/job-migration.yaml +++ b/helm/charts/keto/templates/job-migration.yaml @@ -76,11 +76,13 @@ spec: {{- end }} env: {{- if not (empty ( include "keto.dsn" . )) }} + {{- if not (include "ory.extraEnvContainsEnvName" (list $migrationExtraEnv "DSN")) }} - name: DSN valueFrom: secretKeyRef: name: {{ include "keto.secretname" . }} key: dsn + {{- end }} {{- end }} {{- with $migrationExtraEnv }} {{- toYaml . | nindent 10 }} diff --git a/helm/charts/kratos/Chart.lock b/helm/charts/kratos/Chart.lock new file mode 100644 index 0000000000..a46383dcb0 --- /dev/null +++ b/helm/charts/kratos/Chart.lock @@ -0,0 +1,6 @@ +dependencies: +- name: ory-commons + repository: file://../ory-commons + version: 0.1.0 +digest: sha256:eec8978215334aad38275f0171681f1200220dccef4762ddeb197679fd287abb +generated: "2024-06-11T14:37:29.230884+02:00" diff --git a/helm/charts/kratos/Chart.yaml b/helm/charts/kratos/Chart.yaml index 810216f127..0df15c0712 100644 --- a/helm/charts/kratos/Chart.yaml +++ b/helm/charts/kratos/Chart.yaml @@ -5,3 +5,8 @@ name: kratos icon: https://raw.githubusercontent.com/ory/docs/master/docs/static/img/logo-kratos.svg version: 0.43.1 type: application +dependencies: + - name: ory-commons + version: 0.1.0 + repository: file://../ory-commons + alias: ory diff --git a/helm/charts/kratos/README.md b/helm/charts/kratos/README.md index 8f8b1d507b..dd7ef22de0 100644 --- a/helm/charts/kratos/README.md +++ b/helm/charts/kratos/README.md @@ -4,6 +4,12 @@ A ORY Kratos Helm chart for Kubernetes +## Requirements + +| Repository | Name | Version | +|------------|------|---------| +| file://../ory-commons | ory(ory-commons) | 0.1.0 | + ## Values | Key | Type | Default | Description | diff --git a/helm/charts/kratos/charts/ory-commons-0.1.0.tgz b/helm/charts/kratos/charts/ory-commons-0.1.0.tgz new file mode 100644 index 0000000000000000000000000000000000000000..6f0211b87fe865c239eed92507b81294a76d9b9a GIT binary patch literal 687 zcmV;g0#N-QiwG0|00000|0w_~VMtOiV@ORlOnEsqVl!4SWK%V1T2nbTPgYhoO;>Dc zVQyr3R8em|NM&qo0PI%5ZreBz^_gEW8ym>3kx;ay_+Vg9PJrD@Qy@jI0VRzj#uUkt zloHi&zrB!DC#q2(hZ+fj_#H^j@R37l_y*LrIZt$1YUP4e!L6qaFXiZmg zY`#4TDUv|2(vC)}7P zlTk()Nzo-%7~i>0S6WI;S_5C|=?c z1~-oQ#^4g9h%L7bsh=ayC?jwEYd!>q`uA8G$vwK@uFtHa-W;G7yrlnVezB+j1&bC( z{l5k_n_x;-1tx0{8A#zgBwBeclmi{#W8%p)*lx*Ya}FtHLLr=J+faP;mS3rQ^^<(1 z>QB7H6FA>)2|!Dq>^KgV|AJ5{J^}^y3!`5(oSzNmEmt|hWPJvcy5$UZ>`6UMWPo2` zQq#7;Ja4+A0A#vS=@T7QI*75ehU2$R$}3{1e_Eg{MXt2PgT{DC{}y$e$@YK zU<{wR_h^*^uc1#qJQS!Pu7pg5%E9nt&2w~=jNwZm9JtCDZM_3mpp=kH9Ye`|QV5lw zfknx^s1XeJ#lX*1O2(it=iOW3Z(}hNkC?)P@CE$!4~1(b8_=p-*&Yen$AuIMDWR7) zcQ;;JBx6{0*A;G8H;@YJ2+f5Ly0$+)q475xbnVVj&ieTBswys z?!k~Ljrp2PsW02Hwjw9f?_>