mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-24 20:24:09 +00:00
Merge pull request #101068 from BinacsLee/binacs-apiserver-remove-useless-code-logic
code cleanup: apiserver remove useless code logic
This commit is contained in:
commit
e640a01219
@ -724,7 +724,6 @@ func getServiceIPAndRanges(serviceClusterIPRanges string) (net.IP, net.IPNet, ne
|
|||||||
return apiServerServiceIP, primaryServiceIPRange, net.IPNet{}, nil
|
return apiServerServiceIP, primaryServiceIPRange, net.IPNet{}, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
if len(serviceClusterIPRangeList) > 0 {
|
|
||||||
_, primaryServiceClusterCIDR, err := net.ParseCIDR(serviceClusterIPRangeList[0])
|
_, primaryServiceClusterCIDR, err := net.ParseCIDR(serviceClusterIPRangeList[0])
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return net.IP{}, net.IPNet{}, net.IPNet{}, fmt.Errorf("service-cluster-ip-range[0] is not a valid cidr")
|
return net.IP{}, net.IPNet{}, net.IPNet{}, fmt.Errorf("service-cluster-ip-range[0] is not a valid cidr")
|
||||||
@ -734,7 +733,6 @@ func getServiceIPAndRanges(serviceClusterIPRanges string) (net.IP, net.IPNet, ne
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return net.IP{}, net.IPNet{}, net.IPNet{}, fmt.Errorf("error determining service IP ranges for primary service cidr: %v", err)
|
return net.IP{}, net.IPNet{}, net.IPNet{}, fmt.Errorf("error determining service IP ranges for primary service cidr: %v", err)
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
// user provided at least two entries
|
// user provided at least two entries
|
||||||
// note: validation asserts that the list is max of two dual stack entries
|
// note: validation asserts that the list is max of two dual stack entries
|
||||||
|
Loading…
Reference in New Issue
Block a user