github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #81668 from darshanime/remove_default_service_cidr

Browse Source 
Deprecate default service IP CIDR
This commit is contained in:
Kubernetes Prow Robot
2019-09-10 14:31:45 -07:00
committed by GitHub
parent 60bc301889 70e74545a8
commit 1d016cc1d3
5 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
cmd/kube-apiserver/app/options/options.go
View File

@@ -120,7 +120,6 @@ func NewServerRunOptions() *ServerRunOptions {
}, },
ServiceNodePortRange: kubeoptions.DefaultServiceNodePortRange, ServiceNodePortRange: kubeoptions.DefaultServiceNodePortRange,
} }
s.ServiceClusterIPRanges = kubeoptions.DefaultServiceIPCIDR.String()
// Overwrite the default for storage data format. // Overwrite the default for storage data format.
s.Etcd.DefaultStorageMediaType = "application/vnd.kubernetes.protobuf" s.Etcd.DefaultStorageMediaType = "application/vnd.kubernetes.protobuf"

3
cmd/kube-apiserver/app/options/options_test.go
View File

@@ -112,13 +112,14 @@ func TestAddFlags(t *testing.T) {
"--proxy-client-key-file=/var/run/kubernetes/proxy.key", "--proxy-client-key-file=/var/run/kubernetes/proxy.key",
"--request-timeout=2m", "--request-timeout=2m",
"--storage-backend=etcd3", "--storage-backend=etcd3",
"--service-cluster-ip-range=192.168.128.0/17",
} }
fs.Parse(args) fs.Parse(args)
// This is a snapshot of expected options parsed by args. // This is a snapshot of expected options parsed by args.
expected := &ServerRunOptions{ expected := &ServerRunOptions{
ServiceNodePortRange: kubeoptions.DefaultServiceNodePortRange, ServiceNodePortRange: kubeoptions.DefaultServiceNodePortRange,
ServiceClusterIPRanges: kubeoptions.DefaultServiceIPCIDR.String(), ServiceClusterIPRanges: (&net.IPNet{IP: net.ParseIP("192.168.128.0"), Mask: net.CIDRMask(17, 32)}).String(),
MasterCount: 5, MasterCount: 5,
EndpointReconcilerType: string(reconcilers.LeaseEndpointReconcilerType), EndpointReconcilerType: string(reconcilers.LeaseEndpointReconcilerType),
AllowPrivileged: false, AllowPrivileged: false,

8
cmd/kube-apiserver/app/server.go
View File

@@ -306,7 +306,7 @@ func CreateKubeAPIServerConfig(
PerConnectionBandwidthLimitBytesPerSec: s.MaxConnectionBytesPerSec, PerConnectionBandwidthLimitBytesPerSec: s.MaxConnectionBytesPerSec,
}) })
serviceIPRange, apiServerServiceIP, lastErr := master.DefaultServiceIPRange(s.PrimaryServiceClusterIPRange) serviceIPRange, apiServerServiceIP, lastErr := master.ServiceIPRange(s.PrimaryServiceClusterIPRange)
if lastErr != nil { if lastErr != nil {
return return
} }
@@ -315,7 +315,7 @@ func CreateKubeAPIServerConfig(
var secondaryServiceIPRange net.IPNet var secondaryServiceIPRange net.IPNet
// process secondary range only if provided by user // process secondary range only if provided by user
if s.SecondaryServiceClusterIPRange.IP != nil { if s.SecondaryServiceClusterIPRange.IP != nil {
secondaryServiceIPRange, _, lastErr = master.DefaultServiceIPRange(s.SecondaryServiceClusterIPRange) secondaryServiceIPRange, _, lastErr = master.ServiceIPRange(s.SecondaryServiceClusterIPRange)
if lastErr != nil { if lastErr != nil {
return return
} }
@@ -575,7 +575,7 @@ func Complete(s *options.ServerRunOptions) (completedServerRunOptions, error) {
// nothing provided by user, use default range (only applies to the Primary) // nothing provided by user, use default range (only applies to the Primary)
if len(serviceClusterIPRangeList) == 0 { if len(serviceClusterIPRangeList) == 0 {
var primaryServiceClusterCIDR net.IPNet var primaryServiceClusterCIDR net.IPNet
serviceIPRange, apiServerServiceIP, err = master.DefaultServiceIPRange(primaryServiceClusterCIDR) serviceIPRange, apiServerServiceIP, err = master.ServiceIPRange(primaryServiceClusterCIDR)
if err != nil { if err != nil {
return options, fmt.Errorf("error determining service IP ranges: %v", err) return options, fmt.Errorf("error determining service IP ranges: %v", err)
} }
@@ -588,7 +588,7 @@ func Complete(s *options.ServerRunOptions) (completedServerRunOptions, error) {
return options, fmt.Errorf("service-cluster-ip-range[0] is not a valid cidr") return options, fmt.Errorf("service-cluster-ip-range[0] is not a valid cidr")
} }
serviceIPRange, apiServerServiceIP, err = master.DefaultServiceIPRange(*(primaryServiceClusterCIDR)) serviceIPRange, apiServerServiceIP, err = master.ServiceIPRange(*(primaryServiceClusterCIDR))
if err != nil { if err != nil {
return options, fmt.Errorf("error determining service IP ranges for primary service cidr: %v", err) return options, fmt.Errorf("error determining service IP ranges for primary service cidr: %v", err)
} }

2
pkg/master/master.go
View File

@@ -278,7 +278,7 @@ func (cfg *Config) Complete() CompletedConfig {
&cfg.ExtraConfig, &cfg.ExtraConfig,
} }
serviceIPRange, apiServerServiceIP, err := DefaultServiceIPRange(c.ExtraConfig.ServiceIPRange) serviceIPRange, apiServerServiceIP, err := ServiceIPRange(c.ExtraConfig.ServiceIPRange)
if err != nil { if err != nil {
klog.Fatalf("Error determining service IP ranges: %v", err) klog.Fatalf("Error determining service IP ranges: %v", err)
} }

10
pkg/master/services.go
View File

@@ -25,12 +25,14 @@ import (
"k8s.io/kubernetes/pkg/registry/core/service/ipallocator" "k8s.io/kubernetes/pkg/registry/core/service/ipallocator"
) )
// DefaultServiceIPRange takes a the serviceIPRange flag and returns the defaulted service ip range (if needed), // ServiceIPRange checks if the serviceClusterIPRange flag is nil, raising a warning if so and
// api server service IP, and an error // setting service ip range to the default value in kubeoptions.DefaultServiceIPCIDR
func DefaultServiceIPRange(passedServiceClusterIPRange net.IPNet) (net.IPNet, net.IP, error) { // for now until the default is removed per the deprecation timeline guidelines.
// Returns service ip range, api server service IP, and an error
func ServiceIPRange(passedServiceClusterIPRange net.IPNet) (net.IPNet, net.IP, error) {
serviceClusterIPRange := passedServiceClusterIPRange serviceClusterIPRange := passedServiceClusterIPRange
if passedServiceClusterIPRange.IP == nil { if passedServiceClusterIPRange.IP == nil {
klog.Infof("Network range for service cluster IPs is unspecified. Defaulting to %v.", kubeoptions.DefaultServiceIPCIDR) klog.Warningf("No CIDR for service cluster IPs specified. Default value which was %s is deprecated and will be removed in future releases. Please specify it using --service-cluster-ip-range on kube-apiserver.", kubeoptions.DefaultServiceIPCIDR.String())
serviceClusterIPRange = kubeoptions.DefaultServiceIPCIDR serviceClusterIPRange = kubeoptions.DefaultServiceIPCIDR
} }
if size := ipallocator.RangeSize(&serviceClusterIPRange); size < 8 { if size := ipallocator.RangeSize(&serviceClusterIPRange); size < 8 {