It's better to have all WaitFor functions in the same location even though the func WaitForPersistentVolumeClaimBeRemoved is used only in one file. This was requested in [1]. [1] https://github.com/kubernetes/kubernetes/pull/56931#discussion_r156724019