Automatic merge from submit-queue (batch tested with PRs 34763, 38706, 39939, 40020) Use Statefulset instead in e2e and controller Quick fix ref: #35534 We should finish the issue to meet v1.6 milestone.