Skip to content

K
k3s
Commit 7746cb91 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

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
parents 0603af42 45b92085
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 1 deletion
cmd/kubeadm/app/master/manifests.go
View file @ 7746cb91
...@@ -296,7 +296,9 @@ func getComponentCommand(component string, s *kubeadmapi.MasterConfiguration) (c ...@@ -296,7 +296,9 @@ func getComponentCommand(component string, s *kubeadmapi.MasterConfiguration) (c
} }
// Let the controller-manager allocate Node CIDRs for the Pod network. // 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. // 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 return
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment