Merge pull request #34352 from mikedanese/fix-cm

Automatic merge from submit-queue kubeadm: still run cm if not pod cidr is specified @kubernetes/sig-cluster-lifecycle

Merge pull request #34352 from mikedanese/fix-cm
7746cb91 · Kubernetes Submit Queue · GitHub · 0603af42 · 45b92085 · 7746cb91
Commit 7746cb91 authored Oct 08, 2016 by Kubernetes Submit Queue Committed by GitHub Oct 08, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

manifests.go cmd/kubeadm/app/master/manifests.go +3 -1

No files found.
--- 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