Merge "Adaptations to execute in multi-node kube cluster"