Skip to content

Commit 5288c3f

Browse files
committed
feat(taint-remover): add taint remover to local controller
the local controller now calls the taint-remover if the discovery was successful (provisioner ready) and taint has not already been removed.
1 parent 00e2543 commit 5288c3f

File tree

1 file changed

+7
-0
lines changed

1 file changed

+7
-0
lines changed

pkg/controller/controller.go

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ import (
2828
"sigs.k8s.io/sig-storage-local-static-provisioner/pkg/common"
2929
"sigs.k8s.io/sig-storage-local-static-provisioner/pkg/deleter"
3030
"sigs.k8s.io/sig-storage-local-static-provisioner/pkg/discovery"
31+
nodetaint "sigs.k8s.io/sig-storage-local-static-provisioner/pkg/node-taint"
3132
"sigs.k8s.io/sig-storage-local-static-provisioner/pkg/populator"
3233
"sigs.k8s.io/sig-storage-local-static-provisioner/pkg/util"
3334

@@ -161,6 +162,9 @@ func StartLocalController(signal *signal, client *kubernetes.Clientset, ptable d
161162
go jobController.Run(jobControllerStopChan)
162163
}
163164
klog.Info("Controller started\n")
165+
166+
nodeTaintRemover := nodetaint.NewRemover(runtimeConfig)
167+
164168
for {
165169
select {
166170
case stopped := <-signal.closing:
@@ -174,6 +178,9 @@ func StartLocalController(signal *signal, client *kubernetes.Clientset, ptable d
174178
default:
175179
deleter.DeletePVs()
176180
discoverer.DiscoverLocalVolumes()
181+
if !nodeTaintRemover.ShouldRemoveTaint() && discoverer.Readyz.Check(nil) == nil {
182+
nodeTaintRemover.RemoveNodeTaint()
183+
}
177184
time.Sleep(discoveryPeriod)
178185
}
179186
}

0 commit comments

Comments
 (0)