Merge "Fix k8s node addresses in k8s certs"