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

remove redundant carriage return (cont'd)

Browse Source
This commit is contained in:
Di Xu 2017-05-30 16:29:21 +08:00
parent bc93e7bcde
commit caeb584230
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/kubelet/kubelet_volumes.go
View File

@ -79,8 +79,7 @@ func (kl *Kubelet) newVolumeMounterFromPlugins(spec *volume.Spec, pod *v1.Pod, o
// cleanupOrphanedPodDirs removes the volumes of pods that should not be // cleanupOrphanedPodDirs removes the volumes of pods that should not be
// running and that have no containers running. Note that we roll up logs here since it runs in the main loop. // running and that have no containers running. Note that we roll up logs here since it runs in the main loop.
func (kl *Kubelet) cleanupOrphanedPodDirs( func (kl *Kubelet) cleanupOrphanedPodDirs(pods []*v1.Pod, runningPods []*kubecontainer.Pod) error {
pods []*v1.Pod, runningPods []*kubecontainer.Pod) error {
allPods := sets.NewString() allPods := sets.NewString()
for _, pod := range pods { for _, pod := range pods {
allPods.Insert(string(pod.UID)) allPods.Insert(string(pod.UID))

3
pkg/volume/host_path/host_path.go
View File

@ -298,8 +298,7 @@ func (r *hostPathDeleter) Delete() error {
return os.RemoveAll(r.GetPath()) return os.RemoveAll(r.GetPath())
} }
func getVolumeSource( func getVolumeSource(spec *volume.Spec) (*v1.HostPathVolumeSource, bool, error) {
spec *volume.Spec) (*v1.HostPathVolumeSource, bool, error) {
if spec.Volume != nil && spec.Volume.HostPath != nil { if spec.Volume != nil && spec.Volume.HostPath != nil {
return spec.Volume.HostPath, spec.ReadOnly, nil return spec.Volume.HostPath, spec.ReadOnly, nil
} else if spec.PersistentVolume != nil && } else if spec.PersistentVolume != nil &&