From fd67c9d8c59aa0906a03404acafbf2ed7b11c9fb Mon Sep 17 00:00:00 2001 From: weizhichen Date: Tue, 7 Nov 2023 07:28:08 +0000 Subject: [PATCH] Squashed commit of the following: commit 0c185e7a63b7cc88efa217af205cd0871149abdd Merge: bd1e02898 3f47b3ea1 Author: weizhichen Date: Mon Nov 6 05:27:11 2023 +0000 Merge branch 'master' of https://github.com/kubernetes-sigs/blob-csi-driver into support-openshift commit bd1e028985139bbc3eb7cdac7300be1d8188bf34 Author: weizhichen Date: Wed Oct 18 08:40:28 2023 +0000 fix commit 6270febadec81048ffd7c610b373595de5a60b96 Merge: 697f9ab79 b99e1cf51 Author: weizhichen Date: Wed Oct 18 07:30:33 2023 +0000 Merge branch 'master' of https://github.com/kubernetes-sigs/blob-csi-driver into support-openshift commit 697f9ab794f178ceb6164225a6cbb0f2aa8aca2c Author: weizhichen Date: Mon Oct 16 08:07:59 2023 +0000 arm commit c79dc0f2b6560e19c6bdcfc5460db746095f98af Author: weizhichen Date: Mon Oct 16 07:16:45 2023 +0000 fix commit 7096aa8206f772f76e63ecac593c3b2cd0aa9dad Author: weizhichen Date: Mon Oct 16 07:06:17 2023 +0000 fix commit 617ea0e27561e088db99230618f3f89680379091 Author: weizhichen Date: Mon Oct 16 06:48:07 2023 +0000 add mariner commit 2f4473cb715dfefa577786a75b53a8fc4c72270a Author: weizhichen Date: Mon Oct 16 06:06:48 2023 +0000 fix commit ee5e239784273c86a3370f63c4a7e3c4a61fc159 Author: weizhichen Date: Mon Oct 16 06:01:50 2023 +0000 fix commit fd8e1f5df19e329d79bbd948d523e59af1ba39d5 Author: weizhichen Date: Mon Oct 16 05:47:02 2023 +0000 fix commit babe2f0a84e98a8478b060b9df5f5769cd41e9a6 Author: weizhichen Date: Mon Oct 16 05:44:54 2023 +0000 fix commit 6ce12c847617d74f97f2a785e504f2cdadb1e011 Author: weizhichen Date: Mon Oct 16 04:17:51 2023 +0000 support openshift commit 38f50a9e908174ad392ac6f8692a5f22e9ec6dab Author: weizhichen Date: Mon Oct 16 02:48:57 2023 +0000 Revert "support openshift" This reverts commit e15df3356bb2b5c956f8c4f944562ad02c906357. commit e15df3356bb2b5c956f8c4f944562ad02c906357 Author: weizhichen Date: Fri Oct 13 07:27:24 2023 +0000 support openshift --- charts/latest/blob-csi-driver-v0.0.0.tgz | Bin 5888 -> 5902 bytes .../templates/csi-blob-node.yaml | 11 +- charts/latest/blob-csi-driver/values.yaml | 2 +- deploy/csi-blob-node.yaml | 5 + pkg/blobfuse-proxy/init.sh | 119 ++++-------------- pkg/blobfuse-proxy/install-proxy-mariner.sh | 62 +++++++++ pkg/blobfuse-proxy/install-proxy-rhcos.sh | 68 ++++++++++ pkg/blobfuse-proxy/install-proxy-ubuntu.sh | 117 +++++++++++++++++ pkg/blobfuse-proxy/server/server.go | 16 ++- pkg/blobplugin/Dockerfile | 6 + pkg/util/util.go | 8 +- pkg/util/util_test.go | 4 +- 12 files changed, 306 insertions(+), 112 deletions(-) create mode 100644 pkg/blobfuse-proxy/install-proxy-mariner.sh create mode 100644 pkg/blobfuse-proxy/install-proxy-rhcos.sh create mode 100644 pkg/blobfuse-proxy/install-proxy-ubuntu.sh diff --git a/charts/latest/blob-csi-driver-v0.0.0.tgz b/charts/latest/blob-csi-driver-v0.0.0.tgz index 94af9f8ba662f509cd3c164ad11ede367fcfad3c..d0b720c63d333bdab3e731714977c42bfd7c216d 100644 GIT binary patch delta 5896 zcmV+j7x(CZE{-mcJAXavbK5rZ{j9$Nqx9x__Y3v#E3Iby!LgK76GzrqPI~w2bUZM* zl5i#g7628iuK)KN0HpW=^|E5OJ>g4Ya&di=gZq;-9Fot#1!1&$6)ll8oaCpz~25 z8R4l>96$#ZM5;Dh;BPfrjaKcYhrDl@R$Tux>_;GWs{od-|F&wy^?%el*{}cSXe7WB z=+qFp#R9G%WPcqLxV#Y%move}vf;8oz4h6xfEWm>hBtK-EiEkRfL?qVxlB3jroX^DeptPCKrdk zhbP^0Ec~#V16PnM5ahQ_W|*4}8B*=W536Rk=K3u1;$31G-TK5mS5IoSSFg|&jDZ7n z0ZE1!1;jWC7zZT4}m>FsKkT%HO6Sd*em;zRe`L7npr3!Ky+RH$ zds;A$Ki>QU%nir@2T-dC;4|XFnd`EMN;SVO2P~n3B#!{SLO-dYsQg)GW+CP`p7Vr0<9hmIq0OMvVz>pO8o$MEaZ(ieg`uED<6Lp-DhorQ z#*{LN)n8gBu;=N2d>_dvppbc@7BcTFh3cS($1)lp--5pk!-WPgosr|9^GHY*6#5Y= z8Gi~uVh>APb2Uh&BSNpx-S@)5VOTbN6i*j018pW@G~|SFBIoBm78*ZLp{yzWF%?rt zM0`eOfH(*iaTk!7GA`GZewR@fLYXcAJv&Xc2*Q}O6LNq++j7lXnB`}nzlfL%34!DK zk&wV0mlH``>?`Uca3ck+- zrCQQhEqaaa++b4_Zs!Q@aS-}|I_mENNC!PA+-KsGP@>*$wc6;hRt9>k)iO(BA#9eV zq2yAjr*l1D>8kD^tQ44|Uz)wftA-XKcAp(o^&h{gQ4Eb=|Ipgbb*tq-130x9FjW1!|$A`e2K9%2-I9QBj#HKZh#6ITow zmmPHQ!^z>1ee0V7_T@AMJE-aH!6z;j9i;z?=q3G#l{|EeLP{Q<8-9j9rjWk!*+j{_ z-$BP3myu*)$l3OL#aBS2Nd8jH2Y-5RI&QT-lK3fyUn3A%C^w9h6a=Mi2T3o>c&mxE zpGYjVkg91MJds9mBmY`chsR^0mUFD)l=dHiQmu@~k0kSf$J$q8anK#iJE*RA3eJ3J z9>9A6AGW19|iCM=4Y-8Li|MJwC@3xS{#x^9^m^=6wfg6m3Hc&woT<6 zucvYjOG*Q%!ur-{x8q2_khA;wg45gFQ;m>NA+hf#@C(osc;V8hw;M-|&q9D^VD7>iuV2*>PXROUXg&vmBeOnsTId-Qo#B$m} z%|M&(I8^%mnglSCI0*YxgLFwo7YEAz8Uhc95XKs6y?OJdtb3nT8&)2AURVJ?l?eWg zj>Q)&-KobWUw1@XDPgNFGVAF~vHnq?QjFZy#(-tSwJeOqd(NUTIe*n%0rr04M8YL? zL8*Xuqw9GH3taC(8a*+RSe=!OEY^(O+sPUD4OftcR$s9z!PwBsh&!8rVy3QmjFP`c z(RfVmJE(p+8aY$&1NBz-f6qqU4;KqfQLm#{XrY6Uaa^g#-%+L%iulKC)a||f^!_#K z58hqAMn9ch4f=!kuYXbR>gw`JnPJM7j@651LOn?TuK9#U_i8jsmHHq%s5!&D>66=L z{G_JWwB)RVJh&y8)@sVA^BMLQN>i(80#x?9F_~BBXQpj%?EixLV{JsAopse>SB954 zz~~bccd!s-Lcv1;rg)+Z!5A+h#sVZ%_ZRA1CV{F$A{P2lY=6aTf>NDAg*sJgkbW0^ zA#$q0HlrGo=y#R;#klmaUfPkhZ(FsZ|5ri~YTsRRaCzMuHRQc~GL2R7pQBdM|9gCL ze6aWbK1aJ&x@TEXN9mbKd@S`K^w}J=H${6bVinV<)vg(Gr{LbLKxW(=63a-uMxhT_ zfI3WeYO$7erGJkchbC6+>B9qRT!DsbENol!_^4Pi$Q(z+yW(jbhhf2BSC~pj(Boqr zIgZ}O|JU_a_4>b=f*%4G4H-T$6trUf9~_<>71saB@jm|hJniA3`A;+>K}TB$W8#CH zhj1FGX>q5}LH}$%KGtd)tal$`>S?2a#%^G3XXumx4S)CW;2;migaWE-<4?iWk(0i{ zkuOohWEtqS*!XNBjtcT}2AmTQ(C^AZr7k)-)c+-cu?kV$Ns$5d^#3()wR7!YHoO?_ z6svLQSy@Cnu5dd~IW~^oM$OK+21$v9oKQJN^}h+{Z=#+bfcbxXR7AgP|C!QK_5Z7* z`b~YC!GEwIV9H)IicM58nE)7vw83WAfgSYlfReSH`!)?^?W9k~)HNN8+OwKv<2>gpBHwL&n!$h6^#54jXSg^4R2cZs+;2ClQZ?_i^&&&lWio zc7%)k2ZgQF<#+UJ#AI$(A0KP#;L{M(rWQln5PxF%Y-HJqS5h`eVO}H2{*42F3B-bM z?#r5GA4a~v2-1xiPrdsB*}rp`#?dk#JLRw#Y*U0w0XW@>V>*GQ{m>#tr>3`JH2HzO zw9fq_wd(!f5-`~^EoAxrf6zKOInM9@2dy`6_V)j?v^zq*4(e*dJ^(6f*@Q40hN3xZ z*ME}uXX@EeYb{YGsd&(MdoWP3AG*qfuc3IiFup4tL0yFwq4KujFSd){5hc_ED$$Vw z7a{1_a~jXGqfg!&63H&qiT%0KonBOxq{>(N}p)(!bX<9UowQu z29QUcNg+u4WU>!BmaVhU?RS)=S{RTKK=n{N+bka`@$qKJCtlwy?d4=jvu58WRkLlf z#SxZz=ZRN*x?D)xE|D3Kv|m1dW>8cv`PUh2DTbV5eDUG)CKwYPq`kRSf|gYWX@9^w zBS_2Rnz3UyH#gN%T_lzbq_06T7lf>!yiDk_6IQSfR|%RWWhC>lN^i5qZSuME=^6{x z1-QzvA9AM7py_jj)Ooant|BT)09|u}Tspo?SR^H!it&g}G{UV5nQSL}HlggE{7yR&Zhsy7<_!vg37_JBJOr-`kG zSi==*L82s;Me?+L&}s?Gd$^YzJ0>U2N%r{D{N}g-)^U6s66e=YoF2E9L4VvvT*%XQ z%LWt&`<#g~?oWSYl=0!`D{y^G0u%NtF#vQ{`~pVs;~CDqLnZ>(LCrXYv>}*#SCpY) zCUta`c%*5jdC8dR$fJ&AmL$Xk!%YM|$wy9`;a>3t((wq-yiSAV$YN*Yti>3xz;4C@ zX&+=6P9`mhzdI(4cnxKdi+|YfR#z-RU0$|%;4L-9t|+dfC-NGhN+1oS{u+xFdnif( zCSSz~8JDMa!zRydn%`oXnWgfd$Fq(2FA;Fns#nJr;-BMorS$7u-!)`jpGSc^& zdDAdk3ifvR*W2!#S(V7eX%P1P2dEb^LgneV-<^;8H@!i3c-bFZ+kbY%IBRRMSagY2 zqt&sK&E$C5DH|`+BI*`nFi(>ssci$-4oS!49!!8rOYcJ7h#gUi!4cZaZb4K?HL2i8 zr`nlJYR5P~o#L=E6Jt%p+YEDRWvq#Qi2)538 zJw-jD#r|v{ek;5SIe(MPWqt=;pAWZTBQLvF$}z~Al&uMMrj0T2BM#S74r0oD&*U|x zZ7OB>9%QFT$*AUv3D9G+y(5%Jg8eS|cs>G`QBQQxVJim{Z*Ys(?fmNyIANZ>bF~@x z|DUdUH|JNqZf|hiKfAbj*T3l5jKX)E1;w%Iqt%#9KH~5L%zv+7Tn0!!OPu`5!E@B% z&;qBkcGc`z-X*D4nJmrXK(b2GZq!DU+;^JIYEvTK+9(vYO`2qe>h+@FB@Fy{eLWoA z46iQ#^=~`GLqQ6(@L;%Dhz|Y!RP+f<=|s)aIM9Dcy|3`#d!#%n<>|6Y8Hi} zqX{?uBN$yhL94CDMda<-&P>J5g@IZTrE7V&UquLiiLt9V6T)x0z-3XrbHLsu_2(A- zuzV$DnAN_;hDilQ^)YyiY;lHA zGQ0BVkS#}D&&3uO$?V*{X2olDb0v`5yVagZYrXTux{foe+wD1=X@7U7n0h`qMu9nm zMgkn*obgkgbpH33^;acx|3^Qpr>s^iH^ZpK$!+CNpDc70%0qd*T2=g%2{V|y*|~b- zFz){@;eR?_F~8&{(`x~<)y`p8#VdI%>*eYY<|ezt&e*Bm1y&+ku_dgEITivt)e#?? z$QCna zhpoe-LjGU-&GF&Ue*Hg3i}U|51dNVgi}XJ&9lK2YDXY?45zSll*su#|IVR?ha>bZM?@ns@}PWltd7LR-P;D1K?n$FxAFU#OH@IVv;EsoJuz59?ue1(K1 zj1pgsBF!}b<(A$&FkrGztuS$ozV)4=Fe6+>*mu(E`cz6X%R$e3Hg(pr*7Go{*SmS} z$IWllKy|?|d!Ogp?%fWST(6zfr>y%MKC2;IYGAku1 z8chAc==$v9;^yte<=c0kM%F-Ze(tqQ=PvYV6fWhlc!UkHgvib3-qomoIoOI=;d-D- zV#Sdi>|$sKE5~-QlffNqI=W?H-hUEJn>kQLXw(S}KpV<57PVChSbKRUZg@0#uda!nI zP9xtoht_@>^cwPJxs7eNQn!*oSrTkrwv@oHL49*+OylPzu=qT)_-Hy99%4B?{r0== zRsVDE>gKBV{$_M}{^4eLcKu@+Lte&~WFEqO>P1MJ)!sCiS6ni_+kqrl0_MS~9aTZS zZ<*V8ypH9&RZ>7^$F~gEj(;m7d?pec4;?)|HbXy}5GtCLAru=EUnQv^?VS4}%TZ)O zx7C4`rMRyqc!p{Mv(N3Sjv#+@&GyWnE0!WLr-=ft63^?MIqHtqYs5SK_PYshUVo4#Ad|!~A+Z#v zmVmJBLemOH^yS zzEEUeC{jXIu`RB~nt$IN_mwDX@wZJSO5SQ%UtGroe6K=I3qQA42GE_2buB`0wR+OO zG-Ts&Un}!9YGt;Ku{=kO&9bwk^_<38h$q&oakC*Gc*x zOa<44wR~yQ!8utjlb@E@J2$GG8&%=++yvHNem~eqlyb~h`oGrSWOlJYUU26refY}y zBumh9X{}2ZbY0-`I7VJycKm-ORSRZS=@?)3Zvx76LpjR z`sX%mRl3QSGk^A^Vz(ux)!NgMOFUTo;#6KdDs8ZRwcX29+ih+$t&qaC_J{Swv9y2e z>jnQDt-Ah)-(uI<$tB<`>iCu@GyHbImcq45-{<=Hk)3M)k0Y-0ESuf~fs)rvrKtLYFb_ z5t>~RHh&trHf|@AR&yMuR$i@d3H1n_e2qn0xcu0;jY(}^@*Ca$2V5DiS~HYUu6n1I zS{$2P5x!1IqS7|8%f77go}#}Ju~;(iRUhxGs@nKMoj-$`T|-6eSj#?%Leu=bU6Ih1 zqp<7MrzzBD*G@{lpIbNWM!^39N~tgrYb&Ik>VG5kMJm76Vsesnr{_~j@y}XS2ze~i zzf?@f4kUQ9dHEmMW498Nb!7VCVebvFv~|z_Pq_qS#reN|cv!ms=jiZofBt`tw&MK% ztQ&!@L--?Y0WYNZv-9vrQTf@66P`ucTZCb+=6Bz!^?xh?*a*N=Ji)8|c66G%cS=P;u_w~R+7%5dsy}RxqH?6*J+#U|IJSVEA{{Jn}Ys7I6m6{{{OSI7t{Z#LAlrb ed(FRZ`?hcUwr|he{u=-Q|Nr@L7tpWQmHAdbh$40!W=in(me zao~Tqv(jp{S|>+G`fsb%D*kP?PY%Cp9~~dG+Ha1J4^F;owSSM)Bh=a*3)LkO67%m` zPo`CD+SL01R-l42$z#k>St$vL>$mtpWUL7WE@Wbosas+ z2v3dT06M53QnlFvf2+}Iv}!Ni>cwU77n|2YZ? z@B}(Fgl@5bD}M-C2L&!~1jOY`u(52oEKqNKcB`Ne;t(=HB;)fAYTo@Qnyw(tM2a+o z#FK^cP`|^-_lL|U?!1Hg;{lUH4g#op=?XIBY(|uR0B#|`glOJHx4DN=Y(mc zl;rHNanfk7BI%PEP!M9s*)6O`F{u)&Dj9kQjdr`yT7N~5G7q|Xa$UiM2+8pV4ONxn zsp;^fdX9ykR&(GAas`6?u}KeeQz1jD-S}x$@77$OMP9s045M40xaaCgt@i2_x`Huq zpe`WE5Tk$?M*-u21h^ceP>*i`MFKqZWeQZ2A#{SYhzf;*!?=T{Qih__%rM;`tm!dV zG$j^yqJQZ!Iwq5dgA+2(aT%4EP~c64&(X-7kdqmfkaX$1S<}ylk?)TTHy!lrZ?#v* zL1s-0=JDXoKfv683~&IongBi{E}Xe8i>Orn>vF&nI!N*e&@1$dYKr>*HHu*oHoyXX zA-=ELY^r!@%s85}sDVZxRdz3kvlJ zm46HcAhCxfuDKc{QxTz8=ri{yVrQc=Lg;1swK=)2lO@c5c?Svd4(6(H&7H0Vw=n)ZfAt7*F zKN1qS<8mU2i+x3X1a73DwYVHobhK$RIs+W=>9#OQIbO;MX8Rd*gbUQ}^ zq*PNHt4XiXof~Y5!tETvJq|)2P)GePfOODVi!6{4TxjVpH2>s>`UJiurH@6*g;J%4?c0R=pg+oqL=g|R`Sp>3MqMbZulAcm_qu>XA>p! zeg_?ETt17E(r^3JClo$2KMLRj%+FjGg!qNXY2O1XwKyb`Jizy#D4t>BEA7-lZJWwD zUQgv5mXroih4rn^ZpV>;A!qj)(zm(C8Y7`XV&6|HELxQUFMJyHcH^jVT(?y_u+%$9 zD;_l3jkc*MKz_vcmm$!1#D9lD6l7`!g%|ao%zn_+jMe$4(8ChCZx{6vdgs`k!Vt@8 z2Q>q2yW>zP_-hitNa7&uQw`E38D$(O18fL9AVL^(sP*Q}o3iqKR&`jp>v>@f{8S?N z4>}fKuym&$n|$3CZKZ{+%E(NpGsXHxy-hK4R~rMC5!bRX7VkNW!hd92cLmt{g%b&v z)CHvj-i@y3AuMpc2Wb?=NMf~FGO}1RhHocl;Wu1C8d`tFz64`LD=Y470*aZs;xS5o zkD~FI+;>p@ax`+L;0NlhuK%8mx*skUs-j*;uh2pXA>+AHkAI*{X%z8~*Qncj`|15_ z)E~UNe2soNyBhQd?|)yT-qqFRm9oQ>F&*m{&4hZ8{;v6iM)#^UN|*W|JE%Fsyy=tM zX8fe4=d|RkgFLt;nAU2_s`DB47Ftv5X#!OCyD^zp=vStVaP0qv`eSWHpPhBpWLK7# z*}>>76nC%?WJ1A10j7AOEWsErBE|$HRM!`3Vx zeIatH!8W5BljwJq{KdF*vtHVhwJ+P0qW@Py5Nh9Db8vax8#Uy;d@_wy@t>nsyWsyl zJ~?Ua{lCvqu9fOp7SvH{W)g2pJqUd^2klMKUW-`6G-|bLhTJK*cPo$?H;2SB60cF{ z0~Vk*lbu?uWPe@hBgdhM6?^*dfErhz;Tj9u7Ck;HmJBk-5%HpUTE}5nFxVBQ5)$Hdfz(qrbPYeaEnEwZdCr5?(e{#H!|2|K7cxe6;%}CJE#=)5Q zAm<^R2C7@!DRj_3n~#sRng;9LhnRZWW}vYfSeqF-Wq&}!Jv=zbgE66i>e}{GaCPLQ zuW;l`)G%2FdM-9Tn~0-=yqp2&!~^uFGEk|DP7d|IBrrxHsyit%pq~C;^Hw|84rarP z;ZCs{hn|%|q~i*=^OR%b=xx;OjBAjTSjY*LV^sf}aQ-Ih`39K(6_W{oaY!3%b{*J34-Y7r+qto6AZsPPIi{|uSk#`?EF0%} z6~BIlPxX>e*N?oa)>LrjvLIwsZyYkd_A*?Expdfg^n?B)pH4kw07H zOxO`F@*fnoQk6f^?-7%^UVVJ5seMmFOq*H^ZGTOO<+G7xC!R^!Acc92B>OiG{3Q?z z!nu(((>{!Re-We`GoE_)1+tHGn8wjEgPn3%47Mr4r2w3+#4(+~(t2nSqf^~m(VBe2 zURvjVOQm}Kw**YKObc1Q{vWgsPLA{I|3O>5-mm}9Q0@rzI;g7+`v9n{WfQ`17>ees zU4KjBpQ&R<&9y|Cq~by2<-tJ3e&{L_zJ}t}!nm$<1a%c!gv!f?zgRB*M3hhus6`}l;smsF`0ic`Ao-aM`MnY4R~3% z<9;kvNws#-vDHYtTG=|r(U*WW61P!P`+w!@l1GcMiNPOh=L(XGD1D;A3kzBLen}HD z3qT%qCWRoalgU2lSeDL0wLejoYN0_!0M$e7YqJbe;^NJaPn^D4+RMq5dd8cv`PUh2DTbV1d@=BO6O4%t($3r}LCdOxG=Jco z5v1jD&DgJ->zit+E)vTI($^rF3qn>54Zzyn%HWH zHC&MvBuY|QBv0E1t(LI7hkMDfV{+o0WQ{+~FOCaf9mmHZaefcQ>2Yfr#D8tXg*_YQ`y~4Z+;Iq6`f) zsiUjJBTX~SOU6tG9(5qIBq1giZUX2@K5|+N_lhr&jz@Urbs8&27CR$nEyjQab~6@8 z`yk73(rHQf-7#szYbc9cz<++Xx?&0H^0dtZZ>cGEMR6THk=F=S0%;)iXe?&zp(p{E zd=)2TT%Otun>@E^ev74Nmdbw~&o<(}M8H+4o*i3=e~#Og(yw!U*N}O=Guf%Amob** zO~Y&{*xTV>Z@F`3RU#K>LD<(HpkBxbm8akTa6ana^akDGWq)vOTYnMbtgXdl(MPlz zt&W{+CdbQ8*?5r_QMVX_d75lVZ40<|NIE9o+3=o~q=Rgq3d5&HMdTVlE0khJ7B?(GJe7Fr8dD*p6jzQL>Y|W=LWsHd*ak!px5L4!RCa*Cq zQz^suAUj1$Mm1M-fNq=Z9ic=L?03P(^AWg=dZL34TRE6`fm^(8=U<1w3G?igtIfdw z|LLlCbAHw9_6FDevx}Q|{fnN>D166RP;9H-T8+u%BMv{n{C^6@Wq@Q@;^bEjo})I0 z7C4=?t9sA!F3GgYBxx2Kl2wv+qc)=CzSC@0n-cNTMxm%}(i}5XuNMU`Vc_TM>*45T zcy;-&f7|JowO9sk0jYI;S;65t3~tWfChX;f>iy--sQcmO;`05?MelR(VqL1`Ji&@? zfZtOcp>!Uq>wmF|Q znsDPkg3;9-wAy-HMBbil&s3~jXs8uYI+u4lDnj^6j9tZ<5Ps7IE{p1&1NJVdKey+LVrb(~q~IWvqkO>mJ++uD}VSsA{@N*%wx#BJ{_}5nmx}}I>nY@ zEDnD)au9|^v-Dk%F}QQrhmXvI#c{f!>K7r+Ju2!!FPuUE9Q%I}CA7x;r_6&VT?n;& z{vWp5?PC7_o8!Zy{rrE966gP62pAo~7U_RlI(C`(S3tOx+KBW4>yhMG!X!Q=u54mL zCx7Pbbz%k;53(2e$iGiGic?au2)D@`EVcASat1A2?6U=5EL+gpu$M^ai&vyDi*g*9W3RXnVGYFHeH(QnUGe< z&Pq?sPDQQ!7k-MBn;OQJ4`fBkVir;rdicGSfl#dp32}GS~AktLM9U z@a^U|>h|m?v(eU_wt1au8A{~&l0?Y(CKV^S#>5F#{e8MewL7-tTr6DKm=u=<0e_}m z$#dJxcXd;ZP(w_!?$b(9j0Js0e3+;`Rl&Po=|%1K-uBN1H}9@42iLtp*X~WNQ$`7u zz_BaItd!4aF!cwc>$8iCo3|I2Z{K|yS!2fezSlCEyZWb5xW32YJT}A4i{Y}>(38h>}Ns&%8@_07k#f8AUTdjlQyycvA@xE0CL6-t#f z6}=~s3f803?T^mhUi5B04ZCO8z3$tsXcg{vDiB*83{cjO6NzP^00q)4g5>IhbXV0^ zARDE+7m`;~)X$OCxM6^LpIQ6goms2r)w)Sz3eW8HVD0FbM!szltNk|SHGkyIavR!i zrEVpGvLx85Y$<_XgZk#um{r-pURsVDE>gKBV{$_M}{^4eL zcKvf1Lte&~r2fHux{XhY)rvEiSKRWw+lC}q0_MS~9aTZSZ<$13BuM*WyE9XXJIf^XkwmQ%<75C}<&ydb<*126J z^5-{%*_w+Dkj~#+io|#U3b;x<+kFKVbPAeyr{DkZ;nUmR&ET@zyBVB)?Aa)9dvIWl zG=0tU*GSN>M!Y07|Jyt2u+Cut<4#-Sm_S~TCLoi{Eg`WKrsx;EF2S*uhhOz+SwAuL|9yR0jTzDPM~_#Mn0tnX5Gz7RQehzDv( zmF0Q0-Yv{aJ6vB+YnoFrZF8Ra?G6N)4yil}wBbpSjm-V+&WP+!YV1#Hlu%VHi>tBb zSI7NPkhS>R<|s(sYJXT?T*m}_uR=}>-@7XV=*q^r79qG=J?T&V*f`uDR{0u-Rkn>> zJjWrIWqV2MK8>>wPq6uV;#=bBJZ7!stSsm{+Hn7RXKnI`f?T{Qt!xs*l-0CbiQFI5 zdGUif_JDeI;zq)FmN^#6=HerPO>K5I^(V6OtR;e|tkTl!Eq_iC6>@)+lLb1RN7EwMeeXK^bIDol?jchpV#kV zYj;O3J7Do$r+>V7R9ag5Lv1f}sBLr0XoVE6wF;~+j-^#%e=Kibo>Z#O|L|MvIy<=p ze8u^{lf#q4;{D%m+WY&zpQRM^g&OpRxtLO4+#etQGoSgnVm{;!2x({>$tmOH54}QX z&J8X-HKc3C_L2kl5;(kbmeSf1-nat=E6km@+$qU+dxG zj9+Zy#y~URw;Esqvi=&?eIoQNZZ zgzIA=)@l{f`+9r+| zlvUnS^j9JlOZvTP@V=_5jW5*sZ&0&qsE8eF*(XtGn$O!632oU5yIy^oLVb4aq~!a# zb<=JH{4b!C3LUYwLfWZ5QX^71T8qv}vaOy^DSySEwW<*ESf+og=#U*q@Mit;Kd{Db zB`E92^uxp6O<^hP?*E^13CN25fBW#TbpOxMQG37te~z+Z|NpEDfj$QDEiC~rr1-P_ z@U5u)?8OPsqUGbzd-n~S*%YT+tGw2=Sp8@QFEv*;dH zeLr`vTK_s_bN#>hPGF_}KYmlt{|Cp%`|tlhOL;NAc%;o= "22.04" { - klog.V(2).Info("proxy default using blobfuse V2 for mounting") + if strings.EqualFold(osinfo.Distro, "mariner") && osinfo.Version >= "2.0" { + klog.V(2).Info("proxy default using blobfuse V2 for mounting on Mariner 2.0+") + return BlobfuseV2 + } + + if strings.EqualFold(osinfo.Distro, "rhcos") { + klog.V(2).Info("proxy default using blobfuse V2 for mounting on RHCOS") + return BlobfuseV2 + } + + if strings.EqualFold(osinfo.Distro, "ubuntu") && osinfo.Version >= "22.04" { + klog.V(2).Info("proxy default using blobfuse V2 for mounting on Ubuntu 22.04+") return BlobfuseV2 } diff --git a/pkg/blobplugin/Dockerfile b/pkg/blobplugin/Dockerfile index c5bb8f636..44840518c 100644 --- a/pkg/blobplugin/Dockerfile +++ b/pkg/blobplugin/Dockerfile @@ -21,10 +21,16 @@ COPY ${binary} /blobplugin RUN mkdir /blobfuse-proxy/ COPY ./pkg/blobfuse-proxy/init.sh /blobfuse-proxy/ +COPY ./pkg/blobfuse-proxy/install-proxy-ubuntu.sh /blobfuse-proxy/ +COPY ./pkg/blobfuse-proxy/install-proxy-rhcos.sh /blobfuse-proxy/ +COPY ./pkg/blobfuse-proxy/install-proxy-mariner.sh /blobfuse-proxy/ COPY ./pkg/blobfuse-proxy/blobfuse-proxy.service /blobfuse-proxy/ COPY ./_output/${ARCH}/blobfuse-proxy /blobfuse-proxy/ RUN chmod +x /blobfuse-proxy/init.sh && \ + chmod +x /blobfuse-proxy/install-proxy-ubuntu.sh && \ + chmod +x /blobfuse-proxy/install-proxy-rhcos.sh && \ + chmod +x /blobfuse-proxy/install-proxy-mariner.sh && \ chmod +x /blobfuse-proxy/blobfuse-proxy.service && \ chmod +x /blobfuse-proxy/blobfuse-proxy diff --git a/pkg/util/util.go b/pkg/util/util.go index 352891d6d..691d2a299 100644 --- a/pkg/util/util.go +++ b/pkg/util/util.go @@ -177,8 +177,8 @@ type OsInfo struct { } const ( - keyDistribID = "DISTRIB_ID" - keyDistribRelease = "DISTRIB_RELEASE" + keyID = "ID" + keyVersionID = "VERSION_ID" ) func GetOSInfo(f interface{}) (*OsInfo, error) { @@ -188,8 +188,8 @@ func GetOSInfo(f interface{}) (*OsInfo, error) { } oi := &OsInfo{} - oi.Distro = cfg.Section("").Key(keyDistribID).String() - oi.Version = cfg.Section("").Key(keyDistribRelease).String() + oi.Distro = cfg.Section("").Key(keyID).String() + oi.Version = cfg.Section("").Key(keyVersionID).String() klog.V(2).Infof("get OS info: %v", oi) return oi, nil diff --git a/pkg/util/util_test.go b/pkg/util/util_test.go index bbef8755b..211460862 100644 --- a/pkg/util/util_test.go +++ b/pkg/util/util_test.go @@ -272,10 +272,10 @@ func TestGetOSInfo(t *testing.T) { { name: "parse os info correctly", args: args{ - f: []byte("DISTRIB_ID=Ubuntu\nDISTRIB_RELEASE=22.04"), + f: []byte("ID=ubuntu\nVERSION_ID=\"22.04\""), }, want: &OsInfo{ - Distro: "Ubuntu", + Distro: "ubuntu", Version: "22.04", }, wantErr: false,