diff --git a/pkg/volume/aws_ebs/aws_ebs.go b/pkg/volume/aws_ebs/aws_ebs.go index d71804855b1..c87f8ca26b2 100644 --- a/pkg/volume/aws_ebs/aws_ebs.go +++ b/pkg/volume/aws_ebs/aws_ebs.go @@ -222,10 +222,9 @@ var _ volume.Builder = &awsElasticBlockStoreBuilder{} func (b *awsElasticBlockStoreBuilder) GetAttributes() volume.Attributes { return volume.Attributes{ - ReadOnly: b.readOnly, - Managed: !b.readOnly, - SupportsOwnershipManagement: true, - SupportsSELinux: true, + ReadOnly: b.readOnly, + Managed: !b.readOnly, + SupportsSELinux: true, } } diff --git a/pkg/volume/cephfs/cephfs.go b/pkg/volume/cephfs/cephfs.go index 48640b9f4c3..b11bb324070 100644 --- a/pkg/volume/cephfs/cephfs.go +++ b/pkg/volume/cephfs/cephfs.go @@ -155,10 +155,9 @@ var _ volume.Builder = &cephfsBuilder{} func (cephfsVolume *cephfsBuilder) GetAttributes() volume.Attributes { return volume.Attributes{ - ReadOnly: cephfsVolume.readonly, - Managed: false, - SupportsOwnershipManagement: false, - SupportsSELinux: false, + ReadOnly: cephfsVolume.readonly, + Managed: false, + SupportsSELinux: false, } } diff --git a/pkg/volume/cinder/cinder.go b/pkg/volume/cinder/cinder.go index 30d312385a8..14ecf7e46ff 100644 --- a/pkg/volume/cinder/cinder.go +++ b/pkg/volume/cinder/cinder.go @@ -216,10 +216,9 @@ func detachDiskLogError(cd *cinderVolume) { func (b *cinderVolumeBuilder) GetAttributes() volume.Attributes { return volume.Attributes{ - ReadOnly: b.readOnly, - Managed: !b.readOnly, - SupportsOwnershipManagement: true, - SupportsSELinux: true, + ReadOnly: b.readOnly, + Managed: !b.readOnly, + SupportsSELinux: true, } } diff --git a/pkg/volume/downwardapi/downwardapi.go b/pkg/volume/downwardapi/downwardapi.go index 1b9a887a722..50d88fa2d44 100644 --- a/pkg/volume/downwardapi/downwardapi.go +++ b/pkg/volume/downwardapi/downwardapi.go @@ -112,10 +112,9 @@ var _ volume.Builder = &downwardAPIVolumeBuilder{} // downward API volumes are always ReadOnlyManaged func (d *downwardAPIVolume) GetAttributes() volume.Attributes { return volume.Attributes{ - ReadOnly: true, - Managed: true, - SupportsOwnershipManagement: true, - SupportsSELinux: true, + ReadOnly: true, + Managed: true, + SupportsSELinux: true, } } diff --git a/pkg/volume/empty_dir/empty_dir.go b/pkg/volume/empty_dir/empty_dir.go index 275ac19b225..4a2dfc52e5b 100644 --- a/pkg/volume/empty_dir/empty_dir.go +++ b/pkg/volume/empty_dir/empty_dir.go @@ -142,10 +142,9 @@ type emptyDir struct { func (ed *emptyDir) GetAttributes() volume.Attributes { return volume.Attributes{ - ReadOnly: false, - Managed: true, - SupportsOwnershipManagement: true, - SupportsSELinux: true, + ReadOnly: false, + Managed: true, + SupportsSELinux: true, } } diff --git a/pkg/volume/fc/fc.go b/pkg/volume/fc/fc.go index 0f5b1efc0d4..1f54cd011b0 100644 --- a/pkg/volume/fc/fc.go +++ b/pkg/volume/fc/fc.go @@ -170,10 +170,9 @@ var _ volume.Builder = &fcDiskBuilder{} func (b *fcDiskBuilder) GetAttributes() volume.Attributes { return volume.Attributes{ - ReadOnly: b.readOnly, - Managed: !b.readOnly, - SupportsOwnershipManagement: true, - SupportsSELinux: true, + ReadOnly: b.readOnly, + Managed: !b.readOnly, + SupportsSELinux: true, } } func (b *fcDiskBuilder) SetUp(fsGroup *int64) error { diff --git a/pkg/volume/flexvolume/flexvolume.go b/pkg/volume/flexvolume/flexvolume.go index 9de2e3233bc..bfa1215517b 100644 --- a/pkg/volume/flexvolume/flexvolume.go +++ b/pkg/volume/flexvolume/flexvolume.go @@ -231,10 +231,9 @@ func (f *flexVolumeBuilder) SetUp(fsGroup *int64) error { // using plugin callout after we finalize the callout syntax. func (f flexVolumeBuilder) GetAttributes() volume.Attributes { return volume.Attributes{ - ReadOnly: f.readOnly, - Managed: false, - SupportsOwnershipManagement: false, - SupportsSELinux: false, + ReadOnly: f.readOnly, + Managed: false, + SupportsSELinux: false, } } diff --git a/pkg/volume/flocker/plugin.go b/pkg/volume/flocker/plugin.go index 39e68463d5a..441db0d6646 100644 --- a/pkg/volume/flocker/plugin.go +++ b/pkg/volume/flocker/plugin.go @@ -117,10 +117,9 @@ type flockerBuilder struct { func (b flockerBuilder) GetAttributes() volume.Attributes { return volume.Attributes{ - ReadOnly: b.readOnly, - Managed: false, - SupportsOwnershipManagement: false, - SupportsSELinux: false, + ReadOnly: b.readOnly, + Managed: false, + SupportsSELinux: false, } } func (b flockerBuilder) GetPath() string { diff --git a/pkg/volume/gce_pd/gce_pd.go b/pkg/volume/gce_pd/gce_pd.go index 907d3389bff..057c0d46e8b 100644 --- a/pkg/volume/gce_pd/gce_pd.go +++ b/pkg/volume/gce_pd/gce_pd.go @@ -211,10 +211,9 @@ var _ volume.Builder = &gcePersistentDiskBuilder{} func (b *gcePersistentDiskBuilder) GetAttributes() volume.Attributes { return volume.Attributes{ - ReadOnly: b.readOnly, - Managed: !b.readOnly, - SupportsOwnershipManagement: true, - SupportsSELinux: true, + ReadOnly: b.readOnly, + Managed: !b.readOnly, + SupportsSELinux: true, } } diff --git a/pkg/volume/git_repo/git_repo.go b/pkg/volume/git_repo/git_repo.go index 02ac90d454e..e3e9fd8815e 100644 --- a/pkg/volume/git_repo/git_repo.go +++ b/pkg/volume/git_repo/git_repo.go @@ -116,10 +116,9 @@ var _ volume.Builder = &gitRepoVolumeBuilder{} func (b *gitRepoVolumeBuilder) GetAttributes() volume.Attributes { return volume.Attributes{ - ReadOnly: false, - Managed: true, - SupportsOwnershipManagement: false, - SupportsSELinux: true, // xattr change should be okay, TODO: double check + ReadOnly: false, + Managed: true, + SupportsSELinux: true, // xattr change should be okay, TODO: double check } } diff --git a/pkg/volume/glusterfs/glusterfs.go b/pkg/volume/glusterfs/glusterfs.go index b2933962048..f38946067dd 100644 --- a/pkg/volume/glusterfs/glusterfs.go +++ b/pkg/volume/glusterfs/glusterfs.go @@ -158,10 +158,9 @@ var _ volume.Builder = &glusterfsBuilder{} func (b *glusterfsBuilder) GetAttributes() volume.Attributes { return volume.Attributes{ - ReadOnly: b.readOnly, - Managed: false, - SupportsOwnershipManagement: false, - SupportsSELinux: false, + ReadOnly: b.readOnly, + Managed: false, + SupportsSELinux: false, } } diff --git a/pkg/volume/host_path/host_path.go b/pkg/volume/host_path/host_path.go index d689911cc75..1dfcec7503b 100644 --- a/pkg/volume/host_path/host_path.go +++ b/pkg/volume/host_path/host_path.go @@ -178,10 +178,9 @@ var _ volume.Builder = &hostPathBuilder{} func (b *hostPathBuilder) GetAttributes() volume.Attributes { return volume.Attributes{ - ReadOnly: b.readOnly, - Managed: false, - SupportsOwnershipManagement: false, - SupportsSELinux: false, + ReadOnly: b.readOnly, + Managed: false, + SupportsSELinux: false, } } diff --git a/pkg/volume/iscsi/iscsi.go b/pkg/volume/iscsi/iscsi.go index afdfb278868..39fcf33ede8 100644 --- a/pkg/volume/iscsi/iscsi.go +++ b/pkg/volume/iscsi/iscsi.go @@ -168,10 +168,9 @@ var _ volume.Builder = &iscsiDiskBuilder{} func (b *iscsiDiskBuilder) GetAttributes() volume.Attributes { return volume.Attributes{ - ReadOnly: b.readOnly, - Managed: !b.readOnly, - SupportsOwnershipManagement: true, - SupportsSELinux: true, + ReadOnly: b.readOnly, + Managed: !b.readOnly, + SupportsSELinux: true, } } diff --git a/pkg/volume/nfs/nfs.go b/pkg/volume/nfs/nfs.go index 2c1deb2f896..60e7ece59c2 100644 --- a/pkg/volume/nfs/nfs.go +++ b/pkg/volume/nfs/nfs.go @@ -151,10 +151,9 @@ var _ volume.Builder = &nfsBuilder{} func (b *nfsBuilder) GetAttributes() volume.Attributes { return volume.Attributes{ - ReadOnly: b.readOnly, - Managed: false, - SupportsOwnershipManagement: false, - SupportsSELinux: false, + ReadOnly: b.readOnly, + Managed: false, + SupportsSELinux: false, } } diff --git a/pkg/volume/rbd/rbd.go b/pkg/volume/rbd/rbd.go index 8807c646626..78af488f7be 100644 --- a/pkg/volume/rbd/rbd.go +++ b/pkg/volume/rbd/rbd.go @@ -196,10 +196,9 @@ var _ volume.Builder = &rbdBuilder{} func (b *rbd) GetAttributes() volume.Attributes { return volume.Attributes{ - ReadOnly: b.ReadOnly, - Managed: !b.ReadOnly, - SupportsOwnershipManagement: true, - SupportsSELinux: true, + ReadOnly: b.ReadOnly, + Managed: !b.ReadOnly, + SupportsSELinux: true, } } diff --git a/pkg/volume/secret/secret.go b/pkg/volume/secret/secret.go index f1c8f39df76..339380c4630 100644 --- a/pkg/volume/secret/secret.go +++ b/pkg/volume/secret/secret.go @@ -101,10 +101,9 @@ var _ volume.Builder = &secretVolumeBuilder{} func (sv *secretVolume) GetAttributes() volume.Attributes { return volume.Attributes{ - ReadOnly: true, - Managed: true, - SupportsOwnershipManagement: true, - SupportsSELinux: true, + ReadOnly: true, + Managed: true, + SupportsSELinux: true, } } func (b *secretVolumeBuilder) SetUp(fsGroup *int64) error { diff --git a/pkg/volume/testing.go b/pkg/volume/testing.go index c35700430f5..9e2750774ee 100644 --- a/pkg/volume/testing.go +++ b/pkg/volume/testing.go @@ -176,10 +176,9 @@ type FakeVolume struct { func (_ *FakeVolume) GetAttributes() Attributes { return Attributes{ - ReadOnly: false, - Managed: true, - SupportsOwnershipManagement: true, - SupportsSELinux: true, + ReadOnly: false, + Managed: true, + SupportsSELinux: true, } } diff --git a/pkg/volume/volume.go b/pkg/volume/volume.go index 32b8ec86793..c8c9a70b9bd 100644 --- a/pkg/volume/volume.go +++ b/pkg/volume/volume.go @@ -60,10 +60,9 @@ type Metrics struct { // Attributes represents the attributes of this builder. type Attributes struct { - ReadOnly bool - Managed bool - SupportsOwnershipManagement bool - SupportsSELinux bool + ReadOnly bool + Managed bool + SupportsSELinux bool } // Builder interface provides methods to set up/mount the volume.