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

rename StorageType StorageMedium

Browse Source
This commit is contained in:
Tim Hockin 2015-05-18 13:26:09 -07:00
parent f66ca25d9f
commit fd22f48f5b
11 changed files with 41 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/api/types.go
View File

@ -354,15 +354,15 @@ type EmptyDirVolumeSource struct {
// this will cover the most common needs. // this will cover the most common needs.
// Optional: what type of storage medium should back this directory. // Optional: what type of storage medium should back this directory.
// The default is "" which means to use the node's default medium. // The default is "" which means to use the node's default medium.
Medium StorageType `json:"medium"` Medium StorageMedium `json:"medium"`
} }
// StorageType defines ways that storage can be allocated to a volume. // StorageMedium defines ways that storage can be allocated to a volume.
type StorageType string type StorageMedium string
const ( const (
StorageTypeDefault StorageType = "" // use whatever the default is for the node StorageMediumDefault StorageMedium = "" // use whatever the default is for the node
StorageTypeMemory StorageType = "Memory" // use memory (tmpfs) StorageMediumMemory StorageMedium = "Memory" // use memory (tmpfs)
) )
// Protocol defines network protocols supported for things like conatiner ports. // Protocol defines network protocols supported for things like conatiner ports.

4
pkg/api/v1/conversion_generated.go
View File

@ -657,7 +657,7 @@ func convert_v1_EmptyDirVolumeSource_To_api_EmptyDirVolumeSource(in *EmptyDirVol
if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found {
defaulting.(func(*EmptyDirVolumeSource))(in) defaulting.(func(*EmptyDirVolumeSource))(in)
} }
out.Medium = newer.StorageType(in.Medium) out.Medium = newer.StorageMedium(in.Medium)
return nil return nil
} }
@ -665,7 +665,7 @@ func convert_api_EmptyDirVolumeSource_To_v1_EmptyDirVolumeSource(in *newer.Empty
if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found {
defaulting.(func(*newer.EmptyDirVolumeSource))(in) defaulting.(func(*newer.EmptyDirVolumeSource))(in)
} }
out.Medium = StorageType(in.Medium) out.Medium = StorageMedium(in.Medium)
return nil return nil
} }

10
pkg/api/v1/types.go
View File

@ -366,7 +366,7 @@ type HostPathVolumeSource struct {
type EmptyDirVolumeSource struct { type EmptyDirVolumeSource struct {
// Optional: what type of storage medium should back this directory. // Optional: what type of storage medium should back this directory.
// The default is "" which means to use the node's default medium. // The default is "" which means to use the node's default medium.
Medium StorageType `json:"medium,omitempty" description:"type of storage used to back the volume; must be an empty string (default) or Memory"` Medium StorageMedium `json:"medium,omitempty" description:"type of storage used to back the volume; must be an empty string (default) or Memory"`
} }
// GlusterfsVolumeSource represents a Glusterfs Mount that lasts the lifetime of a pod // GlusterfsVolumeSource represents a Glusterfs Mount that lasts the lifetime of a pod
@ -382,12 +382,12 @@ type GlusterfsVolumeSource struct {
ReadOnly bool `json:"readOnly,omitempty" description:"glusterfs volume to be mounted with read-only permissions"` ReadOnly bool `json:"readOnly,omitempty" description:"glusterfs volume to be mounted with read-only permissions"`
} }
// StorageType defines ways that storage can be allocated to a volume. // StorageMedium defines ways that storage can be allocated to a volume.
type StorageType string type StorageMedium string
const ( const (
StorageTypeDefault StorageType = "" // use whatever the default is for the node StorageMediumDefault StorageMedium = "" // use whatever the default is for the node
StorageTypeMemory StorageType = "Memory" // use memory (tmpfs) StorageMediumMemory StorageMedium = "Memory" // use memory (tmpfs)
) )
// Protocol defines network protocols supported for things like conatiner ports. // Protocol defines network protocols supported for things like conatiner ports.

10
pkg/api/v1beta1/types.go
View File

@ -267,15 +267,15 @@ type HostPathVolumeSource struct {
type EmptyDirVolumeSource struct { type EmptyDirVolumeSource struct {
// Optional: what type of storage medium should back this directory. // Optional: what type of storage medium should back this directory.
// The default is "" which means to use the node's default medium. // The default is "" which means to use the node's default medium.
Medium StorageType `json:"medium" description:"type of storage used to back the volume; must be an empty string (default) or Memory"` Medium StorageMedium `json:"medium" description:"type of storage used to back the volume; must be an empty string (default) or Memory"`
} }
// StorageType defines ways that storage can be allocated to a volume. // StorageMedium defines ways that storage can be allocated to a volume.
type StorageType string type StorageMedium string
const ( const (
StorageTypeDefault StorageType = "" // use whatever the default is for the node StorageMediumDefault StorageMedium = "" // use whatever the default is for the node
StorageTypeMemory StorageType = "Memory" // use memory (tmpfs) StorageMediumMemory StorageMedium = "Memory" // use memory (tmpfs)
) )
// Protocol defines network protocols supported for things like conatiner ports. // Protocol defines network protocols supported for things like conatiner ports.

10
pkg/api/v1beta2/types.go
View File

@ -235,15 +235,15 @@ type HostPathVolumeSource struct {
type EmptyDirVolumeSource struct { type EmptyDirVolumeSource struct {
// Optional: what type of storage medium should back this directory. // Optional: what type of storage medium should back this directory.
// The default is "" which means to use the node's default medium. // The default is "" which means to use the node's default medium.
Medium StorageType `json:"medium" description:"type of storage used to back the volume; must be an empty string (default) or Memory"` Medium StorageMedium `json:"medium" description:"type of storage used to back the volume; must be an empty string (default) or Memory"`
} }
// StorageType defines ways that storage can be allocated to a volume. // StorageMedium defines ways that storage can be allocated to a volume.
type StorageType string type StorageMedium string
const ( const (
StorageTypeDefault StorageType = "" // use whatever the default is for the node StorageMediumDefault StorageMedium = "" // use whatever the default is for the node
StorageTypeMemory StorageType = "Memory" // use memory (tmpfs) StorageMediumMemory StorageMedium = "Memory" // use memory (tmpfs)
) )
// SecretVolumeSource adapts a Secret into a VolumeSource // SecretVolumeSource adapts a Secret into a VolumeSource

4
pkg/api/v1beta3/conversion_generated.go
View File

@ -471,7 +471,7 @@ func convert_v1beta3_EmptyDirVolumeSource_To_api_EmptyDirVolumeSource(in *EmptyD
if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found {
defaulting.(func(*EmptyDirVolumeSource))(in) defaulting.(func(*EmptyDirVolumeSource))(in)
} }
out.Medium = newer.StorageType(in.Medium) out.Medium = newer.StorageMedium(in.Medium)
return nil return nil
} }
@ -479,7 +479,7 @@ func convert_api_EmptyDirVolumeSource_To_v1beta3_EmptyDirVolumeSource(in *newer.
if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found {
defaulting.(func(*newer.EmptyDirVolumeSource))(in) defaulting.(func(*newer.EmptyDirVolumeSource))(in)
} }
out.Medium = StorageType(in.Medium) out.Medium = StorageMedium(in.Medium)
return nil return nil
} }

10
pkg/api/v1beta3/types.go
View File

@ -366,7 +366,7 @@ type HostPathVolumeSource struct {
type EmptyDirVolumeSource struct { type EmptyDirVolumeSource struct {
// Optional: what type of storage medium should back this directory. // Optional: what type of storage medium should back this directory.
// The default is "" which means to use the node's default medium. // The default is "" which means to use the node's default medium.
Medium StorageType `json:"medium,omitempty" description:"type of storage used to back the volume; must be an empty string (default) or Memory"` Medium StorageMedium `json:"medium,omitempty" description:"type of storage used to back the volume; must be an empty string (default) or Memory"`
} }
// GlusterfsVolumeSource represents a Glusterfs Mount that lasts the lifetime of a pod // GlusterfsVolumeSource represents a Glusterfs Mount that lasts the lifetime of a pod
@ -382,12 +382,12 @@ type GlusterfsVolumeSource struct {
ReadOnly bool `json:"readOnly,omitempty" description:"glusterfs volume to be mounted with read-only permissions"` ReadOnly bool `json:"readOnly,omitempty" description:"glusterfs volume to be mounted with read-only permissions"`
} }
// StorageType defines ways that storage can be allocated to a volume. // StorageMedium defines ways that storage can be allocated to a volume.
type StorageType string type StorageMedium string
const ( const (
StorageTypeDefault StorageType = "" // use whatever the default is for the node StorageMediumDefault StorageMedium = "" // use whatever the default is for the node
StorageTypeMemory StorageType = "Memory" // use memory (tmpfs) StorageMediumMemory StorageMedium = "Memory" // use memory (tmpfs)
) )
// Protocol defines network protocols supported for things like conatiner ports. // Protocol defines network protocols supported for things like conatiner ports.

14
pkg/volume/empty_dir/empty_dir.go
View File

@ -80,7 +80,7 @@ func (plugin *emptyDirPlugin) newBuilderInternal(spec *volume.Spec, pod *api.Pod
// Legacy mode instances can be cleaned up but not created anew. // Legacy mode instances can be cleaned up but not created anew.
return nil, fmt.Errorf("legacy mode: can not create new instances") return nil, fmt.Errorf("legacy mode: can not create new instances")
} }
medium := api.StorageTypeDefault medium := api.StorageMediumDefault
if spec.VolumeSource.EmptyDir != nil { // Support a non-specified source as EmptyDir. if spec.VolumeSource.EmptyDir != nil { // Support a non-specified source as EmptyDir.
medium = spec.VolumeSource.EmptyDir.Medium medium = spec.VolumeSource.EmptyDir.Medium
} }
@ -109,7 +109,7 @@ func (plugin *emptyDirPlugin) newCleanerInternal(volName string, podUID types.UI
ed := &emptyDir{ ed := &emptyDir{
podUID: podUID, podUID: podUID,
volName: volName, volName: volName,
medium: api.StorageTypeDefault, // might be changed later medium: api.StorageMediumDefault, // might be changed later
mounter: mounter, mounter: mounter,
mountDetector: mountDetector, mountDetector: mountDetector,
plugin: plugin, plugin: plugin,
@ -140,7 +140,7 @@ const (
type emptyDir struct { type emptyDir struct {
podUID types.UID podUID types.UID
volName string volName string
medium api.StorageType medium api.StorageMedium
mounter mount.Interface mounter mount.Interface
mountDetector mountDetector mountDetector mountDetector
plugin *emptyDirPlugin plugin *emptyDirPlugin
@ -159,9 +159,9 @@ func (ed *emptyDir) SetUpAt(dir string) error {
return fmt.Errorf("legacy mode: can not create new instances") return fmt.Errorf("legacy mode: can not create new instances")
} }
switch ed.medium { switch ed.medium {
case api.StorageTypeDefault: case api.StorageMediumDefault:
return ed.setupDefault(dir) return ed.setupDefault(dir)
case api.StorageTypeMemory: case api.StorageMediumMemory:
return ed.setupTmpfs(dir) return ed.setupTmpfs(dir)
default: default:
return fmt.Errorf("unknown storage medium %q", ed.medium) return fmt.Errorf("unknown storage medium %q", ed.medium)
@ -231,10 +231,10 @@ func (ed *emptyDir) TearDownAt(dir string) error {
return err return err
} }
if isMnt && medium == mediumMemory { if isMnt && medium == mediumMemory {
ed.medium = api.StorageTypeMemory ed.medium = api.StorageMediumMemory
return ed.teardownTmpfs(dir) return ed.teardownTmpfs(dir)
} }
// assume StorageTypeDefault // assume StorageMediumDefault
return ed.teardownDefault(dir) return ed.teardownDefault(dir)
} }

4
pkg/volume/empty_dir/empty_dir_test.go
View File

@ -70,7 +70,7 @@ func TestPlugin(t *testing.T) {
spec := &api.Volume{ spec := &api.Volume{
Name: "vol1", Name: "vol1",
VolumeSource: api.VolumeSource{EmptyDir: &api.EmptyDirVolumeSource{Medium: api.StorageTypeDefault}}, VolumeSource: api.VolumeSource{EmptyDir: &api.EmptyDirVolumeSource{Medium: api.StorageMediumDefault}},
} }
mounter := mount.FakeMounter{} mounter := mount.FakeMounter{}
mountDetector := fakeMountDetector{} mountDetector := fakeMountDetector{}
@ -130,7 +130,7 @@ func TestPluginTmpfs(t *testing.T) {
spec := &api.Volume{ spec := &api.Volume{
Name: "vol1", Name: "vol1",
VolumeSource: api.VolumeSource{EmptyDir: &api.EmptyDirVolumeSource{Medium: api.StorageTypeMemory}}, VolumeSource: api.VolumeSource{EmptyDir: &api.EmptyDirVolumeSource{Medium: api.StorageMediumMemory}},
} }
mounter := mount.FakeMounter{} mounter := mount.FakeMounter{}
mountDetector := fakeMountDetector{} mountDetector := fakeMountDetector{}

2
pkg/volume/secret/secret.go
View File

@ -89,7 +89,7 @@ func (sv *secretVolume) SetUp() error {
// This is the spec for the volume that this plugin wraps. // This is the spec for the volume that this plugin wraps.
var wrappedVolumeSpec = &volume.Spec{ var wrappedVolumeSpec = &volume.Spec{
Name: "not-used", Name: "not-used",
VolumeSource: api.VolumeSource{EmptyDir: &api.EmptyDirVolumeSource{Medium: api.StorageTypeMemory}}, VolumeSource: api.VolumeSource{EmptyDir: &api.EmptyDirVolumeSource{Medium: api.StorageMediumMemory}},
} }
func (sv *secretVolume) SetUpAt(dir string) error { func (sv *secretVolume) SetUpAt(dir string) error {

4
test/e2e/empty_dir.go
View File

@ -42,7 +42,7 @@ var _ = Describe("emptyDir", func() {
It("volume on tmpfs should have the correct mode", func() { It("volume on tmpfs should have the correct mode", func() {
volumePath := "/test-volume" volumePath := "/test-volume"
source := &api.EmptyDirVolumeSource{ source := &api.EmptyDirVolumeSource{
Medium: api.StorageTypeMemory, Medium: api.StorageMediumMemory,
} }
pod := testPodWithVolume(volumePath, source) pod := testPodWithVolume(volumePath, source)
@ -60,7 +60,7 @@ var _ = Describe("emptyDir", func() {
volumePath := "/test-volume" volumePath := "/test-volume"
filePath := path.Join(volumePath, "test-file") filePath := path.Join(volumePath, "test-file")
source := &api.EmptyDirVolumeSource{ source := &api.EmptyDirVolumeSource{
Medium: api.StorageTypeMemory, Medium: api.StorageMediumMemory,
} }
pod := testPodWithVolume(volumePath, source) pod := testPodWithVolume(volumePath, source)