@@ -23,10 +23,8 @@ import (
23
23
)
24
24
25
25
const (
26
- ipv4NetMaskBits = 32
27
- ipv4DefaultRoute = "0.0.0.0/0"
28
- ipv6NetMaskBits = 128
29
- ipv6DefaultRoute = "::/0"
26
+ ipv4NetMaskBits = 32
27
+ ipv6NetMaskBits = 128
30
28
31
29
// TODO: it's bad to rely on eth0 here. While this is inside the container's namespace and is determined by the
32
30
// container runtime and so far we've been able to count on this being reliably set to eth0, it is possible that
@@ -498,10 +496,10 @@ func (ln *linuxNetworking) setupPolicyRoutingForDSR(setupIPv4, setupIPv6 bool) e
498
496
499
497
if setupIPv4 {
500
498
nFamily := netlink .FAMILY_V4
501
- _ , defaultRouteCIDR , err := net . ParseCIDR ( ipv4DefaultRoute )
502
- if err ! = nil {
499
+ defaultRouteCIDR := utils . GetDefaultIPv4Route ( )
500
+ if defaultRouteCIDR = = nil {
503
501
return fmt .Errorf ("failed to parse default (%s) route (this is statically defined, so if you see this " +
504
- "error please report because something has gone very wrong) due to: %v " , ipv4DefaultRoute , err )
502
+ "error please report because something has gone very wrong)" , defaultRouteCIDR )
505
503
}
506
504
nRoute := & netlink.Route {
507
505
Family : nFamily ,
@@ -520,10 +518,10 @@ func (ln *linuxNetworking) setupPolicyRoutingForDSR(setupIPv4, setupIPv6 bool) e
520
518
521
519
if setupIPv6 {
522
520
nFamily := netlink .FAMILY_V6
523
- _ , defaultRouteCIDR , err := net . ParseCIDR ( ipv6DefaultRoute )
524
- if err ! = nil {
521
+ defaultRouteCIDR := utils . GetDefaultIPv6Route ( )
522
+ if defaultRouteCIDR = = nil {
525
523
return fmt .Errorf ("failed to parse default (%s) route (this is statically defined, so if you see this " +
526
- "error please report because something has gone very wrong) due to: %v " , ipv6DefaultRoute , err )
524
+ "error please report because something has gone very wrong)" , defaultRouteCIDR )
527
525
}
528
526
nRoute := & netlink.Route {
529
527
Family : nFamily ,
@@ -556,14 +554,14 @@ func (ln *linuxNetworking) setupRoutesForExternalIPForDSR(serviceInfoMap service
556
554
557
555
setupIPRulesAndRoutes := func (isIPv6 bool ) error {
558
556
nFamily := netlink .FAMILY_V4
559
- _ , defaultPrefixCIDR , err := net . ParseCIDR ( ipv4DefaultRoute )
557
+ defaultPrefixCIDR := utils . GetDefaultIPv4Route ( )
560
558
if isIPv6 {
561
559
nFamily = netlink .FAMILY_V6
562
- _ , defaultPrefixCIDR , err = net . ParseCIDR ( ipv6DefaultRoute )
560
+ defaultPrefixCIDR = utils . GetDefaultIPv6Route ( )
563
561
}
564
- if err ! = nil {
565
- return fmt .Errorf ("failed to parse default route (this is statically defined, so if you see this " +
566
- "error please report because something has gone very wrong) due to: %v" , err )
562
+ if defaultPrefixCIDR = = nil {
563
+ return fmt .Errorf ("failed to parse default route (this is statically defined, so if you see this " +
564
+ "error please report because something has gone very wrong)" )
567
565
}
568
566
569
567
nRule := netlink .NewRule ()
0 commit comments