github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-31 15:25:57 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #101297 from houjun41544/20210421-volumezone

Browse Source 
Remove redundant checks
This commit is contained in:
Kubernetes Prow Robot 2021-04-21 19:15:56 -07:00 committed by GitHub
commit a160d1dedc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -116,10 +116,6 @@ func (pl *VolumeZone) Filter(ctx context.Context, _ *framework.CycleState, pod *
return framework.AsStatus(err) return framework.AsStatus(err)
} }
if pvc == nil {
return framework.NewStatus(framework.Error, fmt.Sprintf("PersistentVolumeClaim was not found: %q", pvcName))
}
pvName := pvc.Spec.VolumeName pvName := pvc.Spec.VolumeName
if pvName == "" { if pvName == "" {
scName := storagehelpers.GetPersistentVolumeClaimClass(pvc) scName := storagehelpers.GetPersistentVolumeClaimClass(pvc)
@ -148,10 +144,6 @@ func (pl *VolumeZone) Filter(ctx context.Context, _ *framework.CycleState, pod *
return framework.AsStatus(err) return framework.AsStatus(err)
} }
if pv == nil {
return framework.NewStatus(framework.Error, fmt.Sprintf("PersistentVolume was not found: %q", pvName))
}
for k, v := range pv.ObjectMeta.Labels { for k, v := range pv.ObjectMeta.Labels {
if !volumeZoneLabels.Has(k) { if !volumeZoneLabels.Has(k) {
continue continue