Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #67851 from aniket-s-kulkarni/flexvolume-resize-im…
…plementation Flexvolume resize implementation
- Loading branch information
Showing
25 changed files
with
553 additions
and
37 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,45 @@ | ||
| /* | ||
| Copyright 2018 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 ( | ||
| "github.com/golang/glog" | ||
| "k8s.io/apimachinery/pkg/api/resource" | ||
| "k8s.io/kubernetes/pkg/volume" | ||
| "k8s.io/kubernetes/pkg/volume/util" | ||
| ) | ||
|
|
||
| type expanderDefaults struct { | ||
| plugin *flexVolumePlugin | ||
| } | ||
|
|
||
| func newExpanderDefaults(plugin *flexVolumePlugin) *expanderDefaults { | ||
| return &expanderDefaults{plugin} | ||
| } | ||
|
|
||
| func (e *expanderDefaults) ExpandVolumeDevice(spec *volume.Spec, newSize resource.Quantity, oldSize resource.Quantity) (resource.Quantity, error) { | ||
| glog.Warning(logPrefix(e.plugin), "using default expand for volume ", spec.Name(), ", to size ", newSize, " from ", oldSize) | ||
| return newSize, nil | ||
| } | ||
|
|
||
| // the defaults for ExpandFS return a generic resize indicator that will trigger the operation executor to go ahead with | ||
| // generic filesystem resize | ||
| func (e *expanderDefaults) ExpandFS(spec *volume.Spec, devicePath, deviceMountPath string, _, _ resource.Quantity) error { | ||
| glog.Warning(logPrefix(e.plugin), "using default filesystem resize for volume ", spec.Name(), ", at ", devicePath) | ||
| _, err := util.GenericResizeFS(e.plugin.host, e.plugin.GetPluginName(), devicePath, deviceMountPath) | ||
| return err | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,67 @@ | ||
| /* | ||
| Copyright 2018 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 ( | ||
| "fmt" | ||
| "k8s.io/apimachinery/pkg/api/resource" | ||
| "k8s.io/kubernetes/pkg/volume" | ||
| "strconv" | ||
| ) | ||
|
|
||
| func (plugin *flexVolumePlugin) ExpandVolumeDevice(spec *volume.Spec, newSize resource.Quantity, oldSize resource.Quantity) (resource.Quantity, error) { | ||
| call := plugin.NewDriverCall(expandVolumeCmd) | ||
| call.AppendSpec(spec, plugin.host, nil) | ||
|
|
||
| devicePath, err := plugin.getDeviceMountPath(spec) | ||
| if err != nil { | ||
| return newSize, err | ||
| } | ||
| call.Append(devicePath) | ||
| call.Append(strconv.FormatInt(newSize.Value(), 10)) | ||
| call.Append(strconv.FormatInt(oldSize.Value(), 10)) | ||
|
|
||
| _, err = call.Run() | ||
| if isCmdNotSupportedErr(err) { | ||
| return newExpanderDefaults(plugin).ExpandVolumeDevice(spec, newSize, oldSize) | ||
| } | ||
| return newSize, err | ||
| } | ||
|
|
||
| func (plugin *flexVolumePlugin) ExpandFS(spec *volume.Spec, devicePath, deviceMountPath string, newSize, oldSize resource.Quantity) error { | ||
| // This method is called after we spec.PersistentVolume.Spec.Capacity | ||
| // has been updated to the new size. The underlying driver thus sees | ||
| // the _new_ (requested) size and can find out the _current_ size from | ||
| // its underlying storage implementation | ||
|
|
||
| if spec.PersistentVolume == nil { | ||
| return fmt.Errorf("PersistentVolume not found for spec: %s", spec.Name()) | ||
| } | ||
|
|
||
| call := plugin.NewDriverCall(expandFSCmd) | ||
| call.AppendSpec(spec, plugin.host, nil) | ||
| call.Append(devicePath) | ||
| call.Append(deviceMountPath) | ||
| call.Append(strconv.FormatInt(newSize.Value(), 10)) | ||
| call.Append(strconv.FormatInt(oldSize.Value(), 10)) | ||
|
|
||
| _, err := call.Run() | ||
| if isCmdNotSupportedErr(err) { | ||
| return newExpanderDefaults(plugin).ExpandFS(spec, devicePath, deviceMountPath, newSize, oldSize) | ||
| } | ||
| return err | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,77 @@ | ||
| /* | ||
| Copyright 2018 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 volume | ||
|
|
||
| import ( | ||
| "k8s.io/api/core/v1" | ||
| "k8s.io/apimachinery/pkg/api/resource" | ||
| "k8s.io/apimachinery/pkg/types" | ||
| ) | ||
|
|
||
| type noopExpandableVolumePluginInstance struct { | ||
| spec *Spec | ||
| } | ||
|
|
||
| var _ ExpandableVolumePlugin = &noopExpandableVolumePluginInstance{} | ||
|
|
||
| func (n *noopExpandableVolumePluginInstance) ExpandVolumeDevice(spec *Spec, newSize resource.Quantity, oldSize resource.Quantity) (resource.Quantity, error) { | ||
| return newSize, nil | ||
| } | ||
|
|
||
| func (n *noopExpandableVolumePluginInstance) Init(host VolumeHost) error { | ||
| return nil | ||
| } | ||
|
|
||
| func (n *noopExpandableVolumePluginInstance) GetPluginName() string { | ||
| return n.spec.KubeletExpandablePluginName() | ||
| } | ||
|
|
||
| func (n *noopExpandableVolumePluginInstance) GetVolumeName(spec *Spec) (string, error) { | ||
| return n.spec.Name(), nil | ||
| } | ||
|
|
||
| func (n *noopExpandableVolumePluginInstance) CanSupport(spec *Spec) bool { | ||
| return true | ||
| } | ||
|
|
||
| func (n *noopExpandableVolumePluginInstance) RequiresRemount() bool { | ||
| return false | ||
| } | ||
|
|
||
| func (n *noopExpandableVolumePluginInstance) NewMounter(spec *Spec, podRef *v1.Pod, opts VolumeOptions) (Mounter, error) { | ||
| return nil, nil | ||
| } | ||
|
|
||
| func (n *noopExpandableVolumePluginInstance) NewUnmounter(name string, podUID types.UID) (Unmounter, error) { | ||
| return nil, nil | ||
| } | ||
|
|
||
| func (n *noopExpandableVolumePluginInstance) ConstructVolumeSpec(volumeName, mountPath string) (*Spec, error) { | ||
| return n.spec, nil | ||
| } | ||
|
|
||
| func (n *noopExpandableVolumePluginInstance) SupportsMountOption() bool { | ||
| return true | ||
| } | ||
|
|
||
| func (n *noopExpandableVolumePluginInstance) SupportsBulkVolumeVerification() bool { | ||
| return false | ||
| } | ||
|
|
||
| func (n *noopExpandableVolumePluginInstance) RequiresFSResize() bool { | ||
| return true | ||
| } |
Oops, something went wrong.