github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-13 13:55:41 +00:00
Code Issues Projects Releases Wiki Activity

fix_review_comments

Browse Source
This commit is contained in:
moriya 2024-06-14 09:41:38 +09:00
parent 3f3ce8659f
commit e93016b68c
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/scheduler/framework/plugins/volumezone/volume_zone.go
View File

@ -317,8 +317,8 @@ func (pl *VolumeZone) isSchedulableAfterPersistentVolumeClaimChange(logger klog.
if err != nil { if err != nil {
return framework.Queue, fmt.Errorf("unexpected objects in isSchedulableAfterPersistentVolumeClaimChange: %w", err) return framework.Queue, fmt.Errorf("unexpected objects in isSchedulableAfterPersistentVolumeClaimChange: %w", err)
} }
if pl.IsPVCRequestedFromPod(logger, modifiedPVC, pod) { if pl.isPVCRequestedFromPod(logger, modifiedPVC, pod) {
logger.V(5).Info("PVC was created or updated and it might make this pod schedulable. PVC is binding to the pod.", "pod", klog.KObj(pod), "PVC", klog.KObj(modifiedPVC)) logger.V(5).Info("PVC that is referred from the pod was created or updated, which might make this pod schedulable", "pod", klog.KObj(pod), "PVC", klog.KObj(modifiedPVC))
return framework.Queue, nil return framework.Queue, nil
} }
@ -326,19 +326,19 @@ func (pl *VolumeZone) isSchedulableAfterPersistentVolumeClaimChange(logger klog.
return framework.QueueSkip, nil return framework.QueueSkip, nil
} }
// IsPVCRequestedFromPod verifies if the PVC is requested from a given Pod. // isPVCRequestedFromPod verifies if the PVC is requested from a given Pod.
func (pl *VolumeZone) IsPVCRequestedFromPod(logger klog.Logger, pvc *v1.PersistentVolumeClaim, pod *v1.Pod) bool { func (pl *VolumeZone) isPVCRequestedFromPod(logger klog.Logger, pvc *v1.PersistentVolumeClaim, pod *v1.Pod) bool {
if (pvc == nil) || (pod.Namespace != pvc.Namespace) { if (pvc == nil) || (pod.Namespace != pvc.Namespace) {
return false return false
} }
pvcNames := pl.getPersistentVolumeClaimNameFromPod(pod) pvcNames := pl.getPersistentVolumeClaimNameFromPod(pod)
for _, pvcName := range pvcNames { for _, pvcName := range pvcNames {
if pvc.Name == pvcName { if pvc.Name == pvcName {
logger.V(5).Info("PVC matches the pod's PVC", "pod", klog.KObj(pod), "PVC", klog.KObj(pvc)) logger.V(5).Info("PVC is referred from the pod", "pod", klog.KObj(pod), "PVC", klog.KObj(pvc))
return true return true
} }
} }
logger.V(5).Info("PVC doesn't match the pod's PVC", "pod", klog.KObj(pod), "PVC", klog.KObj(pvc)) logger.V(5).Info("PVC is not referred from the pod", "pod", klog.KObj(pod), "PVC", klog.KObj(pvc))
return false return false
} }

12
pkg/scheduler/framework/plugins/volumezone/volume_zone_test.go
View File

@ -571,13 +571,13 @@ func TestIsSchedulableAfterPersistentVolumeClaimAdded(t *testing.T) {
expectedHint framework.QueueingHint expectedHint framework.QueueingHint
expectedErr bool expectedErr bool
}{ }{
"backoff-wrong-new-object": { "error-wrong-new-object": {
pod: createPodWithVolume("pod_1", "PVC_1"), pod: createPodWithVolume("pod_1", "PVC_1"),
newObj: "not-a-pvc", newObj: "not-a-pvc",
expectedHint: framework.Queue, expectedHint: framework.Queue,
expectedErr: true, expectedErr: true,
}, },
"pvc-was-added-but-pod-was-not-bound-to-pvc": { "pvc-was-added-but-pod-refers-no-pvc": {
pod: st.MakePod().Name("pod_1").Namespace("default").Obj(), pod: st.MakePod().Name("pod_1").Namespace("default").Obj(),
newObj: &v1.PersistentVolumeClaim{ newObj: &v1.PersistentVolumeClaim{
ObjectMeta: metav1.ObjectMeta{Name: "PVC_1", Namespace: "default"}, ObjectMeta: metav1.ObjectMeta{Name: "PVC_1", Namespace: "default"},
@ -601,7 +601,7 @@ func TestIsSchedulableAfterPersistentVolumeClaimAdded(t *testing.T) {
}, },
expectedHint: framework.QueueSkip, expectedHint: framework.QueueSkip,
}, },
"pvc-was-added-and-pod-was-bound-to-added-pvc": { "pvc-was-added-and-pod-was-bound-to-the-pvc": {
pod: createPodWithVolume("pod_1", "PVC_1"), pod: createPodWithVolume("pod_1", "PVC_1"),
newObj: &v1.PersistentVolumeClaim{ newObj: &v1.PersistentVolumeClaim{
ObjectMeta: metav1.ObjectMeta{Name: "PVC_1", Namespace: "default"}, ObjectMeta: metav1.ObjectMeta{Name: "PVC_1", Namespace: "default"},
@ -609,7 +609,7 @@ func TestIsSchedulableAfterPersistentVolumeClaimAdded(t *testing.T) {
}, },
expectedHint: framework.Queue, expectedHint: framework.Queue,
}, },
"pvc-was-updated-and-pod-was-bound-to-pvc": { "pvc-was-updated-and-pod-was-bound-to-the-pvc": {
pod: createPodWithVolume("pod_1", "PVC_1"), pod: createPodWithVolume("pod_1", "PVC_1"),
oldObj: &v1.PersistentVolumeClaim{ oldObj: &v1.PersistentVolumeClaim{
ObjectMeta: metav1.ObjectMeta{Name: "PVC_1", Namespace: "default"}, ObjectMeta: metav1.ObjectMeta{Name: "PVC_1", Namespace: "default"},
@ -621,8 +621,8 @@ func TestIsSchedulableAfterPersistentVolumeClaimAdded(t *testing.T) {
}, },
expectedHint: framework.Queue, expectedHint: framework.Queue,
}, },
"pvc-was-updated-but-pod-was-not-bound-to-pvc": { "pvc-was-updated-but-pod-refers-no-pvc": {
pod: createPodWithVolume("pod_1", ""), pod: st.MakePod().Name("pod_1").Namespace(metav1.NamespaceDefault).Obj(),
oldObj: &v1.PersistentVolumeClaim{ oldObj: &v1.PersistentVolumeClaim{
ObjectMeta: metav1.ObjectMeta{Name: "PVC_1", Namespace: "default"}, ObjectMeta: metav1.ObjectMeta{Name: "PVC_1", Namespace: "default"},
Spec: v1.PersistentVolumeClaimSpec{VolumeName: ""}, Spec: v1.PersistentVolumeClaimSpec{VolumeName: ""},