[WIP] [DO-NOT-MERGE] Kubernetes rebase