From ab06ad33acf5613d5518884bce68e086c07d27d3 Mon Sep 17 00:00:00 2001 From: andyzhangx Date: Wed, 28 Aug 2024 09:56:58 +0000 Subject: [PATCH] fix: disable archiving InternalVolumePath by default fix --- charts/v4.8.0/csi-driver-nfs-v4.8.0.tgz | Bin 11359 -> 11363 bytes charts/v4.8.0/csi-driver-nfs/values.yaml | 2 +- cmd/nfsplugin/main.go | 2 ++ deploy/v4.8.0/csi-nfs-controller.yaml | 2 +- pkg/nfs/controllerserver.go | 8 ++++++-- pkg/nfs/nfs.go | 17 ++++++++++------- 6 files changed, 20 insertions(+), 11 deletions(-) diff --git a/charts/v4.8.0/csi-driver-nfs-v4.8.0.tgz b/charts/v4.8.0/csi-driver-nfs-v4.8.0.tgz index 8595523422a644c17d917ffe5f9d7e5b8810a9ef..f88a7702a9f0b04e59bdff4f02613a760b933dc9 100644 GIT binary patch literal 11363 zcmV-pES%FHiwG0|00000|0w_~VMtOiV@ORlOnEsqVl!4SWK%V1T2nbTPgYhoO;>Dc zVQyr3R8em|NM&qo0PKD3a@#nv==|1G;L3Yyl37!h9Xr{hTd7kSJ2UIM6USv`vb8m5 zZVp7YB&>+vWCA>( zLve6A#$0x$IEla6-qY=NyU&l0^}pS2xBhSU@cGdWXCK!lv6QolRxpQDQ( z`shrP3>q?y{*n!VQ;;B96erL_Rg!8=YVhv6$GgXUYU_W3;|#=>8NmGYf7pG|eNkWk z&$=&m>;EpEFcXp`Kj8tyqK7_xZjl6!pw~hOp#c_f1u5$x4kIEYpLVYQBszrYuXHF( zG4*grnIMw!=}h4RK}La)jN=g;(4k1?0*D5e5@brclErzLA-oDhmQkrN2{~X1JtTPsXb=5$3{?NUk8D|lO<{p(v1i4`TSC|08Evnop5!$9y}dF`@9D#hGeA4`~abl(Q6%u!KJ| zA>XJ*-fFE#^hpxbkj4GDVxAYAbiku51^~+NO?J~yH!QaCs#(-lvzGPhX(9yp?KT(`7W}}~A z0&x$Wv=F*s{F=~_?yl*VOwtxY5f%B+oyM8M;RnKn{40@TH9Qv}5!yp|f=R4K6dA>$ zht6P#vsmso)vA6_4VemW>6scu$QzCHFMk{6+dkqTv6eJ=I3$$FsTOdCRQnJ^C>gh} zQcf5ra(WtLAujaPh^df}1ffAE2sx1?#BmED$ztHxOuZh)0A0hhhuWIzIg6olT`0wh zk0g4M+Lkx4RMl2Zw_krGLW=wY42KZP9%^5(emI6Gi=n*~d`ms4n(te0CD^DL4uWMo z1UqtmVIGr&NJqO!AkqB!xZ8b0S~=hTM+U+z6{cAa9d?tMYDal3zr=28?P$Z+ykfbj zvBM1;bF{JB=ubX#vOZ$11;Cg2_F*6OQ0r7&Yp@TMB7b&+d^Z zpKU^v4T_x+;!!F24AJ^ExRvI)D#GiMdS-UrF3)zj-rZVfYoob`PPO1i6RnmMy+Nl} zXF@A=dM9^faX14_;3Y*CgQAs8g!ae~38gb?J=5qq`8d{pD}4f}M3_ePFKW~@3U$rY zXrx4%N!Ul{LnOyAML6bwqbUNlC=j8@4s)l~+S@}{Fa!=X1f?G`3Q93d7zZSj-Xn!o z8NR}Lt`mZ(K|S(O0bB9;y_|?EtD`Dl2OJXNLi#Q0uu`S zK*0+%ups4Rf+gfzkm*5dZ_jLxFS9uA8-#l3mtR|ZD6llvwpA4rgK}H{`g0Gp)y%hb z%@lK-fCOGb0B<$pK7BjUjY?U$Q&_f6L&upOdMf+=3CvSJ#_M1}P zE#~>g%h{jXVMIhAM&l`>0FmAI=u(lI{lwA66-^mk(U9sYtps)!HN1csfGgptA&3-* z3XB~x1Awb}AxSPM4T}1US<&AU8fi^i?W4|<1R{cM0k?bkhz4qICcwqZC^kzau}&&23DJ?ElY>>-N8slar&J{qHUw^ll7wt3DBE1X8Mn6+s%a zDMX6zY70Wit=};ejv>6R*G^d^kdRnrVjrb3U;%1Z+H18CQamY?F$&6M^77Ls)VTs( zu5*#UMV~(_91O4^5LP#P*~V#F=WJ9+Og(_m=g(~v1UFcQhwlim8ii|5m)gYVFUBt5MR4oM7hn!?LO4NEwN9{TR!^XFDe z7km9NRT`iigH}fn(<&Vbwa-|W`}8S5kowYWZ#+(_ znw0uo19V$HYR zov_}imA@JDrnDte&@QwQXIWaBz3RmbSUX~7w5zrqYs3=rFP@J-5n&3XamH~xgI&v*1Q?eW zWh()i*bjt`vKaGvwH87mWGVDeu@i_|2-z9aPy&RbNYen0FFBzS_^EC) zlW=V67T|BNKu;LYO?FQUo1LexDTEyZv!k{HL`b00(86hqNunmI(*M3LeEI&g(tRO0 zp`*s$7pPUtgJMpn_20Tw4p%*XyCoa^9YU$J8RLUjJ6pGUxkly>z{Cf=VE}5SmK=<$ z97WUDgiw-X2@>Qt-Dhk222)R=rqQ3wf|?z4_v?}m#EDW>!3?x z1ffgb3iF0W+7mS0Ec75WAeM3dlAjqMO&``=7y1D4Uq zi)Hg%uC#Otv1uFwYN~V}1408yT#t!je-d8<&B-vM5%75GG7>8+tuLs#TdvTqbmDaO zgXuwJqBj)&4!B&O>C9*W6{xR94Zy65VB(KNIEDoGN*6tSb$R~&S-iout%!!ogb#CSpYlBpsbf<}&P!f${}0*-%B zD{i?e>AbD=?OWA-yQwv10K;CbUICFEF~bbBVqn>@o{9=!r29j2de?DHz=hIvvN%$r zY64uznvjhs`K^GhS%PX*Z?9wxrq*L9j*V-4UoYtdPZ0;rRWjLjVXzWR}SC~+~t>8Md z49%kz$T>5hbVx%~rmE@1tVq6k-G5g)$kb%iN53Y^ML7j(zz7`zH0p6 zt71~}l!8{XK|*9f=|Z#ZQ@yXyx?vg_m*zP|r#ON56brcZ2~Z;~0yVJ9O+l{rH%)>1 zULpSogw`U$G3Gdwz}4Cdg;}u0@-2jRZOjH!%OSi2;c>i%jE0a(agc{p8b(m;nZ%xN z4^ci>R_p0hN5jt-^nhq0s=uubi={L*I7-e5B|WtIUy6%*$R%e; zB*~fRND4DG8#ZVQIPbTfEuyA0GP}|D6!i?|qWz^0jBZhB4g((>iD4)aC9zt>#F~=K z9?l3**mZdE=4q z7!ym4?-dNotZU!0z}0r^QDMf;QHn>kMKz4sL{|Bb%p|(WM-L0ZLZU@#i7X-d z-0VB>ZipP4X>uUvi0WBUW1<7g5bXgKJVQXq9gzY3cEoiO10#wiH0Dz(d^XnNM z%AlS1bKi#e^(&gk5R+I#9svby=uu2kDT*ERI!UE(=B$oQ%nai=W;ZrwN)`;OrbeN8 ztf*iMmA8Rao;=Fw497CtV)rKUFAyWFOZL>heb6~N2tfU0g&YSq4I@d1jGcx1U zZhEz-Ygc7d+XHiSb$NgBFxt%if$`Y>KC}F^%n?h>$s^VlJxrZo$MtAd#gh z<7!Pvtt!m26k}{MY{dh(;4{U{X&W?~bwXzJn%Z-j)yGIYW8?Kx+#KQu&KX}o^}0+> z?lBgM6X;;?$bO14?#@`zmwiu%br8X{vK!Iky7%RMM&ye^vK&pt9YhIuki_+#AfU+>mxX7oWx~L0t($6U?1e0A; zX7-x4rG>&C175=nm4FaMih%l4RU2&4irqH?iAh{|V5vS03_Pc~hHZ2cB`UHj)}@uQ zIfl)L1?i>MtVii%z(-H;>S$u4HoXO z`Hc#TdB;Mm=a?SK$cF_SrYz{FU`qsI_=eCEn&A_k&7yM7QdmZKIwDA;`$4h~nE;K8YarjY4-r8gv$6au&4T@eJA?IqLb|hU`@REb_Cj!IjsRHwe-qlFbJU!gw6v}n7n zJ1}ourdUegw1@uhlmGnV@4?gmc=F_zZt(BF{_)9wcJv?LJ^hcTzvn;x`1I+MC%^pV z&5!RcU;j#;{{9Qil56wp_b0!=>tB}y^7QF{{9y)_kAV~3sdjvf2WH(Dc|x4o@rlV< zds(1|sMT1@=-m!{yH9lAWP{oXEV2III$K;bgj!{@{k^|{(=RB@bUT5iyHL{R zP|__0kM6=nmkAfWg8bYT1=Z4{%8wYAW-jK{K1Yd3*X1Q@dIz z-b=jVrqPMph(+8y@^Irg!%d?Kw-`fs3lW2x#s_X54fr+1{%twh@3!LmzTk+y&ExmB z5UsbB*u0G+@g6I=J*1erZAH*+DPC^#=(x>e;kFX_wxu|?FFdMkD=}=FN33lgpSFc) zv~9$mJ?u!cO=8M+(PIxedTa}^Vq1v}yB{gB7=;al#HJBlUwHi1Hlnq*MvEIpVr@=| z8%J4fDW+=E2&zrvrFPL#+lr3LFLZFiqnuas7OB^ zk-bL&{qk$ev<%VvJSClaxyxy|ot%cDF*4qIX2UWqP_fPMEQw7uAAlr@kbY@tGs5JZCLlQv=(~c~IZzpv4SmVr^gP zn+Dr@#@gm)mv&u=D+=ZNAFpZKy=qCJmyV}`gg92$btjX(C8zrGD!!gfgZaIdJi=u%Do56E$%8@O$N(G^FlQYrxe|KDz9N0n0ZWaYPQZb!pp^RtvLtK zkU8OzWqNS*ZVUokHpNo>k4)dJ=0seqw_Wqm&SI*tRzw-9PQ0=dvZIA{&OHLu@_DTFKj2Jsht4vZ0A(PTB#jYgfa`3$zCi zGddERBuQv?YORm+GC}Zl(|R5gZ^>%8E?vP;-v&FUM=Ny39IM;3N1OFT<1nW?7qv2v z%WrE(s1`$JQeB`nqd`Q(b=&9KDUM9cU!M=aQc-s z<*HWPwhfv^8a3bi6f$mnK9T42yRp-$j(g*p#lB8h;Ug~{ES#TVb_by1&sc@3av|BA z4r10Oikj@AsL3{p=7+xfY@}#;JL%kwho{f0GZK3m%jW3vfGko)UOr_+86(DL(g!MD z^7l;0GSeD%EQyVDT2uROKif&(|37Q9`x57$sugO>t%44dvX)MrGvNZDc7~dcfV{zTr0C?O-=BgtFO%nPXfUH)n&JZem1R zy-;uSJJ_m}x#Y!b4TTNQFf!&1ix#n%eyw=U#1r**^*GGUm^onuo^i_0WNYnT&4|s- z_OE~b_YWinvkLz8&;LnH+Pc6DAa%>t7T!;ZeNBd1pds?t3Tyq^= zpC-Pa*6qN*n4vhL95@!|f;*aZz4C-`eOHd!pR8D{NPpiwh;U?y0tdE^hnV^Py>smpL&Bn5igicZg6S0Y`JxB#MAa!l9U5 z!@GPsiVlng=0 zj%@?D_~q!=CUrm&FMPyF8pD3>h$~dEd<_v{hNFO}8J=fDWk&#|EKfduqr0obqtX+x zwcy3%8hWU$4d5l3pA_|f_FWvJo+l>TU|SVx8{`V}s4GZHB#rTalhFwLcSs<+P11Ry zo+_43ltgwwP@D9p5YaP8|8n$eBgWP7QgR$Vq9e0KCqj+VQ@bL?luG9HO;8tu?>rf2$bLm$`m}eOv-9Nb$YpQ8rZm=0MkhQZBm|w)3ru0BTFscpU=>`c@-`&{Y=|U7zGyPkls+(+Rm(lDoqM`kxLNu8%I_IH?Vr1bd>^_qrv2Sr zqbucLD-0tI=I?4YwyKQ;Y&NIDeP5bE(9e{7^vX8M1cXc{Yg7<{hAcA4Niju)%IC)& z^p@)S`+3Azq7~?$l zf9U6Tr_EXBG_DQo%?&#%pL@GF)y<`5x2ZZc+hfbC)*#_`H+X(gIoR;SzQ403lsqD6 zcZcU!c!%e*Y2M}rK>K=RL!#Hr?B+G-txVA~>DCq!%01BY>PT*tnm5WD*XS|bD3hGe zT)ug3Ij^R;Y__@i+LO(J*hAfw6stx4{CU27((J@{c!qBz7e<$?H;m0|e5{1K@r$Z? zG9ENL=aTquj-^Ur8*va~1*g~U;?doSn3Ye&Z1E(_V?P12JNa^_Ctr3aULNv^mtFRj zTgu*INoJ$`Ee6KcGPtaGD(MlOMcQReG0!fw#N$3w^q5Z(-IL0>OR=-$$)1hR@oeGL z&Q{LotZ*V{t{(RVAHdo8xXtE=YaaMfn(ZB&`ErlRY;+)IlcO(>^N`Di$5|fo4Y=!` zW7zhog^kZBd?_aq?%@2v=BEv|dA4BFlLXs3H?TV;P(LNG(RqNaME-9U@sQXRg>vxg#D|c=eNxzGv-^I-DV&-=-^AGPH@x>;xul6qSs#9^3sP&Cw z)HjVtf28r}UtF~L?iTMaGlKk9@9L{oK^??pWP~Ljc znc^f~r;Tp6+kJj~tpDwHyS0B0kDs3$e{*>J{Q0w!7l+SJo_*6j>YhA%{tfDGzq_+f zCM4$HbT@9R-nmEe1VLagMLB~sX43?ytlgxNii62vby7MZw`@YJN4(! zE!VK8i(WwtSU{&V;eGzx`t%7A8pc@!s7;5W6XOBIqK!J}cWt_+5*?{>d8ieKG$tVy zO|9qO4F&>Y2xY#VO0W#aKj{YYb&b<>aX*CQSi;B#O&O-*ualR2H%)Ebd_7qViZNWG z-_H$%6%egPq$zGfhD8mM;1OJAaomTHgA^t7`WKCzWPig+++4dr^G_w9oPQNB#!Scy zkT;B9n}A(}_MB^U5RL^y6d=-$l0JooO-_kc&NZ=0Xs8#~bVyNCgbdczRg|u=e(5bwju~YN=GR72^Xfn4Nr>cBI%k#$F z9Wcv1mL2Pq6UK?0mZ1&}WHeLIC8sdcpBR2td%Sqw&RbyleJawP&QeS@x!WVpAI?`6OfZ`qk1V{yr0NIs(WLA$#AJE0(#Wevq^ znIMw!smrM>Kk1>iGrp$&01LQ+l%da`XTHsY-CI;z;t~4%xorj@7O*5f+iTMubj=R< zNYu^!?O^iqs6F#CP!oZpNNL0`|M2A1+1b_We*dYbU<^0{9%%X}j4m!wUTONWNdS9* zz(>h(VEAv4ORSfQdwU8G0n3a-Fj6|>%Re*9_~rX62xCkV!;PD2ss+I^`SS3n+pVNa z0XnGDeI}?2-HKjg3)av@zawf{z~NC9;YMzSto80Kji*^XyQSA>Hd|_QIcBqE zZnGXQSKyb z;uu>$aTS}zYfKG9)5>a8AsSc#8~p?mi2Xue?b1o~@()ig-k!bwaDL{~E()&mhbO1~ z^AE2t&Mx1cU%c}bHP&fG#V$7XM3FUqd8+9ZAEdw&BD9I!Q`>NbvWOp29xG-bMuazv ziY=%4(;4A@VD?~oz^FOAVDD>g0BK9VrRKm{F?CBRN_O~tiqa39dCs+I_o4Tsf*U%n zjf~n9Gjlyb-m*KTemyOtn7_&I)p_9sYCDeWdS?_}u zY^acNwXdm>3`VH^R{zMjY_b+DD-`tw<2XKp7*G2qq^O6URo#PDQWu{OtDjTgghl?! zizQ>qB2iLsvvhR2d7TXu)frMgPyoEuI7{)!GNtzS?op3A`QPO>nGQvRWVUyH&sxM9 zhe#33?5T-##qlzxz%xBOj8A8p_x2o;R8G$b*RIFg@c%6I|Cx`34%sdF|GM3iZg%wjVmPNUq4tg|yUYXhIvqm-Twen3`ZeZ4`l0_LXIX0G ztS&wj&YK=mntBD`eb3*f&%*Vu1pV48-#m-_|IZF<{{O=lM=uU{>;Enu$N!HZVYClx zxc@bc+^*x_WQ6HgT=7ci6FT}?f69e(f3+g`uv~L%tA(~(Gu-Z%K@MPXV*ZrW0Ymmg@FV}C;9B{M*^tvUDkE1 z=i)w`#=7BqiA3!cJ$q3D9t*Um%DVRMTWGz$c<0#O;A1`E9m-GD`Lbl0J%o2EXA1{`wVxEF zwA(qwa{TfSPtLB+-@m^4aP|7f5B;~NfBA6v>fN7buf|qT5*EQrKPb)P-STT$ZF2{QUjv584cU@#@X%J2ONt;S2FB ziaX`tW#!5=&j;ZaT~``-dcLkq*q&o@$p#;|Gj8WzZPEqNBHyA>*1is};?7@p*Z#Vd zwgR{8soTs?f6KDy{+)yk*7?-dhd(nRb@$(+GFrbE+8qv%;Xz)u zGgG!1WKh47Y%b7FG}F@=X1SUuU){y&rH=L7n?7x@x=5=2&bQngZJxpD-rTO6^!tO= z#imQOg%;_0n~?qdjw~QU~+@8R>E|Nm~D8s~wJ=IRSK6yCVT&9QWQ*~;Huz4-|ZNeoDg*^NMB zc7r5Ckv>9PO|(&xPD|JJenKQkW1aF-6ge_Ei&4y2sx!5^*)`BGqgHt!a@uL_p>sE{ zGND3Zo%sTbB0Z%}LyHBtX{aN`i^(7}*@7s-6ya2{Tuu}h+H+FNDilJNq>O453v3A; z8L)Z6>k4K%V~0gYmAoNx+}cC$F(q;AX2jmtu9m<8N$@oYoq4ECpI4kwr`?u z$AgPJ4$OJ2&$xtqg-v4?4b`Gmm5Qd17de`IQ1$&IuHVUd(Ob5qxkuG~t#0r5`us`V zYg(A-hS6_z3hV^)YqM}nJ|>&*Wpap4ug=Vs8d>Q)*Dwi1dneuF3hcmzP2w2AN0KM_ z#$4az@uG8r^4w}Vor?w*Vui?%(5TX`$Zw6(No&fbKGOO^kt7ByAPJ%Rw!f;uRxA}b z(9ie?%B(H*Py%y7mOoUW$<=Ql#g%DWb>gc2{ROVlv%ex>O z%v!hLX1I@BN{{hr-2d?b4g+i5xz+g3?(wtZqnY^6limLBPM(@FP)~_tvhb)yR1Xv{ zBE$QYD)V<8b2IL2ciV9r_?B^j+s4!pCc0iZBWfMG^I*gA<4j24S1g7~FLi00$uZ;P zH2D3! zw$KFlKo=N+Z11CXOoaaTM(u>uA7)t8UupizoT}3R)@WJhEm^vG6O-&~t9pvU*Rm}U zD%Et!4*S~i-y!R3&^`fcEHV6r?mptJ-AzNYluE^E;C zG96yn&rlG>z1E&yAIyyahK%uuP?tyf+R%LUb_UJ6EX^*~*WRy=<;`Kg-RPMCXjEF1PpKZI77(#uIdB`s`h!mP+zU;dzC4(AN>PWxZ_nXmtE#{sm+ z|MTL-v%3H1#qrTj|G$f8W&h9B_peTk>nHb3cr41D*51z9vn^-O#=Dri^Y!>eqb7;vL)o3&^9E#j{c}UbbJGpTL)mSVytgNa^j>nla%Ec1`D=Y(?~dkgb$oAQjm*&gIz&Iy>$NtKzY0V zpTnc>jQ{8O`R@LYJ9+Bm#!#T9Tjk$Us+ zRf?&4M!B*K_zjEZ4E;<|Z?IgYN>U3%cYoJAMjLvzi`sr5PmTX~#tY(ewXrb& z+tKqH|35xDIo|RAyLk4{C01$$)wk}LnK!qM4l)uerhrl$UgHsnP9FVT-1{fS5XWc~ zvw?|DC3LipIK)`rn3`facHUzewe}DNa|{eUNp%ofenH{?dfGv6X*@-Y>Y55AlmbUF zq0nh{&iWseaDmnyI%P@1D0+X|M-kzo)fo|ap#N*oZ*>O0@dN$e{Ka^5p#GEp6cc(- z0vh1(I!m=pQ?$P8h?}(aU1xx=Tix&Ohm{cIN0&D-Lrdk&m(yLe*gdg|NqHbJ%<2f0RT~mHcJ2i literal 11359 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 %s", internalVolumePath, archivedInternalVolumePath) - if err = os.RemoveAll(archivedInternalVolumePath); err != nil { - return nil, status.Errorf(codes.Internal, "failed to delete archived subdirectory %s: %v", archivedInternalVolumePath, err.Error()) + if cs.Driver.removeArchivedVolumePath { + klog.V(2).Infof("removing archived subdirectory at %v", archivedInternalVolumePath) + if err = os.RemoveAll(archivedInternalVolumePath); err != nil { + return nil, status.Errorf(codes.Internal, "failed to delete archived subdirectory %s: %v", archivedInternalVolumePath, err.Error()) + } + klog.V(2).Infof("removed archived subdirectory at %v", archivedInternalVolumePath) } if err = os.Rename(internalVolumePath, archivedInternalVolumePath); err != nil { return nil, status.Errorf(codes.Internal, "archive subdirectory(%s, %s) failed with %v", internalVolumePath, archivedInternalVolumePath, err.Error()) diff --git a/pkg/nfs/nfs.go b/pkg/nfs/nfs.go index 7d69265e..eec8ea75 100644 --- a/pkg/nfs/nfs.go +++ b/pkg/nfs/nfs.go @@ -37,16 +37,18 @@ type DriverOptions struct { WorkingMountDir string DefaultOnDeletePolicy string VolStatsCacheExpireInMinutes int + RemoveArchivedVolumePath bool } type Driver struct { - name string - nodeID string - version string - endpoint string - mountPermissions uint64 - workingMountDir string - defaultOnDeletePolicy string + name string + nodeID string + version string + endpoint string + mountPermissions uint64 + workingMountDir string + defaultOnDeletePolicy string + removeArchivedVolumePath bool //ids *identityServer ns *NodeServer @@ -91,6 +93,7 @@ func NewDriver(options *DriverOptions) *Driver { mountPermissions: options.MountPermissions, workingMountDir: options.WorkingMountDir, volStatsCacheExpireInMinutes: options.VolStatsCacheExpireInMinutes, + removeArchivedVolumePath: options.RemoveArchivedVolumePath, } n.AddControllerServiceCapabilities([]csi.ControllerServiceCapability_RPC_Type{