add flag to kubelet to ignore the cidr passed down by the apiserver on the master

2015-09-15 21:53:33 -07:00
parent 219294623e
commit fa60bbe8e6
5 changed files with 55 additions and 23 deletions
--- a/contrib/mesos/pkg/executor/service/service.go
+++ b/contrib/mesos/pkg/executor/service/service.go
@@ -322,6 +322,7 @@ func (ks *KubeletExecutorServer) createAndInitKubelet(
 		gcPolicy,
 		pc.SeenAllSources,
 		kc.RegisterNode,
+		kc.RegisterSchedulable,
 		kc.StandaloneMode,
 		kc.ClusterDomain,
 		net.IP(kc.ClusterDNS),
@@ -348,6 +349,7 @@ func (ks *KubeletExecutorServer) createAndInitKubelet(
 		kc.SystemContainer,
 		kc.ConfigureCBR0,
 		kc.PodCIDR,
+		kc.ReconcileCIDR,
 		kc.MaxPods,
 		kc.DockerExecHandler,
 		kc.ResolverConfig,