Merge "Explicitly specify node-ip for kubelet"