From f66ca25d9f3e0d15433e60f97154857579e39489 Mon Sep 17 00:00:00 2001 From: Tim Hockin Date: Mon, 18 May 2015 13:22:30 -0700 Subject: [PATCH] Rename AccessMode to PersistentVolumeAccessMode --- api/swagger-spec/v1beta1.json | 12 +++++----- api/swagger-spec/v1beta2.json | 12 +++++----- api/swagger-spec/v1beta3.json | 12 +++++----- pkg/api/types.go | 14 +++++------ pkg/api/v1/conversion_generated.go | 24 +++++++++---------- pkg/api/v1/types.go | 14 +++++------ pkg/api/v1beta1/types.go | 14 +++++------ pkg/api/v1beta2/types.go | 14 +++++------ pkg/api/v1beta3/conversion_generated.go | 24 +++++++++---------- pkg/api/v1beta3/types.go | 14 +++++------ pkg/api/validation/validation.go | 2 +- pkg/api/validation/validation_test.go | 16 ++++++------- pkg/client/persistentvolumeclaim_test.go | 8 +++---- .../persistentvolume/etcd/etcd_test.go | 2 +- .../persistentvolumeclaim/etcd/etcd_test.go | 4 ++-- pkg/volume/aws_ebs/aws_ebs.go | 4 ++-- pkg/volume/aws_ebs/aws_ebs_test.go | 2 +- pkg/volume/gce_pd/gce_pd.go | 4 ++-- pkg/volume/gce_pd/gce_pd_test.go | 2 +- pkg/volume/glusterfs/glusterfs.go | 4 ++-- pkg/volume/glusterfs/glusterfs_test.go | 2 +- pkg/volume/host_path/host_path.go | 4 ++-- pkg/volume/host_path/host_path_test.go | 2 +- pkg/volume/iscsi/iscsi.go | 4 ++-- pkg/volume/nfs/nfs.go | 4 ++-- pkg/volume/nfs/nfs_test.go | 2 +- pkg/volume/plugins.go | 2 +- pkg/volume/testing.go | 4 ++-- pkg/volume/util.go | 4 ++-- .../persistent_volume_claim_binder_test.go | 8 +++---- .../persistent_volume_index_test.go | 24 +++++++++---------- pkg/volumeclaimbinder/types.go | 4 ++-- test/integration/persistent_volumes_test.go | 10 ++++---- 33 files changed, 138 insertions(+), 138 deletions(-) diff --git a/api/swagger-spec/v1beta1.json b/api/swagger-spec/v1beta1.json index b5980b56316..aa7e4f5f37b 100644 --- a/api/swagger-spec/v1beta1.json +++ b/api/swagger-spec/v1beta1.json @@ -8165,8 +8165,8 @@ } } }, - "v1beta1.AccessModeType": { - "id": "v1beta1.AccessModeType", + "v1beta1.PersistentVolumeAccessMode": { + "id": "v1beta1.PersistentVolumeAccessMode", "properties": {} }, "v1beta1.Binding": { @@ -10054,7 +10054,7 @@ "accessModes": { "type": "array", "items": { - "$ref": "v1beta1.AccessModeType" + "$ref": "v1beta1.PersistentVolumeAccessMode" }, "description": "the desired access modes the volume should have" }, @@ -10074,7 +10074,7 @@ "accessModes": { "type": "array", "items": { - "$ref": "v1beta1.AccessModeType" + "$ref": "v1beta1.PersistentVolumeAccessMode" }, "description": "the actual access modes the volume has" }, @@ -10170,7 +10170,7 @@ "accessModes": { "type": "array", "items": { - "$ref": "v1beta1.AccessModeType" + "$ref": "v1beta1.PersistentVolumeAccessMode" }, "description": "all ways the volume can be mounted" }, @@ -11457,4 +11457,4 @@ } } } - } \ No newline at end of file + } diff --git a/api/swagger-spec/v1beta2.json b/api/swagger-spec/v1beta2.json index c4e170e77c1..83227b6f266 100644 --- a/api/swagger-spec/v1beta2.json +++ b/api/swagger-spec/v1beta2.json @@ -8165,8 +8165,8 @@ } } }, - "v1beta2.AccessModeType": { - "id": "v1beta2.AccessModeType", + "v1beta2.PersistentVolumeAccessMode": { + "id": "v1beta2.PersistentVolumeAccessMode", "properties": {} }, "v1beta2.Binding": { @@ -10043,7 +10043,7 @@ "accessModes": { "type": "array", "items": { - "$ref": "v1beta2.AccessModeType" + "$ref": "v1beta2.PersistentVolumeAccessMode" }, "description": "the desired access modes the volume should have" }, @@ -10063,7 +10063,7 @@ "accessModes": { "type": "array", "items": { - "$ref": "v1beta2.AccessModeType" + "$ref": "v1beta2.PersistentVolumeAccessMode" }, "description": "the actual access modes the volume has" }, @@ -10159,7 +10159,7 @@ "accessModes": { "type": "array", "items": { - "$ref": "v1beta2.AccessModeType" + "$ref": "v1beta2.PersistentVolumeAccessMode" }, "description": "all ways the volume can be mounted" }, @@ -11438,4 +11438,4 @@ } } } - } \ No newline at end of file + } diff --git a/api/swagger-spec/v1beta3.json b/api/swagger-spec/v1beta3.json index d74a103cf5c..7408ea95a62 100644 --- a/api/swagger-spec/v1beta3.json +++ b/api/swagger-spec/v1beta3.json @@ -9575,8 +9575,8 @@ } } }, - "v1beta3.AccessModeType": { - "id": "v1beta3.AccessModeType", + "v1beta3.PersistentVolumeAccessMode": { + "id": "v1beta3.PersistentVolumeAccessMode", "properties": {} }, "v1beta3.Binding": { @@ -10936,7 +10936,7 @@ "accessModes": { "type": "array", "items": { - "$ref": "v1beta3.AccessModeType" + "$ref": "v1beta3.PersistentVolumeAccessMode" }, "description": "the desired access modes the volume should have" }, @@ -10956,7 +10956,7 @@ "accessModes": { "type": "array", "items": { - "$ref": "v1beta3.AccessModeType" + "$ref": "v1beta3.PersistentVolumeAccessMode" }, "description": "the actual access modes the volume has" }, @@ -11013,7 +11013,7 @@ "accessModes": { "type": "array", "items": { - "$ref": "v1beta3.AccessModeType" + "$ref": "v1beta3.PersistentVolumeAccessMode" }, "description": "all ways the volume can be mounted" }, @@ -11925,4 +11925,4 @@ } } } - } \ No newline at end of file + } diff --git a/pkg/api/types.go b/pkg/api/types.go index 7f2aa324970..a17f1f41385 100644 --- a/pkg/api/types.go +++ b/pkg/api/types.go @@ -251,7 +251,7 @@ type PersistentVolumeSpec struct { // Source represents the location and type of a volume to mount. PersistentVolumeSource `json:",inline"` // AccessModes contains all ways the volume can be mounted - AccessModes []AccessModeType `json:"accessModes,omitempty"` + AccessModes []PersistentVolumeAccessMode `json:"accessModes,omitempty"` // ClaimRef is part of a bi-directional binding between PersistentVolume and PersistentVolumeClaim. // ClaimRef is expected to be non-nil when bound. // claim.VolumeName is the authoritative bind between PV and PVC. @@ -291,7 +291,7 @@ type PersistentVolumeClaimList struct { // and allows a Source for provider-specific attributes type PersistentVolumeClaimSpec struct { // Contains the types of access modes required - AccessModes []AccessModeType `json:"accessModes,omitempty"` + AccessModes []PersistentVolumeAccessMode `json:"accessModes,omitempty"` // Resources represents the minimum resources required Resources ResourceRequirements `json:"resources,omitempty"` // VolumeName is the binding reference to the PersistentVolume backing this claim @@ -302,20 +302,20 @@ type PersistentVolumeClaimStatus struct { // Phase represents the current phase of PersistentVolumeClaim Phase PersistentVolumeClaimPhase `json:"phase,omitempty"` // AccessModes contains all ways the volume backing the PVC can be mounted - AccessModes []AccessModeType `json:"accessModes,omitempty"` + AccessModes []PersistentVolumeAccessMode `json:"accessModes,omitempty"` // Represents the actual resources of the underlying volume Capacity ResourceList `json:"capacity,omitempty"` } -type AccessModeType string +type PersistentVolumeAccessMode string const ( // can be mounted read/write mode to exactly 1 host - ReadWriteOnce AccessModeType = "ReadWriteOnce" + ReadWriteOnce PersistentVolumeAccessMode = "ReadWriteOnce" // can be mounted in read-only mode to many hosts - ReadOnlyMany AccessModeType = "ReadOnlyMany" + ReadOnlyMany PersistentVolumeAccessMode = "ReadOnlyMany" // can be mounted in read/write mode to many hosts - ReadWriteMany AccessModeType = "ReadWriteMany" + ReadWriteMany PersistentVolumeAccessMode = "ReadWriteMany" ) type PersistentVolumePhase string diff --git a/pkg/api/v1/conversion_generated.go b/pkg/api/v1/conversion_generated.go index 3d0a8d25dc5..dc9fc8cda93 100644 --- a/pkg/api/v1/conversion_generated.go +++ b/pkg/api/v1/conversion_generated.go @@ -2272,9 +2272,9 @@ func convert_v1_PersistentVolumeClaimSpec_To_api_PersistentVolumeClaimSpec(in *P defaulting.(func(*PersistentVolumeClaimSpec))(in) } if in.AccessModes != nil { - out.AccessModes = make([]newer.AccessModeType, len(in.AccessModes)) + out.AccessModes = make([]newer.PersistentVolumeAccessMode, len(in.AccessModes)) for i := range in.AccessModes { - out.AccessModes[i] = newer.AccessModeType(in.AccessModes[i]) + out.AccessModes[i] = newer.PersistentVolumeAccessMode(in.AccessModes[i]) } } else { out.AccessModes = nil @@ -2291,9 +2291,9 @@ func convert_api_PersistentVolumeClaimSpec_To_v1_PersistentVolumeClaimSpec(in *n defaulting.(func(*newer.PersistentVolumeClaimSpec))(in) } if in.AccessModes != nil { - out.AccessModes = make([]AccessModeType, len(in.AccessModes)) + out.AccessModes = make([]PersistentVolumeAccessMode, len(in.AccessModes)) for i := range in.AccessModes { - out.AccessModes[i] = AccessModeType(in.AccessModes[i]) + out.AccessModes[i] = PersistentVolumeAccessMode(in.AccessModes[i]) } } else { out.AccessModes = nil @@ -2311,9 +2311,9 @@ func convert_v1_PersistentVolumeClaimStatus_To_api_PersistentVolumeClaimStatus(i } out.Phase = newer.PersistentVolumeClaimPhase(in.Phase) if in.AccessModes != nil { - out.AccessModes = make([]newer.AccessModeType, len(in.AccessModes)) + out.AccessModes = make([]newer.PersistentVolumeAccessMode, len(in.AccessModes)) for i := range in.AccessModes { - out.AccessModes[i] = newer.AccessModeType(in.AccessModes[i]) + out.AccessModes[i] = newer.PersistentVolumeAccessMode(in.AccessModes[i]) } } else { out.AccessModes = nil @@ -2339,9 +2339,9 @@ func convert_api_PersistentVolumeClaimStatus_To_v1_PersistentVolumeClaimStatus(i } out.Phase = PersistentVolumeClaimPhase(in.Phase) if in.AccessModes != nil { - out.AccessModes = make([]AccessModeType, len(in.AccessModes)) + out.AccessModes = make([]PersistentVolumeAccessMode, len(in.AccessModes)) for i := range in.AccessModes { - out.AccessModes[i] = AccessModeType(in.AccessModes[i]) + out.AccessModes[i] = PersistentVolumeAccessMode(in.AccessModes[i]) } } else { out.AccessModes = nil @@ -2539,9 +2539,9 @@ func convert_v1_PersistentVolumeSpec_To_api_PersistentVolumeSpec(in *PersistentV return err } if in.AccessModes != nil { - out.AccessModes = make([]newer.AccessModeType, len(in.AccessModes)) + out.AccessModes = make([]newer.PersistentVolumeAccessMode, len(in.AccessModes)) for i := range in.AccessModes { - out.AccessModes[i] = newer.AccessModeType(in.AccessModes[i]) + out.AccessModes[i] = newer.PersistentVolumeAccessMode(in.AccessModes[i]) } } else { out.AccessModes = nil @@ -2577,9 +2577,9 @@ func convert_api_PersistentVolumeSpec_To_v1_PersistentVolumeSpec(in *newer.Persi return err } if in.AccessModes != nil { - out.AccessModes = make([]AccessModeType, len(in.AccessModes)) + out.AccessModes = make([]PersistentVolumeAccessMode, len(in.AccessModes)) for i := range in.AccessModes { - out.AccessModes[i] = AccessModeType(in.AccessModes[i]) + out.AccessModes[i] = PersistentVolumeAccessMode(in.AccessModes[i]) } } else { out.AccessModes = nil diff --git a/pkg/api/v1/types.go b/pkg/api/v1/types.go index e0e34e9524f..e314d6a06b0 100644 --- a/pkg/api/v1/types.go +++ b/pkg/api/v1/types.go @@ -268,7 +268,7 @@ type PersistentVolumeSpec struct { // Source represents the location and type of a volume to mount. PersistentVolumeSource `json:",inline" description:"the actual volume backing the persistent volume"` // AccessModes contains all ways the volume can be mounted - AccessModes []AccessModeType `json:"accessModes,omitempty" description:"all ways the volume can be mounted"` + AccessModes []PersistentVolumeAccessMode `json:"accessModes,omitempty" description:"all ways the volume can be mounted"` // ClaimRef is part of a bi-directional binding between PersistentVolume and PersistentVolumeClaim. // ClaimRef is expected to be non-nil when bound. // claim.VolumeName is the authoritative bind between PV and PVC. @@ -308,7 +308,7 @@ type PersistentVolumeClaimList struct { // and allows a Source for provider-specific attributes type PersistentVolumeClaimSpec struct { // Contains the types of access modes required - AccessModes []AccessModeType `json:"accessModes,omitempty" description:"the desired access modes the volume should have"` + AccessModes []PersistentVolumeAccessMode `json:"accessModes,omitempty" description:"the desired access modes the volume should have"` // Resources represents the minimum resources required Resources ResourceRequirements `json:"resources,omitempty" description:"the desired resources the volume should have"` // VolumeName is the binding reference to the PersistentVolume backing this claim @@ -319,20 +319,20 @@ type PersistentVolumeClaimStatus struct { // Phase represents the current phase of PersistentVolumeClaim Phase PersistentVolumeClaimPhase `json:"phase,omitempty" description:"the current phase of the claim"` // AccessModes contains all ways the volume backing the PVC can be mounted - AccessModes []AccessModeType `json:"accessModes,omitempty" description:"the actual access modes the volume has"` + AccessModes []PersistentVolumeAccessMode `json:"accessModes,omitempty" description:"the actual access modes the volume has"` // Represents the actual resources of the underlying volume Capacity ResourceList `json:"capacity,omitempty" description:"the actual resources the volume has"` } -type AccessModeType string +type PersistentVolumeAccessMode string const ( // can be mounted read/write mode to exactly 1 host - ReadWriteOnce AccessModeType = "ReadWriteOnce" + ReadWriteOnce PersistentVolumeAccessMode = "ReadWriteOnce" // can be mounted in read-only mode to many hosts - ReadOnlyMany AccessModeType = "ReadOnlyMany" + ReadOnlyMany PersistentVolumeAccessMode = "ReadOnlyMany" // can be mounted in read/write mode to many hosts - ReadWriteMany AccessModeType = "ReadWriteMany" + ReadWriteMany PersistentVolumeAccessMode = "ReadWriteMany" ) type PersistentVolumePhase string diff --git a/pkg/api/v1beta1/types.go b/pkg/api/v1beta1/types.go index da4b1821e0c..99333a91929 100644 --- a/pkg/api/v1beta1/types.go +++ b/pkg/api/v1beta1/types.go @@ -174,7 +174,7 @@ type PersistentVolumeSpec struct { // Source represents the location and type of a volume to mount. PersistentVolumeSource `json:",inline" description:"the actual volume backing the persistent volume"` // AccessModes contains all ways the volume can be mounted - AccessModes []AccessModeType `json:"accessModes,omitempty" description:"all ways the volume can be mounted"` + AccessModes []PersistentVolumeAccessMode `json:"accessModes,omitempty" description:"all ways the volume can be mounted"` // ClaimRef is a non-binding reference to the claim bound to this volume ClaimRef *ObjectReference `json:"claimRef,omitempty" description:"when bound, a reference to the bound claim"` } @@ -209,7 +209,7 @@ type PersistentVolumeClaimList struct { // and allows a Source for provider-specific attributes type PersistentVolumeClaimSpec struct { // Contains the types of access modes required - AccessModes []AccessModeType `json:"accessModes,omitempty" description:"the desired access modes the volume should have"` + AccessModes []PersistentVolumeAccessMode `json:"accessModes,omitempty" description:"the desired access modes the volume should have"` // Resources represents the minimum resources required Resources ResourceRequirements `json:"resources,omitempty" description:"the desired resources the volume should have"` // VolumeName is the binding reference to the PersistentVolume backing this claim @@ -220,20 +220,20 @@ type PersistentVolumeClaimStatus struct { // Phase represents the current phase of PersistentVolumeClaim Phase PersistentVolumeClaimPhase `json:"phase,omitempty" description:"the current phase of the claim"` // AccessModes contains all ways the volume backing the PVC can be mounted - AccessModes []AccessModeType `json:"accessModes,omitempty" description:"the actual access modes the volume has"` + AccessModes []PersistentVolumeAccessMode `json:"accessModes,omitempty" description:"the actual access modes the volume has"` // Represents the actual resources of the underlying volume Capacity ResourceList `json:"capacity,omitempty" description:"the actual resources the volume has"` } -type AccessModeType string +type PersistentVolumeAccessMode string const ( // can be mounted read/write mode to exactly 1 host - ReadWriteOnce AccessModeType = "ReadWriteOnce" + ReadWriteOnce PersistentVolumeAccessMode = "ReadWriteOnce" // can be mounted in read-only mode to many hosts - ReadOnlyMany AccessModeType = "ReadOnlyMany" + ReadOnlyMany PersistentVolumeAccessMode = "ReadOnlyMany" // can be mounted in read/write mode to many hosts - ReadWriteMany AccessModeType = "ReadWriteMany" + ReadWriteMany PersistentVolumeAccessMode = "ReadWriteMany" ) type PersistentVolumePhase string diff --git a/pkg/api/v1beta2/types.go b/pkg/api/v1beta2/types.go index fdc78e2adb6..b978cb86ac4 100644 --- a/pkg/api/v1beta2/types.go +++ b/pkg/api/v1beta2/types.go @@ -135,7 +135,7 @@ type PersistentVolumeSpec struct { // Source represents the location and type of a volume to mount. PersistentVolumeSource `json:",inline" description:"the actual volume backing the persistent volume"` // AccessModes contains all ways the volume can be mounted - AccessModes []AccessModeType `json:"accessModes,omitempty" description:"all ways the volume can be mounted"` + AccessModes []PersistentVolumeAccessMode `json:"accessModes,omitempty" description:"all ways the volume can be mounted"` // ClaimRef is part of a bi-directional binding between PersistentVolume and PersistentVolumeClaim. // ClaimRef is expected to be non-nil when bound. // claim.VolumeName is the authoritative bind between PV and PVC. @@ -172,7 +172,7 @@ type PersistentVolumeClaimList struct { // and allows a Source for provider-specific attributes type PersistentVolumeClaimSpec struct { // Contains the types of access modes required - AccessModes []AccessModeType `json:"accessModes,omitempty" description:"the desired access modes the volume should have"` + AccessModes []PersistentVolumeAccessMode `json:"accessModes,omitempty" description:"the desired access modes the volume should have"` // Resources represents the minimum resources required Resources ResourceRequirements `json:"resources,omitempty" description:"the desired resources the volume should have"` // VolumeName is the binding reference to the PersistentVolume backing this claim @@ -183,20 +183,20 @@ type PersistentVolumeClaimStatus struct { // Phase represents the current phase of PersistentVolumeClaim Phase PersistentVolumeClaimPhase `json:"phase,omitempty" description:"the current phase of the claim"` // AccessModes contains all ways the volume backing the PVC can be mounted - AccessModes []AccessModeType `json:"accessModes,omitempty" description:"the actual access modes the volume has"` + AccessModes []PersistentVolumeAccessMode `json:"accessModes,omitempty" description:"the actual access modes the volume has"` // Represents the actual resources of the underlying volume Capacity ResourceList `json:"capacity,omitempty" description:"the actual resources the volume has"` } -type AccessModeType string +type PersistentVolumeAccessMode string const ( // can be mounted read/write mode to exactly 1 host - ReadWriteOnce AccessModeType = "ReadWriteOnce" + ReadWriteOnce PersistentVolumeAccessMode = "ReadWriteOnce" // can be mounted in read-only mode to many hosts - ReadOnlyMany AccessModeType = "ReadOnlyMany" + ReadOnlyMany PersistentVolumeAccessMode = "ReadOnlyMany" // can be mounted in read/write mode to many hosts - ReadWriteMany AccessModeType = "ReadWriteMany" + ReadWriteMany PersistentVolumeAccessMode = "ReadWriteMany" ) type PersistentVolumePhase string diff --git a/pkg/api/v1beta3/conversion_generated.go b/pkg/api/v1beta3/conversion_generated.go index 2955dba6c18..da35ff9a2a1 100644 --- a/pkg/api/v1beta3/conversion_generated.go +++ b/pkg/api/v1beta3/conversion_generated.go @@ -2086,9 +2086,9 @@ func convert_v1beta3_PersistentVolumeClaimSpec_To_api_PersistentVolumeClaimSpec( defaulting.(func(*PersistentVolumeClaimSpec))(in) } if in.AccessModes != nil { - out.AccessModes = make([]newer.AccessModeType, len(in.AccessModes)) + out.AccessModes = make([]newer.PersistentVolumeAccessMode, len(in.AccessModes)) for i := range in.AccessModes { - out.AccessModes[i] = newer.AccessModeType(in.AccessModes[i]) + out.AccessModes[i] = newer.PersistentVolumeAccessMode(in.AccessModes[i]) } } else { out.AccessModes = nil @@ -2105,9 +2105,9 @@ func convert_api_PersistentVolumeClaimSpec_To_v1beta3_PersistentVolumeClaimSpec( defaulting.(func(*newer.PersistentVolumeClaimSpec))(in) } if in.AccessModes != nil { - out.AccessModes = make([]AccessModeType, len(in.AccessModes)) + out.AccessModes = make([]PersistentVolumeAccessMode, len(in.AccessModes)) for i := range in.AccessModes { - out.AccessModes[i] = AccessModeType(in.AccessModes[i]) + out.AccessModes[i] = PersistentVolumeAccessMode(in.AccessModes[i]) } } else { out.AccessModes = nil @@ -2125,9 +2125,9 @@ func convert_v1beta3_PersistentVolumeClaimStatus_To_api_PersistentVolumeClaimSta } out.Phase = newer.PersistentVolumeClaimPhase(in.Phase) if in.AccessModes != nil { - out.AccessModes = make([]newer.AccessModeType, len(in.AccessModes)) + out.AccessModes = make([]newer.PersistentVolumeAccessMode, len(in.AccessModes)) for i := range in.AccessModes { - out.AccessModes[i] = newer.AccessModeType(in.AccessModes[i]) + out.AccessModes[i] = newer.PersistentVolumeAccessMode(in.AccessModes[i]) } } else { out.AccessModes = nil @@ -2153,9 +2153,9 @@ func convert_api_PersistentVolumeClaimStatus_To_v1beta3_PersistentVolumeClaimSta } out.Phase = PersistentVolumeClaimPhase(in.Phase) if in.AccessModes != nil { - out.AccessModes = make([]AccessModeType, len(in.AccessModes)) + out.AccessModes = make([]PersistentVolumeAccessMode, len(in.AccessModes)) for i := range in.AccessModes { - out.AccessModes[i] = AccessModeType(in.AccessModes[i]) + out.AccessModes[i] = PersistentVolumeAccessMode(in.AccessModes[i]) } } else { out.AccessModes = nil @@ -2353,9 +2353,9 @@ func convert_v1beta3_PersistentVolumeSpec_To_api_PersistentVolumeSpec(in *Persis return err } if in.AccessModes != nil { - out.AccessModes = make([]newer.AccessModeType, len(in.AccessModes)) + out.AccessModes = make([]newer.PersistentVolumeAccessMode, len(in.AccessModes)) for i := range in.AccessModes { - out.AccessModes[i] = newer.AccessModeType(in.AccessModes[i]) + out.AccessModes[i] = newer.PersistentVolumeAccessMode(in.AccessModes[i]) } } else { out.AccessModes = nil @@ -2391,9 +2391,9 @@ func convert_api_PersistentVolumeSpec_To_v1beta3_PersistentVolumeSpec(in *newer. return err } if in.AccessModes != nil { - out.AccessModes = make([]AccessModeType, len(in.AccessModes)) + out.AccessModes = make([]PersistentVolumeAccessMode, len(in.AccessModes)) for i := range in.AccessModes { - out.AccessModes[i] = AccessModeType(in.AccessModes[i]) + out.AccessModes[i] = PersistentVolumeAccessMode(in.AccessModes[i]) } } else { out.AccessModes = nil diff --git a/pkg/api/v1beta3/types.go b/pkg/api/v1beta3/types.go index b2040b53053..a4d104b7efd 100644 --- a/pkg/api/v1beta3/types.go +++ b/pkg/api/v1beta3/types.go @@ -268,7 +268,7 @@ type PersistentVolumeSpec struct { // Source represents the location and type of a volume to mount. PersistentVolumeSource `json:",inline" description:"the actual volume backing the persistent volume"` // AccessModes contains all ways the volume can be mounted - AccessModes []AccessModeType `json:"accessModes,omitempty" description:"all ways the volume can be mounted"` + AccessModes []PersistentVolumeAccessMode `json:"accessModes,omitempty" description:"all ways the volume can be mounted"` // ClaimRef is part of a bi-directional binding between PersistentVolume and PersistentVolumeClaim. // ClaimRef is expected to be non-nil when bound. // claim.VolumeName is the authoritative bind between PV and PVC. @@ -308,7 +308,7 @@ type PersistentVolumeClaimList struct { // and allows a Source for provider-specific attributes type PersistentVolumeClaimSpec struct { // Contains the types of access modes required - AccessModes []AccessModeType `json:"accessModes,omitempty" description:"the desired access modes the volume should have"` + AccessModes []PersistentVolumeAccessMode `json:"accessModes,omitempty" description:"the desired access modes the volume should have"` // Resources represents the minimum resources required Resources ResourceRequirements `json:"resources,omitempty" description:"the desired resources the volume should have"` // VolumeName is the binding reference to the PersistentVolume backing this claim @@ -319,20 +319,20 @@ type PersistentVolumeClaimStatus struct { // Phase represents the current phase of PersistentVolumeClaim Phase PersistentVolumeClaimPhase `json:"phase,omitempty" description:"the current phase of the claim"` // AccessModes contains all ways the volume backing the PVC can be mounted - AccessModes []AccessModeType `json:"accessModes,omitempty" description:"the actual access modes the volume has"` + AccessModes []PersistentVolumeAccessMode `json:"accessModes,omitempty" description:"the actual access modes the volume has"` // Represents the actual resources of the underlying volume Capacity ResourceList `json:"capacity,omitempty" description:"the actual resources the volume has"` } -type AccessModeType string +type PersistentVolumeAccessMode string const ( // can be mounted read/write mode to exactly 1 host - ReadWriteOnce AccessModeType = "ReadWriteOnce" + ReadWriteOnce PersistentVolumeAccessMode = "ReadWriteOnce" // can be mounted in read-only mode to many hosts - ReadOnlyMany AccessModeType = "ReadOnlyMany" + ReadOnlyMany PersistentVolumeAccessMode = "ReadOnlyMany" // can be mounted in read/write mode to many hosts - ReadWriteMany AccessModeType = "ReadWriteMany" + ReadWriteMany PersistentVolumeAccessMode = "ReadWriteMany" ) type PersistentVolumePhase string diff --git a/pkg/api/validation/validation.go b/pkg/api/validation/validation.go index 4db92e95b44..bc47d2be2ee 100644 --- a/pkg/api/validation/validation.go +++ b/pkg/api/validation/validation.go @@ -514,7 +514,7 @@ func ValidatePersistentVolumeStatusUpdate(newPv, oldPv *api.PersistentVolume) er func ValidatePersistentVolumeClaim(pvc *api.PersistentVolumeClaim) errs.ValidationErrorList { allErrs := ValidateObjectMeta(&pvc.ObjectMeta, true, ValidatePersistentVolumeName) if len(pvc.Spec.AccessModes) == 0 { - allErrs = append(allErrs, errs.NewFieldInvalid("persistentVolumeClaim.Spec.AccessModes", pvc.Spec.AccessModes, "at least 1 AccessModeType is required")) + allErrs = append(allErrs, errs.NewFieldInvalid("persistentVolumeClaim.Spec.AccessModes", pvc.Spec.AccessModes, "at least 1 PersistentVolumeAccessMode is required")) } if _, ok := pvc.Spec.Resources.Requests[api.ResourceStorage]; !ok { allErrs = append(allErrs, errs.NewFieldInvalid("persistentVolumeClaim.Spec.Resources.Requests", pvc.Spec.Resources.Requests, "No Storage size specified")) diff --git a/pkg/api/validation/validation_test.go b/pkg/api/validation/validation_test.go index bb780eee1a2..b2d5e3e2cb4 100644 --- a/pkg/api/validation/validation_test.go +++ b/pkg/api/validation/validation_test.go @@ -228,7 +228,7 @@ func TestValidatePersistentVolumes(t *testing.T) { Capacity: api.ResourceList{ api.ResourceName(api.ResourceStorage): resource.MustParse("10G"), }, - AccessModes: []api.AccessModeType{api.ReadWriteOnce}, + AccessModes: []api.PersistentVolumeAccessMode{api.ReadWriteOnce}, PersistentVolumeSource: api.PersistentVolumeSource{ HostPath: &api.HostPathVolumeSource{Path: "/foo"}, }, @@ -240,7 +240,7 @@ func TestValidatePersistentVolumes(t *testing.T) { Capacity: api.ResourceList{ api.ResourceName(api.ResourceStorage): resource.MustParse("10G"), }, - AccessModes: []api.AccessModeType{api.ReadWriteOnce}, + AccessModes: []api.PersistentVolumeAccessMode{api.ReadWriteOnce}, PersistentVolumeSource: api.PersistentVolumeSource{ HostPath: &api.HostPathVolumeSource{Path: "/foo"}, }, @@ -252,7 +252,7 @@ func TestValidatePersistentVolumes(t *testing.T) { Capacity: api.ResourceList{ api.ResourceName(api.ResourceStorage): resource.MustParse("10G"), }, - AccessModes: []api.AccessModeType{api.ReadWriteOnce}, + AccessModes: []api.PersistentVolumeAccessMode{api.ReadWriteOnce}, PersistentVolumeSource: api.PersistentVolumeSource{ HostPath: &api.HostPathVolumeSource{Path: "/foo"}, }, @@ -264,7 +264,7 @@ func TestValidatePersistentVolumes(t *testing.T) { Capacity: api.ResourceList{ api.ResourceName(api.ResourceStorage): resource.MustParse("10G"), }, - AccessModes: []api.AccessModeType{api.ReadWriteOnce}, + AccessModes: []api.PersistentVolumeAccessMode{api.ReadWriteOnce}, }), }, "missing-capacity": { @@ -324,7 +324,7 @@ func TestValidatePersistentVolumeClaim(t *testing.T) { "good-claim": { isExpectedFailure: false, claim: testVolumeClaim("foo", "ns", api.PersistentVolumeClaimSpec{ - AccessModes: []api.AccessModeType{ + AccessModes: []api.PersistentVolumeAccessMode{ api.ReadWriteOnce, api.ReadOnlyMany, }, @@ -338,7 +338,7 @@ func TestValidatePersistentVolumeClaim(t *testing.T) { "missing-namespace": { isExpectedFailure: true, claim: testVolumeClaim("foo", "", api.PersistentVolumeClaimSpec{ - AccessModes: []api.AccessModeType{ + AccessModes: []api.PersistentVolumeAccessMode{ api.ReadWriteOnce, api.ReadOnlyMany, }, @@ -362,7 +362,7 @@ func TestValidatePersistentVolumeClaim(t *testing.T) { "no-resource-requests": { isExpectedFailure: true, claim: testVolumeClaim("foo", "ns", api.PersistentVolumeClaimSpec{ - AccessModes: []api.AccessModeType{ + AccessModes: []api.PersistentVolumeAccessMode{ api.ReadWriteOnce, }, }), @@ -370,7 +370,7 @@ func TestValidatePersistentVolumeClaim(t *testing.T) { "invalid-resource-requests": { isExpectedFailure: true, claim: testVolumeClaim("foo", "ns", api.PersistentVolumeClaimSpec{ - AccessModes: []api.AccessModeType{ + AccessModes: []api.PersistentVolumeAccessMode{ api.ReadWriteOnce, }, Resources: api.ResourceRequirements{ diff --git a/pkg/client/persistentvolumeclaim_test.go b/pkg/client/persistentvolumeclaim_test.go index 4e552f34436..df153d81e69 100644 --- a/pkg/client/persistentvolumeclaim_test.go +++ b/pkg/client/persistentvolumeclaim_test.go @@ -41,7 +41,7 @@ func TestPersistentVolumeClaimCreate(t *testing.T) { Name: "abc", }, Spec: api.PersistentVolumeClaimSpec{ - AccessModes: []api.AccessModeType{ + AccessModes: []api.PersistentVolumeAccessMode{ api.ReadWriteOnce, api.ReadOnlyMany, }, @@ -75,7 +75,7 @@ func TestPersistentVolumeClaimGet(t *testing.T) { Namespace: "foo", }, Spec: api.PersistentVolumeClaimSpec{ - AccessModes: []api.AccessModeType{ + AccessModes: []api.PersistentVolumeAccessMode{ api.ReadWriteOnce, api.ReadOnlyMany, }, @@ -130,7 +130,7 @@ func TestPersistentVolumeClaimUpdate(t *testing.T) { ResourceVersion: "1", }, Spec: api.PersistentVolumeClaimSpec{ - AccessModes: []api.AccessModeType{ + AccessModes: []api.PersistentVolumeAccessMode{ api.ReadWriteOnce, api.ReadOnlyMany, }, @@ -157,7 +157,7 @@ func TestPersistentVolumeClaimStatusUpdate(t *testing.T) { ResourceVersion: "1", }, Spec: api.PersistentVolumeClaimSpec{ - AccessModes: []api.AccessModeType{ + AccessModes: []api.PersistentVolumeAccessMode{ api.ReadWriteOnce, api.ReadOnlyMany, }, diff --git a/pkg/registry/persistentvolume/etcd/etcd_test.go b/pkg/registry/persistentvolume/etcd/etcd_test.go index 30e3c1d528a..2984fae3a54 100644 --- a/pkg/registry/persistentvolume/etcd/etcd_test.go +++ b/pkg/registry/persistentvolume/etcd/etcd_test.go @@ -55,7 +55,7 @@ func validNewPersistentVolume(name string) *api.PersistentVolume { Capacity: api.ResourceList{ api.ResourceName(api.ResourceStorage): resource.MustParse("10G"), }, - AccessModes: []api.AccessModeType{api.ReadWriteOnce}, + AccessModes: []api.PersistentVolumeAccessMode{api.ReadWriteOnce}, PersistentVolumeSource: api.PersistentVolumeSource{ HostPath: &api.HostPathVolumeSource{Path: "/foo"}, }, diff --git a/pkg/registry/persistentvolumeclaim/etcd/etcd_test.go b/pkg/registry/persistentvolumeclaim/etcd/etcd_test.go index 9de76bf994e..e3ba55afed2 100644 --- a/pkg/registry/persistentvolumeclaim/etcd/etcd_test.go +++ b/pkg/registry/persistentvolumeclaim/etcd/etcd_test.go @@ -53,7 +53,7 @@ func validNewPersistentVolumeClaim(name, ns string) *api.PersistentVolumeClaim { Namespace: ns, }, Spec: api.PersistentVolumeClaimSpec{ - AccessModes: []api.AccessModeType{api.ReadWriteOnce}, + AccessModes: []api.PersistentVolumeAccessMode{api.ReadWriteOnce}, Resources: api.ResourceRequirements{ Requests: api.ResourceList{ api.ResourceName(api.ResourceStorage): resource.MustParse("10G"), @@ -334,7 +334,7 @@ func TestEtcdUpdateStatus(t *testing.T) { ResourceVersion: "1", }, Spec: api.PersistentVolumeClaimSpec{ - AccessModes: []api.AccessModeType{api.ReadWriteOnce}, + AccessModes: []api.PersistentVolumeAccessMode{api.ReadWriteOnce}, Resources: api.ResourceRequirements{ Requests: api.ResourceList{ api.ResourceName(api.ResourceStorage): resource.MustParse("3Gi"), diff --git a/pkg/volume/aws_ebs/aws_ebs.go b/pkg/volume/aws_ebs/aws_ebs.go index 50488305dd8..f276db68e31 100644 --- a/pkg/volume/aws_ebs/aws_ebs.go +++ b/pkg/volume/aws_ebs/aws_ebs.go @@ -62,8 +62,8 @@ func (plugin *awsElasticBlockStorePlugin) CanSupport(spec *volume.Spec) bool { return spec.PersistentVolumeSource.AWSElasticBlockStore != nil || spec.VolumeSource.AWSElasticBlockStore != nil } -func (plugin *awsElasticBlockStorePlugin) GetAccessModes() []api.AccessModeType { - return []api.AccessModeType{ +func (plugin *awsElasticBlockStorePlugin) GetAccessModes() []api.PersistentVolumeAccessMode { + return []api.PersistentVolumeAccessMode{ api.ReadWriteOnce, } } diff --git a/pkg/volume/aws_ebs/aws_ebs_test.go b/pkg/volume/aws_ebs/aws_ebs_test.go index 22ab5336f20..dd8d51767bd 100644 --- a/pkg/volume/aws_ebs/aws_ebs_test.go +++ b/pkg/volume/aws_ebs/aws_ebs_test.go @@ -58,7 +58,7 @@ func TestGetAccessModes(t *testing.T) { } } -func contains(modes []api.AccessModeType, mode api.AccessModeType) bool { +func contains(modes []api.PersistentVolumeAccessMode, mode api.PersistentVolumeAccessMode) bool { for _, m := range modes { if m == mode { return true diff --git a/pkg/volume/gce_pd/gce_pd.go b/pkg/volume/gce_pd/gce_pd.go index ce05fbfeb56..be2d6b97acb 100644 --- a/pkg/volume/gce_pd/gce_pd.go +++ b/pkg/volume/gce_pd/gce_pd.go @@ -68,8 +68,8 @@ func (plugin *gcePersistentDiskPlugin) CanSupport(spec *volume.Spec) bool { return spec.VolumeSource.GCEPersistentDisk != nil || spec.PersistentVolumeSource.GCEPersistentDisk != nil } -func (plugin *gcePersistentDiskPlugin) GetAccessModes() []api.AccessModeType { - return []api.AccessModeType{ +func (plugin *gcePersistentDiskPlugin) GetAccessModes() []api.PersistentVolumeAccessMode { + return []api.PersistentVolumeAccessMode{ api.ReadWriteOnce, api.ReadOnlyMany, } diff --git a/pkg/volume/gce_pd/gce_pd_test.go b/pkg/volume/gce_pd/gce_pd_test.go index a1610e8e474..ef6b4771393 100644 --- a/pkg/volume/gce_pd/gce_pd_test.go +++ b/pkg/volume/gce_pd/gce_pd_test.go @@ -55,7 +55,7 @@ func TestGetAccessModes(t *testing.T) { } } -func contains(modes []api.AccessModeType, mode api.AccessModeType) bool { +func contains(modes []api.PersistentVolumeAccessMode, mode api.PersistentVolumeAccessMode) bool { for _, m := range modes { if m == mode { return true diff --git a/pkg/volume/glusterfs/glusterfs.go b/pkg/volume/glusterfs/glusterfs.go index 497cff75684..8931d5d7d1d 100644 --- a/pkg/volume/glusterfs/glusterfs.go +++ b/pkg/volume/glusterfs/glusterfs.go @@ -56,8 +56,8 @@ func (plugin *glusterfsPlugin) CanSupport(spec *volume.Spec) bool { return spec.VolumeSource.Glusterfs != nil || spec.PersistentVolumeSource.Glusterfs != nil } -func (plugin *glusterfsPlugin) GetAccessModes() []api.AccessModeType { - return []api.AccessModeType{ +func (plugin *glusterfsPlugin) GetAccessModes() []api.PersistentVolumeAccessMode { + return []api.PersistentVolumeAccessMode{ api.ReadWriteOnce, api.ReadOnlyMany, api.ReadWriteMany, diff --git a/pkg/volume/glusterfs/glusterfs_test.go b/pkg/volume/glusterfs/glusterfs_test.go index 9e463eb633b..b9f40e200bf 100644 --- a/pkg/volume/glusterfs/glusterfs_test.go +++ b/pkg/volume/glusterfs/glusterfs_test.go @@ -58,7 +58,7 @@ func TestGetAccessModes(t *testing.T) { } } -func contains(modes []api.AccessModeType, mode api.AccessModeType) bool { +func contains(modes []api.PersistentVolumeAccessMode, mode api.PersistentVolumeAccessMode) bool { for _, m := range modes { if m == mode { return true diff --git a/pkg/volume/host_path/host_path.go b/pkg/volume/host_path/host_path.go index 61ffa5441a6..214cd28e4f4 100644 --- a/pkg/volume/host_path/host_path.go +++ b/pkg/volume/host_path/host_path.go @@ -52,8 +52,8 @@ func (plugin *hostPathPlugin) CanSupport(spec *volume.Spec) bool { return spec.VolumeSource.HostPath != nil || spec.PersistentVolumeSource.HostPath != nil } -func (plugin *hostPathPlugin) GetAccessModes() []api.AccessModeType { - return []api.AccessModeType{ +func (plugin *hostPathPlugin) GetAccessModes() []api.PersistentVolumeAccessMode { + return []api.PersistentVolumeAccessMode{ api.ReadWriteOnce, } } diff --git a/pkg/volume/host_path/host_path_test.go b/pkg/volume/host_path/host_path_test.go index 03b08d98389..54d755f1cd4 100644 --- a/pkg/volume/host_path/host_path_test.go +++ b/pkg/volume/host_path/host_path_test.go @@ -52,7 +52,7 @@ func TestGetAccessModes(t *testing.T) { t.Errorf("Can't find the plugin by name") } if len(plug.GetAccessModes()) != 1 || plug.GetAccessModes()[0] != api.ReadWriteOnce { - t.Errorf("Expected %s AccessModeType", api.ReadWriteOnce) + t.Errorf("Expected %s PersistentVolumeAccessMode", api.ReadWriteOnce) } } diff --git a/pkg/volume/iscsi/iscsi.go b/pkg/volume/iscsi/iscsi.go index a52cf994bb1..3695642b7fe 100644 --- a/pkg/volume/iscsi/iscsi.go +++ b/pkg/volume/iscsi/iscsi.go @@ -65,8 +65,8 @@ func (plugin *ISCSIPlugin) CanSupport(spec *volume.Spec) bool { return false } -func (plugin *ISCSIPlugin) GetAccessModes() []api.AccessModeType { - return []api.AccessModeType{ +func (plugin *ISCSIPlugin) GetAccessModes() []api.PersistentVolumeAccessMode { + return []api.PersistentVolumeAccessMode{ api.ReadWriteOnce, api.ReadOnlyMany, } diff --git a/pkg/volume/nfs/nfs.go b/pkg/volume/nfs/nfs.go index 412ec863151..0c19e963b03 100644 --- a/pkg/volume/nfs/nfs.go +++ b/pkg/volume/nfs/nfs.go @@ -55,8 +55,8 @@ func (plugin *nfsPlugin) CanSupport(spec *volume.Spec) bool { return spec.VolumeSource.NFS != nil } -func (plugin *nfsPlugin) GetAccessModes() []api.AccessModeType { - return []api.AccessModeType{ +func (plugin *nfsPlugin) GetAccessModes() []api.PersistentVolumeAccessMode { + return []api.PersistentVolumeAccessMode{ api.ReadWriteOnce, api.ReadOnlyMany, api.ReadWriteMany, diff --git a/pkg/volume/nfs/nfs_test.go b/pkg/volume/nfs/nfs_test.go index 62fe4e12545..1c66455eb28 100644 --- a/pkg/volume/nfs/nfs_test.go +++ b/pkg/volume/nfs/nfs_test.go @@ -57,7 +57,7 @@ func TestGetAccessModes(t *testing.T) { } } -func contains(modes []api.AccessModeType, mode api.AccessModeType) bool { +func contains(modes []api.PersistentVolumeAccessMode, mode api.PersistentVolumeAccessMode) bool { for _, m := range modes { if m == mode { return true diff --git a/pkg/volume/plugins.go b/pkg/volume/plugins.go index 6d0551f48f0..54a5f68a891 100644 --- a/pkg/volume/plugins.go +++ b/pkg/volume/plugins.go @@ -76,7 +76,7 @@ type VolumePlugin interface { type PersistentVolumePlugin interface { VolumePlugin // GetAccessModes describes the ways a given volume can be accessed/mounted. - GetAccessModes() []api.AccessModeType + GetAccessModes() []api.PersistentVolumeAccessMode } // VolumeHost is an interface that plugins can use to access the kubelet. diff --git a/pkg/volume/testing.go b/pkg/volume/testing.go index 21ae3bd38fd..6502b326cfc 100644 --- a/pkg/volume/testing.go +++ b/pkg/volume/testing.go @@ -104,8 +104,8 @@ func (plugin *FakeVolumePlugin) NewCleaner(volName string, podUID types.UID, mou return &FakeVolume{podUID, volName, plugin}, nil } -func (plugin *FakeVolumePlugin) GetAccessModes() []api.AccessModeType { - return []api.AccessModeType{} +func (plugin *FakeVolumePlugin) GetAccessModes() []api.PersistentVolumeAccessMode { + return []api.PersistentVolumeAccessMode{} } type FakeVolume struct { diff --git a/pkg/volume/util.go b/pkg/volume/util.go index d5dcf6bfe4f..3efa3823937 100644 --- a/pkg/volume/util.go +++ b/pkg/volume/util.go @@ -20,7 +20,7 @@ import ( "github.com/GoogleCloudPlatform/kubernetes/pkg/api" ) -func GetAccessModesAsString(modes []api.AccessModeType) string { +func GetAccessModesAsString(modes []api.PersistentVolumeAccessMode) string { modesAsString := "" if contains(modes, api.ReadWriteOnce) { @@ -43,7 +43,7 @@ func appendAccessMode(modes *string, mode string) { *modes += mode } -func contains(modes []api.AccessModeType, mode api.AccessModeType) bool { +func contains(modes []api.PersistentVolumeAccessMode, mode api.PersistentVolumeAccessMode) bool { for _, m := range modes { if m == mode { return true diff --git a/pkg/volumeclaimbinder/persistent_volume_claim_binder_test.go b/pkg/volumeclaimbinder/persistent_volume_claim_binder_test.go index 42cac5778ba..8032c118736 100644 --- a/pkg/volumeclaimbinder/persistent_volume_claim_binder_test.go +++ b/pkg/volumeclaimbinder/persistent_volume_claim_binder_test.go @@ -57,7 +57,7 @@ func TestExampleObjects(t *testing.T) { "claims/claim-01.yaml": { expected: &api.PersistentVolumeClaim{ Spec: api.PersistentVolumeClaimSpec{ - AccessModes: []api.AccessModeType{api.ReadWriteOnce}, + AccessModes: []api.PersistentVolumeAccessMode{api.ReadWriteOnce}, Resources: api.ResourceRequirements{ Requests: api.ResourceList{ api.ResourceName(api.ResourceStorage): resource.MustParse("3Gi"), @@ -69,7 +69,7 @@ func TestExampleObjects(t *testing.T) { "claims/claim-02.yaml": { expected: &api.PersistentVolumeClaim{ Spec: api.PersistentVolumeClaimSpec{ - AccessModes: []api.AccessModeType{api.ReadWriteOnce}, + AccessModes: []api.PersistentVolumeAccessMode{api.ReadWriteOnce}, Resources: api.ResourceRequirements{ Requests: api.ResourceList{ api.ResourceName(api.ResourceStorage): resource.MustParse("8Gi"), @@ -81,7 +81,7 @@ func TestExampleObjects(t *testing.T) { "volumes/local-01.yaml": { expected: &api.PersistentVolume{ Spec: api.PersistentVolumeSpec{ - AccessModes: []api.AccessModeType{api.ReadWriteOnce}, + AccessModes: []api.PersistentVolumeAccessMode{api.ReadWriteOnce}, Capacity: api.ResourceList{ api.ResourceName(api.ResourceStorage): resource.MustParse("10Gi"), }, @@ -96,7 +96,7 @@ func TestExampleObjects(t *testing.T) { "volumes/local-02.yaml": { expected: &api.PersistentVolume{ Spec: api.PersistentVolumeSpec{ - AccessModes: []api.AccessModeType{api.ReadWriteOnce}, + AccessModes: []api.PersistentVolumeAccessMode{api.ReadWriteOnce}, Capacity: api.ResourceList{ api.ResourceName(api.ResourceStorage): resource.MustParse("5Gi"), }, diff --git a/pkg/volumeclaimbinder/persistent_volume_index_test.go b/pkg/volumeclaimbinder/persistent_volume_index_test.go index 8a7d6f4c7a9..f9a9c0032eb 100644 --- a/pkg/volumeclaimbinder/persistent_volume_index_test.go +++ b/pkg/volumeclaimbinder/persistent_volume_index_test.go @@ -41,7 +41,7 @@ func TestMatchVolume(t *testing.T) { Namespace: "myns", }, Spec: api.PersistentVolumeClaimSpec{ - AccessModes: []api.AccessModeType{api.ReadOnlyMany, api.ReadWriteOnce}, + AccessModes: []api.PersistentVolumeAccessMode{api.ReadOnlyMany, api.ReadWriteOnce}, Resources: api.ResourceRequirements{ Requests: api.ResourceList{ api.ResourceName(api.ResourceStorage): resource.MustParse("8G"), @@ -58,7 +58,7 @@ func TestMatchVolume(t *testing.T) { Namespace: "myns", }, Spec: api.PersistentVolumeClaimSpec{ - AccessModes: []api.AccessModeType{api.ReadOnlyMany, api.ReadWriteOnce, api.ReadWriteMany}, + AccessModes: []api.PersistentVolumeAccessMode{api.ReadOnlyMany, api.ReadWriteOnce, api.ReadWriteMany}, Resources: api.ResourceRequirements{ Requests: api.ResourceList{ api.ResourceName(api.ResourceStorage): resource.MustParse("5G"), @@ -75,7 +75,7 @@ func TestMatchVolume(t *testing.T) { Namespace: "myns", }, Spec: api.PersistentVolumeClaimSpec{ - AccessModes: []api.AccessModeType{api.ReadOnlyMany, api.ReadWriteOnce}, + AccessModes: []api.PersistentVolumeAccessMode{api.ReadOnlyMany, api.ReadWriteOnce}, Resources: api.ResourceRequirements{ Requests: api.ResourceList{ api.ResourceName(api.ResourceStorage): resource.MustParse("1G"), @@ -92,7 +92,7 @@ func TestMatchVolume(t *testing.T) { Namespace: "myns", }, Spec: api.PersistentVolumeClaimSpec{ - AccessModes: []api.AccessModeType{api.ReadOnlyMany, api.ReadWriteOnce}, + AccessModes: []api.PersistentVolumeAccessMode{api.ReadOnlyMany, api.ReadWriteOnce}, Resources: api.ResourceRequirements{ Requests: api.ResourceList{ api.ResourceName(api.ResourceStorage): resource.MustParse("999G"), @@ -126,7 +126,7 @@ func TestSort(t *testing.T) { volList.Add(pv) } - volumes, err := volList.ListByAccessModes([]api.AccessModeType{api.ReadWriteOnce, api.ReadOnlyMany}) + volumes, err := volList.ListByAccessModes([]api.PersistentVolumeAccessMode{api.ReadWriteOnce, api.ReadOnlyMany}) if err != nil { t.Error("Unexpected error retrieving volumes by access modes:", err) } @@ -137,7 +137,7 @@ func TestSort(t *testing.T) { } } - volumes, err = volList.ListByAccessModes([]api.AccessModeType{api.ReadWriteOnce, api.ReadOnlyMany, api.ReadWriteMany}) + volumes, err = volList.ListByAccessModes([]api.PersistentVolumeAccessMode{api.ReadWriteOnce, api.ReadOnlyMany, api.ReadWriteMany}) if err != nil { t.Error("Unexpected error retrieving volumes by access modes:", err) } @@ -164,7 +164,7 @@ func createTestVolumes() []*api.PersistentVolume { PersistentVolumeSource: api.PersistentVolumeSource{ GCEPersistentDisk: &api.GCEPersistentDiskVolumeSource{}, }, - AccessModes: []api.AccessModeType{ + AccessModes: []api.PersistentVolumeAccessMode{ api.ReadWriteOnce, api.ReadOnlyMany, }, @@ -182,7 +182,7 @@ func createTestVolumes() []*api.PersistentVolume { PersistentVolumeSource: api.PersistentVolumeSource{ Glusterfs: &api.GlusterfsVolumeSource{}, }, - AccessModes: []api.AccessModeType{ + AccessModes: []api.PersistentVolumeAccessMode{ api.ReadWriteOnce, api.ReadOnlyMany, api.ReadWriteMany, @@ -201,7 +201,7 @@ func createTestVolumes() []*api.PersistentVolume { PersistentVolumeSource: api.PersistentVolumeSource{ GCEPersistentDisk: &api.GCEPersistentDiskVolumeSource{}, }, - AccessModes: []api.AccessModeType{ + AccessModes: []api.PersistentVolumeAccessMode{ api.ReadWriteOnce, api.ReadOnlyMany, }, @@ -221,7 +221,7 @@ func createTestVolumes() []*api.PersistentVolume { PersistentVolumeSource: api.PersistentVolumeSource{ Glusterfs: &api.GlusterfsVolumeSource{}, }, - AccessModes: []api.AccessModeType{ + AccessModes: []api.PersistentVolumeAccessMode{ api.ReadWriteOnce, api.ReadOnlyMany, api.ReadWriteMany, @@ -240,7 +240,7 @@ func createTestVolumes() []*api.PersistentVolume { PersistentVolumeSource: api.PersistentVolumeSource{ GCEPersistentDisk: &api.GCEPersistentDiskVolumeSource{}, }, - AccessModes: []api.AccessModeType{ + AccessModes: []api.PersistentVolumeAccessMode{ api.ReadWriteOnce, api.ReadOnlyMany, }, @@ -258,7 +258,7 @@ func createTestVolumes() []*api.PersistentVolume { PersistentVolumeSource: api.PersistentVolumeSource{ Glusterfs: &api.GlusterfsVolumeSource{}, }, - AccessModes: []api.AccessModeType{ + AccessModes: []api.PersistentVolumeAccessMode{ api.ReadWriteOnce, api.ReadOnlyMany, api.ReadWriteMany, diff --git a/pkg/volumeclaimbinder/types.go b/pkg/volumeclaimbinder/types.go index b48dd71f30b..af6c921f3f7 100644 --- a/pkg/volumeclaimbinder/types.go +++ b/pkg/volumeclaimbinder/types.go @@ -49,7 +49,7 @@ func accessModesIndexFunc(obj interface{}) (string, error) { } // ListByAccessModes returns all volumes with the given set of AccessModeTypes *in order* of their storage capacity (low to high) -func (pvIndex *persistentVolumeOrderedIndex) ListByAccessModes(modes []api.AccessModeType) ([]*api.PersistentVolume, error) { +func (pvIndex *persistentVolumeOrderedIndex) ListByAccessModes(modes []api.PersistentVolumeAccessMode) ([]*api.PersistentVolume, error) { pv := &api.PersistentVolume{ Spec: api.PersistentVolumeSpec{ AccessModes: modes, @@ -88,7 +88,7 @@ func (pvIndex *persistentVolumeOrderedIndex) Find(pv *api.PersistentVolume, matc } // FindByAccessModesAndStorageCapacity is a convenience method that calls Find w/ requisite matchPredicate for storage -func (pvIndex *persistentVolumeOrderedIndex) FindByAccessModesAndStorageCapacity(modes []api.AccessModeType, qty resource.Quantity) (*api.PersistentVolume, error) { +func (pvIndex *persistentVolumeOrderedIndex) FindByAccessModesAndStorageCapacity(modes []api.PersistentVolumeAccessMode, qty resource.Quantity) (*api.PersistentVolume, error) { pv := &api.PersistentVolume{ Spec: api.PersistentVolumeSpec{ AccessModes: modes, diff --git a/test/integration/persistent_volumes_test.go b/test/integration/persistent_volumes_test.go index d7b799d31ef..9c61fca92e6 100644 --- a/test/integration/persistent_volumes_test.go +++ b/test/integration/persistent_volumes_test.go @@ -119,7 +119,7 @@ func createTestClaims() []*api.PersistentVolumeClaim { Namespace: api.NamespaceDefault, }, Spec: api.PersistentVolumeClaimSpec{ - AccessModes: []api.AccessModeType{api.ReadWriteOnce}, + AccessModes: []api.PersistentVolumeAccessMode{api.ReadWriteOnce}, Resources: api.ResourceRequirements{ Requests: api.ResourceList{ api.ResourceName(api.ResourceStorage): resource.MustParse("500G"), @@ -133,7 +133,7 @@ func createTestClaims() []*api.PersistentVolumeClaim { Namespace: api.NamespaceDefault, }, Spec: api.PersistentVolumeClaimSpec{ - AccessModes: []api.AccessModeType{api.ReadOnlyMany, api.ReadWriteOnce}, + AccessModes: []api.PersistentVolumeAccessMode{api.ReadOnlyMany, api.ReadWriteOnce}, Resources: api.ResourceRequirements{ Requests: api.ResourceList{ api.ResourceName(api.ResourceStorage): resource.MustParse("8G"), @@ -147,7 +147,7 @@ func createTestClaims() []*api.PersistentVolumeClaim { Namespace: api.NamespaceDefault, }, Spec: api.PersistentVolumeClaimSpec{ - AccessModes: []api.AccessModeType{api.ReadOnlyMany, api.ReadWriteOnce, api.ReadWriteMany}, + AccessModes: []api.PersistentVolumeAccessMode{api.ReadOnlyMany, api.ReadWriteOnce, api.ReadWriteMany}, Resources: api.ResourceRequirements{ Requests: api.ResourceList{ api.ResourceName(api.ResourceStorage): resource.MustParse("5G"), @@ -175,7 +175,7 @@ func createTestVolumes() []*api.PersistentVolume { FSType: "foo", }, }, - AccessModes: []api.AccessModeType{ + AccessModes: []api.PersistentVolumeAccessMode{ api.ReadWriteOnce, api.ReadOnlyMany, }, @@ -196,7 +196,7 @@ func createTestVolumes() []*api.PersistentVolume { Path: "theloveyoutakeisequaltotheloveyoumake", }, }, - AccessModes: []api.AccessModeType{ + AccessModes: []api.PersistentVolumeAccessMode{ api.ReadWriteOnce, api.ReadOnlyMany, api.ReadWriteMany,