WIP: Refactor internal API for Pods to match v1beta3

see comment above