Merge "Configure kube-proxy cluster-cidr for calico."