Skip to content

Commit 517922f

Browse files
authored
Merge pull request kubernetes#75308 from msau42/csi-beta-e2e
ignore kubeclient nil in csi plugin init
2 parents 2748ac6 + 398777f commit 517922f

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

pkg/volume/csi/csi_plugin.go

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -215,13 +215,14 @@ func (p *csiPlugin) Init(host volume.VolumeHost) error {
215215
if utilfeature.DefaultFeatureGate.Enabled(features.CSIDriverRegistry) {
216216
csiClient := host.GetKubeClient()
217217
if csiClient == nil {
218-
return errors.New("unable to get Kubernetes client")
218+
klog.Warning(log("kubeclient not set, assuming standalone kubelet"))
219+
} else {
220+
// Start informer for CSIDrivers.
221+
factory := csiapiinformer.NewSharedInformerFactory(csiClient, csiResyncPeriod)
222+
p.csiDriverInformer = factory.Storage().V1beta1().CSIDrivers()
223+
p.csiDriverLister = p.csiDriverInformer.Lister()
224+
go factory.Start(wait.NeverStop)
219225
}
220-
// Start informer for CSIDrivers.
221-
factory := csiapiinformer.NewSharedInformerFactory(csiClient, csiResyncPeriod)
222-
p.csiDriverInformer = factory.Storage().V1beta1().CSIDrivers()
223-
p.csiDriverLister = p.csiDriverInformer.Lister()
224-
go factory.Start(wait.NeverStop)
225226
}
226227

227228
var migratedPlugins = map[string](func() bool){

0 commit comments

Comments
 (0)