Refactor internal API for Pods to match v1beta3

That's the right solution