9dbe943491
This PR contains Kubelet changes to enable attach/detach controller control. * It introduces a new "enable-controller-attach-detach" kubelet flag to enable control by controller. Default enabled. * It removes all references "SafeToDetach" annoation from controller. * It adds the new VolumesInUse field to the Node Status API object. * It modifies the controller to use VolumesInUse instead of SafeToDetach annotation to gate detachment. * There is a bug in node-problem-detector that causes VolumesInUse to get reset every 30 seconds. Issue https://github.com/kubernetes/node-problem-detector/issues/9 opened to fix that.
104 lines
3.1 KiB
Go
104 lines
3.1 KiB
Go
/*
|
|
Copyright 2015 The Kubernetes Authors All rights reserved.
|
|
|
|
Licensed under the Apache License, Version 2.0 (the "License");
|
|
you may not use this file except in compliance with the License.
|
|
You may obtain a copy of the License at
|
|
|
|
http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
Unless required by applicable law or agreed to in writing, software
|
|
distributed under the License is distributed on an "AS IS" BASIS,
|
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
See the License for the specific language governing permissions and
|
|
limitations under the License.
|
|
*/
|
|
|
|
package kubelet
|
|
|
|
import (
|
|
"sync"
|
|
|
|
"k8s.io/kubernetes/pkg/api"
|
|
kubecontainer "k8s.io/kubernetes/pkg/kubelet/container"
|
|
"k8s.io/kubernetes/pkg/types"
|
|
)
|
|
|
|
// volumeManager manages the volumes for the pods running on the kubelet.
|
|
// Currently it only does book keeping, but it can be expanded to
|
|
// take care of the volumePlugins.
|
|
// TODO(saad-ali): note that volumeManager will be completley refactored as part
|
|
// of mount/unmount refactor.
|
|
type volumeManager struct {
|
|
lock sync.RWMutex
|
|
volumeMaps map[types.UID]kubecontainer.VolumeMap
|
|
volumesInUse []api.UniqueDeviceName
|
|
}
|
|
|
|
func newVolumeManager() *volumeManager {
|
|
vm := &volumeManager{
|
|
volumeMaps: make(map[types.UID]kubecontainer.VolumeMap),
|
|
volumesInUse: []api.UniqueDeviceName{},
|
|
}
|
|
return vm
|
|
}
|
|
|
|
// SetVolumes sets the volume map for a pod.
|
|
// TODO(yifan): Currently we assume the volume is already mounted, so we only do a book keeping here.
|
|
func (vm *volumeManager) SetVolumes(podUID types.UID, podVolumes kubecontainer.VolumeMap) {
|
|
vm.lock.Lock()
|
|
defer vm.lock.Unlock()
|
|
vm.volumeMaps[podUID] = podVolumes
|
|
}
|
|
|
|
// GetVolumes returns the volume map which are already mounted on the host machine
|
|
// for a pod.
|
|
func (vm *volumeManager) GetVolumes(podUID types.UID) (kubecontainer.VolumeMap, bool) {
|
|
vm.lock.RLock()
|
|
defer vm.lock.RUnlock()
|
|
vol, ok := vm.volumeMaps[podUID]
|
|
return vol, ok
|
|
}
|
|
|
|
// DeleteVolumes removes the reference to a volume map for a pod.
|
|
func (vm *volumeManager) DeleteVolumes(podUID types.UID) {
|
|
vm.lock.Lock()
|
|
defer vm.lock.Unlock()
|
|
delete(vm.volumeMaps, podUID)
|
|
}
|
|
|
|
// AddVolumeInUse adds specified volume to volumesInUse list, if it doesn't
|
|
// already exist
|
|
func (vm *volumeManager) AddVolumeInUse(uniqueDeviceName api.UniqueDeviceName) {
|
|
vm.lock.Lock()
|
|
defer vm.lock.Unlock()
|
|
for _, volume := range vm.volumesInUse {
|
|
if volume == uniqueDeviceName {
|
|
// Volume already exists in list
|
|
return
|
|
}
|
|
}
|
|
|
|
vm.volumesInUse = append(vm.volumesInUse, uniqueDeviceName)
|
|
}
|
|
|
|
// RemoveVolumeInUse removes the specified volume from volumesInUse list, if it
|
|
// exists
|
|
func (vm *volumeManager) RemoveVolumeInUse(uniqueDeviceName api.UniqueDeviceName) {
|
|
vm.lock.Lock()
|
|
defer vm.lock.Unlock()
|
|
for i := len(vm.volumesInUse) - 1; i >= 0; i-- {
|
|
if vm.volumesInUse[i] == uniqueDeviceName {
|
|
// Volume exists, remove it
|
|
vm.volumesInUse = append(vm.volumesInUse[:i], vm.volumesInUse[i+1:]...)
|
|
}
|
|
}
|
|
}
|
|
|
|
// GetVolumesInUse returns the volumesInUse list
|
|
func (vm *volumeManager) GetVolumesInUse() []api.UniqueDeviceName {
|
|
vm.lock.RLock()
|
|
defer vm.lock.RUnlock()
|
|
return vm.volumesInUse
|
|
}
|