From 04fb648466efb6ab8993102461b19751398402a5 Mon Sep 17 00:00:00 2001
From: Jiaxun Song <jiaxsong@microsoft.com>
Date: Wed, 3 Feb 2021 00:22:11 -0800
Subject: [PATCH] fix: add runOnMaster switch for helm chart

---
 charts/README.md                              |   1 +
 charts/latest/csi-driver-nfs-v3.0.0.tgz       | Bin 2710 -> 2736 bytes
 .../templates/csi-nfs-controller.yaml         |   3 +++
 charts/latest/csi-driver-nfs/values.yaml      |   1 +
 deploy/csi-nfs-controller.yaml                |   2 +-
 5 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/charts/README.md b/charts/README.md
index df92b3ee..b554f6ef 100644
--- a/charts/README.md
+++ b/charts/README.md
@@ -46,6 +46,7 @@ The following table lists the configurable parameters of the latest NFS CSI Driv
 | `serviceAccount.create`                           | whether create service account of csi-nfs-controller       | true                                                              |
 | `rbac.create`                                     | whether create rbac of csi-nfs-controller                  | true                                                              |
 | `controller.replicas`                             | the replicas of csi-nfs-controller                         | 2                                                                 |
+| `controller.runOnMaster`                          | run controller on master node                              | false                                                             |
 
 ## troubleshooting
  - Add `--wait -v=5 --debug` in `helm install` command to get detailed error
diff --git a/charts/latest/csi-driver-nfs-v3.0.0.tgz b/charts/latest/csi-driver-nfs-v3.0.0.tgz
index 565627ad6edfaf0d18e0c43e7a31b8ac1ee72d1d..2d31cc105af6dfed8948f25c96565d67499421c7 100644
GIT binary patch
delta 2704
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
K4Zm6dMgRbN7hS0U

delta 2677
zcmV-*3X1ix6_yo{Jb&SH;yALO&;Bd=k*!y=Q)6RD!tA3eA7+#6d#T;Yq{6(p+S<BG
z3Aq6+vgDOy5;m9n+pi=Uunhz<$s{+o^amhPOKP>dTirh^RI@NqY=SBj1Km6x5oMw&
zN%^a%qd1P^&cT8Ej^nug9k)8|SFM9MK5Tb7`|-P1aqA#%cYj_%{Dd;BrCb}LUd4}I
ztG>B!gh<9dqtZ-@E=*bh$+G#MoEX$5NKjM7GUM8gduMR|Qx8s@$-qD=_&M*R5@=8d
zf~44ms!0Wt`Skly9L2#)?|4ULs`>wf@Er9M2Y?O!-)bGS>i*yEw0Hjh9K=#G#BKlp
zAO_n1u%s}PntvIord>#>ic&_E)N)`VD%0lp2i>HaHN`-ORI~XgLx%IXF>A|m&Mzcq
zblQcp!MQXS3N;GPKsCEia>8tcK(%`L@eev0QWY`T)NB}PBNZ8<T|dkgW2-Vu+EE-G
zY$pR}6BMZRg_3=IkO;GpnH{+#Kr4#36F|rWeL%g$A%D|Gk%w!-&M|XjHJfFHPFkBq
z(x@hk;(JPEE{v6gDkKKGU{sEQ>Jz%uNTo1Ja_*m@!i+OYbQjvYaR2X3wfJu^&7A)>
z&p&=T?M3FsJbsN$`QLu~pcelR5BK9;{C^IDPa~{nbxgw$jbUO431(bQF##iCDsu&t
z=h~o(f`8zX1Uf=Gu8+=SqCp#Ca{U%EjzlA<Ty%o~V4U}n8V+G-Q$?K-ibuD%5M83<
zi_T}QaCc{A@RNn1Mvl}-b<|Lvb7>UZ-8CQ#uZf|fm)7aGL~H&3YJ@yPr6ZF)HWl3D
z{|ATl`mb})-rxEEbI|Q=^9@W`+69dU28^SbW`B5;TD8y-cHvF)?k)%%8z+6_+7*2x
z<S8iBGFKF}XS%%&A;AF?2n{jNk!No}cy|~0-!?ZGp<>47oX{xyaL*?l){R{P;aY1v
zGe36>KJTk>To%m*7ab903KoxSl%{Z<^J2HeQ?xlYyC)Qh-NQ>isjow8{of^(Hoc!`
zc7I=76>jkVPOH6N_5XH!*lO+k|2ZfO!(hxr(uEUu)Tg!rD1$;I%XD+n3Q{yAA%<8V
zUf?`c3n{wX3EqWu2YYaP3rtX+C$&Hk!9ReB1ciaN<<l9`YB^!2{Olo$l3mXF?HGVr
zuHZ|k)FuSK%%hJbl4WazpILt~biU&)1b^=M#W$@0Fx!;-U8%Ir*Jw4=q~NzjUazt}
zOXE2JXA48AyTF;qZ;Jj*F{zlD9&@6#UqVl{!89yVxsWPm7$v+IU?fLH43nY+2ZS)j
zX%`x<%v6$NR9!VCcB;mlA3$by7OA?>IQ=6hyxiwdrY<yW=~!;Z!2qcZ*yplGM}L^)
zeBN!<L6|^Q5o%$GtB?Qyk8b$jUf7LmimJFnv?#LS?ykFu+mK;#hRh$h8kXepvNgiV
zQM<9!7+Psbk|@;r=)2eNPfjjRd%f>hFmfabs?a@eCPhV2Vp3nutD=~$(l^()gKVf~
zk(P8^*V07^4%noC1$0ohdVq=Kd4Gx@tT8XCBeks;#EiTgH3_}+RxUJQ!phHZo@G>L
z<Sb?NRRCy~ccB%>X{|lQ)FCLXIQ~#wTj3u$>a{bio2Xr$XQurb9u!sqp?mDGf<0|A
z!z%N3R#>&Sbr#?`oz$UWDaza&?dv6m5fW}jVJ4M1YX48?u)V}FIch)1uz#vs`Vzak
z$8y~BT5ERSkX?y^-o}{h(X_#YEX%UtXr#G2Bcw2RW2z!&icJ{DAtnXZSJ@58NS|?L
zSY3|*BuTpPTch`D@9O=@hqLp>-zyA+b9sF+oBUK$!ij&$R9j`U71>>_vz>LJ`EW(V
zwWk|Pj=p<+{_*7W>g;4yRDVX1WReMU^xf;@-r3dZ`N_q{v-3~iZxx=4c~^z!pOj4N
z8Uz?H<jExtmV1gmZ`wAgh^+MXfM2<CS=QC3LoV1&x7l15A~ySACKDYxf7{@P6QY`&
z^_w<@;Aon5;7WESGcqiUqVXe3nDR$qHJf<m)1|#W3bemM6!3aqk$?59Rrg40uZpT0
zZ>f7*{&(TTsamS((y}YHh-qe~CrowW_HKvxe@nEn{`Z|s4CL3U|KoQ3{zp4Lc(=p<
zo`uS#e(^pr8vo#Gx=E{#hO`QJ;JA0@0sa+8fIWZhk>Ll<>vm!cp`%OuBWKEH4+Fxr
zJ)L|=`-KgVPASI^GJl!Hw-7F@FxvQ6qnS+3#6W%&?${|3gO}FWe->@@f16c2@;=BW
z{O>S6tl|If+K2CU{{I}b2cJev!>{i@{Nm968PKAkewhIN8>nVQvxA~Co)4LT_ZMd%
z`@bVKI@kj<A_j;;5J*vLqNZRZs9d=Bgr#8vsa#=GppOJoDSvwSQ1H=C_?2MChXIL&
zAYTPSEat9)hc?YSM{_OJ*hfa#1F6`M3Bs*n?UNKfUxsU$^91?`eI>^z;F_6{%uRU?
z(EgQgF?%BPtlT>GIN?uBY4bN`M*rsrJpz-w56t_kVJQ1M4CQ$+lzT5o-G{0y-_F{I
zvaA@gY-)U#0Dsl-7VH_B)%T1y3)e4cLZ&GZ4rgihnP}=!<1I8oYCly9p&CGQwp$ws
zX2*IFgYW6HN^&M%fo)d1N7Z5<>M}(s8kS`VZMk~1T&+6MbXC$-Gp|Kpe*XU-Pp=#d
zbN>Fr>9YYbTVPl#Z01>gc`>;1Anu={%(?-#{02bACw~Q1t*gKed3-$b_&EIcEBnez
zfSzk1!Ie9C7#z4Nz}|-sepJWq9`MV<lV7sWt0I0)w^{?%#mAQ};vPY3>wncJG<=#%
zKpX1+_Pb7}hX1t=+PnJyS?KmQ1U8t*)9Q_s$lvjIH~7LZ3~K)@<}3GJWyn_dg#3+`
zr>xnnbbqD0dO=Xzm$l~dZVF7(SGJduV`XoSo8)FB75me<`2rJN4S$AsV^9gg%NJ4H
zMVYO)pmOeGdI%(A|Epx4X`9*<8O@^9g5Mh193?Hzf`Vy+s_z(vXlx0<nRegqTD1M)
zRbYQ5HV&d2_XP`5PFTA2s(F@>)oWED=T$2g9DkG(t+(9gmV3ep3iAb;D|Yi18riz#
zHgAh+X0xUz-O!^Zq*AJciL$k?TEqG1lPGO*^RVQGKQfUpF?_5y)^3D_{bJg!A;8?@
zncf{&#<@j0u>Qv0HWALoh$78i4ocfa7??lFdz4iPkBj(UJO85*@{|pQRQPmf%%=B$
zhkxzP(*J+%@6P{cp*^@D#u}CeBf&p;xE`T^e$Kdc8psG8lOgITC|(xmJj<jq8uSP`
zhas1J505i3d<zO~i9JD=dY9UXNP;~O=xZBzohcl!8%!J+4gd9h1Rn*Tf)s9~6$vs_
zz?r}(h)#M}JtGwcdvGk%R0{Zf+=GNE9d1NJW}5EPiyuV&KULFx&KgF;ru~@xsVAbj
zn5a+aIM3YM4;{RT^mP`ziTY$5yopSj1#kWt?7?TEn9Mbtot)|*%9OO>A&6Llr0MyT
j{5^;!n#u&5-*Q2)qaE$&FGK$d00960aUb5L07d`+mAO1F

diff --git a/charts/latest/csi-driver-nfs/templates/csi-nfs-controller.yaml b/charts/latest/csi-driver-nfs/templates/csi-nfs-controller.yaml
index 4bb90875..36338ee6 100644
--- a/charts/latest/csi-driver-nfs/templates/csi-nfs-controller.yaml
+++ b/charts/latest/csi-driver-nfs/templates/csi-nfs-controller.yaml
@@ -18,6 +18,9 @@ spec:
       serviceAccountName: csi-nfs-controller-sa
       nodeSelector:
         kubernetes.io/os: linux
+        {{- if .Values.controller.runOnMaster}}
+        kubernetes.io/role: master
+        {{- end}}
       priorityClassName: system-cluster-critical
       tolerations:
         - key: "node-role.kubernetes.io/master"
diff --git a/charts/latest/csi-driver-nfs/values.yaml b/charts/latest/csi-driver-nfs/values.yaml
index 42d05c5b..7dca8d70 100644
--- a/charts/latest/csi-driver-nfs/values.yaml
+++ b/charts/latest/csi-driver-nfs/values.yaml
@@ -21,3 +21,4 @@ rbac:
   create: true
 controller:
   replicas: 2
+  runOnMaster: false
diff --git a/deploy/csi-nfs-controller.yaml b/deploy/csi-nfs-controller.yaml
index 67b3184c..a85d94b7 100644
--- a/deploy/csi-nfs-controller.yaml
+++ b/deploy/csi-nfs-controller.yaml
@@ -16,7 +16,7 @@ spec:
     spec:
       serviceAccountName: csi-nfs-controller-sa
       nodeSelector:
-        kubernetes.io/os: linux
+        kubernetes.io/os: linux  # add "kubernetes.io/role: master" to run controller on master node
       priorityClassName: system-cluster-critical
       tolerations:
         - key: "node-role.kubernetes.io/master"