Skip to content

Commit 6e45046

Browse files
committed
Fix access mode evaluation
Now that SELinuxMount can support volumes with any access modes, length of the access modes does not need to be 1. That was requirement for RWOP volumes only.
1 parent 97b03e2 commit 6e45046

File tree

1 file changed

+8
-4
lines changed

1 file changed

+8
-4
lines changed

pkg/volume/util/selinux.go

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -174,16 +174,20 @@ func VolumeSupportsSELinuxMount(volumeSpec *volume.Spec) bool {
174174
if volumeSpec.PersistentVolume == nil {
175175
return false
176176
}
177-
if len(volumeSpec.PersistentVolume.Spec.AccessModes) != 1 {
178-
return false
179-
}
180177
if utilfeature.DefaultFeatureGate.Enabled(features.SELinuxMount) {
181178
return true
182179
}
183-
// Only SELinuxMountReadWriteOncePod feature enabled
180+
181+
// Only SELinuxMountReadWriteOncePod feature is enabled
182+
if len(volumeSpec.PersistentVolume.Spec.AccessModes) != 1 {
183+
// RWOP volumes must be the only access mode of the volume
184+
return false
185+
}
184186
if !v1helper.ContainsAccessMode(volumeSpec.PersistentVolume.Spec.AccessModes, v1.ReadWriteOncePod) {
187+
// Not a RWOP volume
185188
return false
186189
}
190+
// RWOP volume
187191
return true
188192
}
189193

0 commit comments

Comments
 (0)