This splits up the kubernetes 1.19 PR to make it easier to keep up to date until we get it sorted out.