github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cleanup todo after feature.BlockVolume gate was removed

Browse Source
This commit is contained in:
carlory
2023-11-08 16:39:25 +08:00
parent e4b74dd12f
commit 1c0044594d
2 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/kubelet/volumemanager/populator/desired_state_of_world_populator.go
View File

@@ -522,17 +522,11 @@ func (dswp *desiredStateOfWorldPopulator) createVolumeSpec(
} }
} }
// TODO: replace this with util.GetVolumeMode() when features.BlockVolume is removed. volumeMode, err := util.GetVolumeMode(volumeSpec)
// The function will return the right value then. if err != nil {
volumeMode := v1.PersistentVolumeFilesystem return nil, nil, "", err
if volumeSpec.PersistentVolume != nil && volumeSpec.PersistentVolume.Spec.VolumeMode != nil {
volumeMode = *volumeSpec.PersistentVolume.Spec.VolumeMode
} }
// TODO: remove features.BlockVolume checks / comments after no longer needed
// Error if a container has volumeMounts but the volumeMode of PVC isn't Filesystem. // Error if a container has volumeMounts but the volumeMode of PVC isn't Filesystem.
// Do not check feature gate here to make sure even when the feature is disabled in kubelet,
// because controller-manager / API server can already contain block PVs / PVCs.
if mounts.Has(podVolume.Name) && volumeMode != v1.PersistentVolumeFilesystem { if mounts.Has(podVolume.Name) && volumeMode != v1.PersistentVolumeFilesystem {
return nil, nil, "", fmt.Errorf( return nil, nil, "", fmt.Errorf(
"volume %s has volumeMode %s, but is specified in volumeMounts", "volume %s has volumeMode %s, but is specified in volumeMounts",

7
pkg/kubelet/volumemanager/populator/desired_state_of_world_populator_test.go
View File

@@ -21,6 +21,7 @@ import (
"time" "time"
"k8s.io/klog/v2/ktesting" "k8s.io/klog/v2/ktesting"
"k8s.io/utils/ptr"
"fmt" "fmt"
@@ -848,13 +849,13 @@ func TestCreateVolumeSpec_Valid_Nil_VolumeMounts(t *testing.T) {
}, },
Spec: v1.PersistentVolumeSpec{ Spec: v1.PersistentVolumeSpec{
ClaimRef: &v1.ObjectReference{Namespace: "ns", Name: "file-bound"}, ClaimRef: &v1.ObjectReference{Namespace: "ns", Name: "file-bound"},
VolumeMode: nil, VolumeMode: ptr.To(v1.PersistentVolumeFilesystem),
}, },
} }
pvc := &v1.PersistentVolumeClaim{ pvc := &v1.PersistentVolumeClaim{
Spec: v1.PersistentVolumeClaimSpec{ Spec: v1.PersistentVolumeClaimSpec{
VolumeName: "dswp-test-volume-name", VolumeName: "dswp-test-volume-name",
VolumeMode: nil, VolumeMode: ptr.To(v1.PersistentVolumeFilesystem),
}, },
Status: v1.PersistentVolumeClaimStatus{ Status: v1.PersistentVolumeClaimStatus{
Phase: v1.ClaimBound, Phase: v1.ClaimBound,
@@ -1285,6 +1286,7 @@ func TestCheckVolumeSELinux(t *testing.T) {
Name: "dswp-test-volume-name", Name: "dswp-test-volume-name",
}, },
Spec: v1.PersistentVolumeSpec{ Spec: v1.PersistentVolumeSpec{
VolumeMode: ptr.To(v1.PersistentVolumeFilesystem),
PersistentVolumeSource: v1.PersistentVolumeSource{RBD: &v1.RBDPersistentVolumeSource{}}, PersistentVolumeSource: v1.PersistentVolumeSource{RBD: &v1.RBDPersistentVolumeSource{}},
Capacity: volumeCapacity(1), Capacity: volumeCapacity(1),
ClaimRef: &v1.ObjectReference{Namespace: "ns", Name: "file-bound"}, ClaimRef: &v1.ObjectReference{Namespace: "ns", Name: "file-bound"},
@@ -1293,6 +1295,7 @@ func TestCheckVolumeSELinux(t *testing.T) {
} }
pvc := &v1.PersistentVolumeClaim{ pvc := &v1.PersistentVolumeClaim{
Spec: v1.PersistentVolumeClaimSpec{ Spec: v1.PersistentVolumeClaimSpec{
VolumeMode: ptr.To(v1.PersistentVolumeFilesystem),
VolumeName: pv.Name, VolumeName: pv.Name,
Resources: v1.VolumeResourceRequirements{ Resources: v1.VolumeResourceRequirements{
Requests: pv.Spec.Capacity, Requests: pv.Spec.Capacity,