github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Start plugin watcher after initialization of all kubelet components

Browse Source
This commit is contained in:
vikaschoudhary16
2018-06-04 14:38:08 -04:00
parent c855accaec
commit e8119dc134
1 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
pkg/kubelet/kubelet.go
View File

@@ -786,7 +786,9 @@ func NewMainKubelet(kubeCfg *kubeletconfiginternal.KubeletConfiguration,
if err != nil { if err != nil {
return nil, err return nil, err
} }
klet.pluginWatcher = pluginwatcher.NewWatcher(klet.getPluginsDir()) if klet.enablePluginsWatcher {
klet.pluginWatcher = pluginwatcher.NewWatcher(klet.getPluginsDir())
}
// If the experimentalMounterPathFlag is set, we do not want to // If the experimentalMounterPathFlag is set, we do not want to
// check node capabilities since the mount path is not the default // check node capabilities since the mount path is not the default
@@ -1290,15 +1292,6 @@ func (kl *Kubelet) initializeModules() error {
glog.Errorf("Failed to create directory %q: %v", ContainerLogsDir, err) glog.Errorf("Failed to create directory %q: %v", ContainerLogsDir, err)
} }
} }
if kl.enablePluginsWatcher {
// Adding Registration Callback function for CSI Driver
kl.pluginWatcher.AddHandler("CSIPlugin", csi.RegistrationCallback)
// Start the plugin watcher
if err := kl.pluginWatcher.Start(); err != nil {
return fmt.Errorf("failed to start Plugin Watcher. err: %v", err)
}
}
// Start the image manager. // Start the image manager.
kl.imageManager.Start() kl.imageManager.Start()
@@ -1347,6 +1340,16 @@ func (kl *Kubelet) initializeRuntimeDependentModules() {
// container log manager must start after container runtime is up to retrieve information from container runtime // container log manager must start after container runtime is up to retrieve information from container runtime
// and inform container to reopen log file after log rotation. // and inform container to reopen log file after log rotation.
kl.containerLogManager.Start() kl.containerLogManager.Start()
if kl.enablePluginsWatcher {
// Adding Registration Callback function for CSI Driver
kl.pluginWatcher.AddHandler("CSIPlugin", csi.RegistrationCallback)
// Start the plugin watcher
glog.V(4).Infof("starting watcher")
if err := kl.pluginWatcher.Start(); err != nil {
kl.recorder.Eventf(kl.nodeRef, v1.EventTypeWarning, events.KubeletSetupFailed, err.Error())
glog.Fatalf("failed to start Plugin Watcher. err: %v", err)
}
}
} }
// Run starts the kubelet reacting to config updates // Run starts the kubelet reacting to config updates