Fix kube-deploy issues from upstream rebase