From 45b92085c4d89cf8649a7981dff6d5af3e023f2f Mon Sep 17 00:00:00 2001 From: Mike Danese Date: Fri, 7 Oct 2016 12:27:03 -0700 Subject: [PATCH] kubeadm: still run cm if not pod cidr is specified --- cmd/kubeadm/app/master/manifests.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/cmd/kubeadm/app/master/manifests.go b/cmd/kubeadm/app/master/manifests.go index c053b25477c..91640af9b49 100644 --- a/cmd/kubeadm/app/master/manifests.go +++ b/cmd/kubeadm/app/master/manifests.go @@ -296,7 +296,9 @@ func getComponentCommand(component string, s *kubeadmapi.MasterConfiguration) (c } // Let the controller-manager allocate Node CIDRs for the Pod network. // Each node will get a subspace of the address CIDR provided with --pod-network-cidr. - command = append(command, "--allocate-node-cidrs=true", "--cluster-cidr="+s.Networking.PodSubnet) + if s.Networking.PodSubnet != "" { + command = append(command, "--allocate-node-cidrs=true", "--cluster-cidr="+s.Networking.PodSubnet) + } } return