d6f76a000d
Automatic merge from submit-queue (batch tested with PRs 47806, 49539, 48763, 47049, 50600). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.. flexvolume: remove a mount directory in a error case **What this PR does / why we need it**: flexVolumeMounter.SetUpAt creates a directory, where a volume has to be mounted, and we have to remove this directory in a error case. Otherwise we see errors like this: Orphaned pod 673b66d9-70f7-11e7-a5fa-525400307392 found, but volume paths are still present on disk **Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes # https://github.com/kubernetes/kubernetes/issues/49383 **Special notes for your reviewer**: **Release note**: Fix a rollback code for the flexvolume mount operation
111 lines
2.6 KiB
Go
111 lines
2.6 KiB
Go
/*
|
|
Copyright 2017 The Kubernetes Authors.
|
|
|
|
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 flexvolume
|
|
|
|
import (
|
|
"os"
|
|
"strconv"
|
|
|
|
"k8s.io/kubernetes/pkg/volume"
|
|
"k8s.io/utils/exec"
|
|
)
|
|
|
|
// FlexVolumeMounter is the disk that will be exposed by this plugin.
|
|
type flexVolumeMounter struct {
|
|
*flexVolume
|
|
// Runner used to setup the volume.
|
|
runner exec.Interface
|
|
// the considered volume spec
|
|
spec *volume.Spec
|
|
readOnly bool
|
|
volume.MetricsNil
|
|
}
|
|
|
|
var _ volume.Mounter = &flexVolumeMounter{}
|
|
|
|
// Mounter interface
|
|
|
|
// SetUp creates new directory.
|
|
func (f *flexVolumeMounter) SetUp(fsGroup *int64) error {
|
|
return f.SetUpAt(f.GetPath(), fsGroup)
|
|
}
|
|
|
|
// SetUpAt creates new directory.
|
|
func (f *flexVolumeMounter) SetUpAt(dir string, fsGroup *int64) error {
|
|
// Mount only once.
|
|
alreadyMounted, err := prepareForMount(f.mounter, dir)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
if alreadyMounted {
|
|
return nil
|
|
}
|
|
|
|
call := f.plugin.NewDriverCall(mountCmd)
|
|
|
|
// Interface parameters
|
|
call.Append(dir)
|
|
|
|
extraOptions := make(map[string]string)
|
|
|
|
// pod metadata
|
|
extraOptions[optionKeyPodName] = f.podName
|
|
extraOptions[optionKeyPodNamespace] = f.podNamespace
|
|
extraOptions[optionKeyPodUID] = string(f.podUID)
|
|
// service account metadata
|
|
extraOptions[optionKeyServiceAccountName] = f.podServiceAccountName
|
|
|
|
// Extract secret and pass it as options.
|
|
if err := addSecretsToOptions(extraOptions, f.spec, f.podNamespace, f.driverName, f.plugin.host); err != nil {
|
|
os.Remove(dir)
|
|
return err
|
|
}
|
|
|
|
// Implicit parameters
|
|
if fsGroup != nil {
|
|
extraOptions[optionFSGroup] = strconv.FormatInt(int64(*fsGroup), 10)
|
|
}
|
|
|
|
call.AppendSpec(f.spec, f.plugin.host, extraOptions)
|
|
|
|
_, err = call.Run()
|
|
if isCmdNotSupportedErr(err) {
|
|
err = (*mounterDefaults)(f).SetUpAt(dir, fsGroup)
|
|
}
|
|
|
|
if err != nil {
|
|
os.Remove(dir)
|
|
return err
|
|
}
|
|
|
|
if !f.readOnly {
|
|
volume.SetVolumeOwnership(f, fsGroup)
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
// GetAttributes get the flex volume attributes. The attributes will be queried
|
|
// using plugin callout after we finalize the callout syntax.
|
|
func (f *flexVolumeMounter) GetAttributes() volume.Attributes {
|
|
return (*mounterDefaults)(f).GetAttributes()
|
|
}
|
|
|
|
func (f *flexVolumeMounter) CanMount() error {
|
|
return nil
|
|
}
|