github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-19 09:52:49 +00:00
Code Issues Projects Releases Wiki Activity

Fix CSI initialization conflict

Browse Source 
CSI is used by both the kubelet and kube-controller-manager.  Both
components will initialize the csiPlugin with different VolumeHost
objects.  The csiPlugin will then assign a global variable for
the node info manager.  It is then possible that the kubelet gets
the credentials of the kube-controller-manager and that will cause
CSI to fail.
This commit is contained in:
Darren Shepherd 2019-08-30 11:22:18 -07:00 committed by Rafael Breno
parent 29259d5dff
commit 98f88727e6
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkg/volume/csi/csi_plugin.go
View File

@ -320,7 +320,7 @@ func (p *csiPlugin) Init(host volume.VolumeHost) error {
}
}
var migratedPlugins = map[string](func() bool){
migratedPlugins := map[string](func() bool){
csitranslationplugins.GCEPDInTreePluginName: func() bool {
return true
},
@ -345,18 +345,22 @@ func (p *csiPlugin) Init(host volume.VolumeHost) error {
}
// Initializing the label management channels
nim = nodeinfomanager.NewNodeInfoManager(host.GetNodeName(), host, migratedPlugins)
localNim := nodeinfomanager.NewNodeInfoManager(host.GetNodeName(), host, migratedPlugins)
PluginHandler.csiPlugin = p
// This function prevents Kubelet from posting Ready status until CSINode
// is both installed and initialized
if err := initializeCSINode(host, p.csiDriverInformer); err != nil {
if err := initializeCSINode(host, localNim, p.csiDriverInformer); err != nil {
return errors.New(log("failed to initialize CSINode: %v", err))
}
if _, ok := host.(volume.KubeletVolumeHost); ok {
nim = localNim
}
return nil
}
func initializeCSINode(host volume.VolumeHost, csiDriverInformer cache.SharedIndexInformer) error {
func initializeCSINode(host volume.VolumeHost, nim nodeinfomanager.Interfacem, csiDriverInformer cache.SharedIndexInformer) error {
kvh, ok := host.(volume.KubeletVolumeHost)
if !ok {
klog.V(4).Info("Cast from VolumeHost to KubeletVolumeHost failed. Skipping CSINode initialization, not running on kubelet")
@ -471,8 +475,8 @@ func (p *csiPlugin) RequiresRemount(spec *volume.Spec) bool {
func (p *csiPlugin) NewMounter(
spec *volume.Spec,
pod *api.Pod) (volume.Mounter, error) {
pod *api.Pod,
) (volume.Mounter, error) {
volSrc, pvSrc, err := getSourceFromSpec(spec)
if err != nil {
return nil, err