Commit 280b66c9 authored by Robert Bailey's avatar Robert Bailey

Merge pull request #12841 from wb14123/ip-range

Enforce specified service-cluster-ip-range is not too large
parents 60e17a54 0547c52c
...@@ -227,6 +227,10 @@ func (s *APIServer) verifyClusterIPFlags() { ...@@ -227,6 +227,10 @@ func (s *APIServer) verifyClusterIPFlags() {
if s.ServiceClusterIPRange.IP == nil { if s.ServiceClusterIPRange.IP == nil {
glog.Fatal("No --service-cluster-ip-range specified") glog.Fatal("No --service-cluster-ip-range specified")
} }
var ones, bits = s.ServiceClusterIPRange.Mask.Size()
if bits-ones > 20 {
glog.Fatal("Specified --service-cluster-ip-range is too large")
}
} }
func newEtcd(etcdConfigFile string, etcdServerList []string, interfacesFunc meta.VersionInterfacesFunc, defaultVersion, storageVersion, pathPrefix string) (etcdStorage storage.Interface, err error) { func newEtcd(etcdConfigFile string, etcdServerList []string, interfacesFunc meta.VersionInterfacesFunc, defaultVersion, storageVersion, pathPrefix string) (etcdStorage storage.Interface, err error) {
......
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