Use the standard context library

Signed-off-by: manuelbuil <[email protected]>
flannel-io · Nov 20, 2024 · 122ad6d · 122ad6d
1 parent 0e99f63
commit 122ad6d
Show file tree

Hide file tree

Showing 32 changed files with 52 additions and 48 deletions.
diff --git a/main.go b/main.go
@@ -15,6 +15,7 @@
 package main
 
 import (
+	"context"
 	"errors"
 	"flag"
 	"fmt"
@@ -40,10 +41,8 @@ import (
 	"github.com/flannel-io/flannel/pkg/trafficmngr/iptables"
 	"github.com/flannel-io/flannel/pkg/trafficmngr/nftables"
 	"github.com/flannel-io/flannel/pkg/version"
-	"golang.org/x/net/context"
-	log "k8s.io/klog/v2"
-
 	"github.com/joho/godotenv"
+	log "k8s.io/klog/v2"
 
 	// Backends need to be imported for their init() to get executed and them to register
 	"github.com/coreos/go-systemd/v22/daemon"
@@ -508,7 +507,8 @@ func mustRunHealthz(stopChan <-chan struct{}, wg *sync.WaitGroup) {
 		<-stopChan
 
 		// create new context with timeout for http server to shutdown gracefully
-		ctx, _ := context.WithTimeout(context.Background(), 3*time.Second)
+		ctx, cancel := context.WithTimeout(context.Background(), 3*time.Second)
+		defer cancel()
 		if err := server.Shutdown(ctx); err != nil {
 			log.Errorf("Shutdown healthz server error. %v", err)
 		}

diff --git a/pkg/backend/alloc/alloc.go b/pkg/backend/alloc/alloc.go
@@ -18,11 +18,12 @@ import (
 	"fmt"
 	"sync"
 
+	"context"
+
 	"github.com/flannel-io/flannel/pkg/backend"
 	"github.com/flannel-io/flannel/pkg/ip"
 	"github.com/flannel-io/flannel/pkg/lease"
 	"github.com/flannel-io/flannel/pkg/subnet"
-	"golang.org/x/net/context"
 )
 
 func init() {

diff --git a/pkg/backend/common.go b/pkg/backend/common.go
@@ -15,12 +15,12 @@
 package backend
 
 import (
+	"context"
 	"net"
 	"sync"
 
 	"github.com/flannel-io/flannel/pkg/lease"
 	"github.com/flannel-io/flannel/pkg/subnet"
-	"golang.org/x/net/context"
 )
 
 type ExternalInterface struct {

diff --git a/pkg/backend/extension/extension.go b/pkg/backend/extension/extension.go
@@ -15,20 +15,19 @@
 package extension
 
 import (
+	"context"
+	"encoding/json"
 	"fmt"
 	"io"
 	"os"
-	"strings"
-
-	"encoding/json"
 	"os/exec"
+	"strings"
 	"sync"
 
 	"github.com/flannel-io/flannel/pkg/backend"
 	"github.com/flannel-io/flannel/pkg/ip"
 	"github.com/flannel-io/flannel/pkg/lease"
 	"github.com/flannel-io/flannel/pkg/subnet"
-	"golang.org/x/net/context"
 	log "k8s.io/klog/v2"
 )
 

diff --git a/pkg/backend/extension/extension_network.go b/pkg/backend/extension/extension_network.go
@@ -15,12 +15,10 @@
 package extension
 
 import (
+	"context"
 	"encoding/json"
-	"sync"
-
-	"golang.org/x/net/context"
-
 	"fmt"
+	"sync"
 
 	"github.com/flannel-io/flannel/pkg/backend"
 	"github.com/flannel-io/flannel/pkg/lease"

diff --git a/pkg/backend/hostgw/hostgw.go b/pkg/backend/hostgw/hostgw.go
@@ -18,6 +18,7 @@
 package hostgw
 
 import (
+	"context"
 	"fmt"
 	"sync"
 
@@ -26,7 +27,6 @@ import (
 	"github.com/flannel-io/flannel/pkg/lease"
 	"github.com/flannel-io/flannel/pkg/subnet"
 	"github.com/vishvananda/netlink"
-	"golang.org/x/net/context"
 )
 
 func init() {

diff --git a/pkg/backend/hostgw/hostgw_windows.go b/pkg/backend/hostgw/hostgw_windows.go
@@ -15,6 +15,7 @@
 package hostgw
 
 import (
+	"context"
 	"fmt"
 	"strings"
 	"sync"
@@ -27,7 +28,6 @@ import (
 	"github.com/flannel-io/flannel/pkg/routing"
 	"github.com/flannel-io/flannel/pkg/subnet"
 	"github.com/pkg/errors"
-	"golang.org/x/net/context"
 	"k8s.io/apimachinery/pkg/util/json"
 	"k8s.io/apimachinery/pkg/util/wait"
 	log "k8s.io/klog/v2"

diff --git a/pkg/backend/ipip/ipip.go b/pkg/backend/ipip/ipip.go
@@ -18,6 +18,7 @@
 package ipip
 
 import (
+	"context"
 	"encoding/json"
 	"fmt"
 	"sync"
@@ -28,7 +29,6 @@ import (
 	"github.com/flannel-io/flannel/pkg/lease"
 	"github.com/flannel-io/flannel/pkg/subnet"
 	"github.com/vishvananda/netlink"
-	"golang.org/x/net/context"
 	log "k8s.io/klog/v2"
 )
 

diff --git a/pkg/backend/ipsec/handle_charon.go b/pkg/backend/ipsec/handle_charon.go
@@ -17,6 +17,7 @@
 package ipsec
 
 import (
+	"context"
 	"fmt"
 	"net"
 	"os"
@@ -28,7 +29,6 @@ import (
 
 	"github.com/bronze1man/goStrongswanVici"
 	"github.com/flannel-io/flannel/pkg/lease"
-	"golang.org/x/net/context"
 	log "k8s.io/klog/v2"
 )
 

diff --git a/pkg/backend/ipsec/ipsec.go b/pkg/backend/ipsec/ipsec.go
@@ -17,12 +17,11 @@
 package ipsec
 
 import (
+	"context"
 	"encoding/json"
 	"fmt"
 	"sync"
 
-	"golang.org/x/net/context"
-
 	"github.com/flannel-io/flannel/pkg/backend"
 	"github.com/flannel-io/flannel/pkg/ip"
 	"github.com/flannel-io/flannel/pkg/lease"

diff --git a/pkg/backend/ipsec/ipsec_network.go b/pkg/backend/ipsec/ipsec_network.go
@@ -17,6 +17,7 @@
 package ipsec
 
 import (
+	"context"
 	"fmt"
 	"net"
 	"strconv"
@@ -26,7 +27,6 @@ import (
 	"github.com/flannel-io/flannel/pkg/lease"
 	"github.com/flannel-io/flannel/pkg/subnet"
 	"github.com/vishvananda/netlink"
-	"golang.org/x/net/context"
 	log "k8s.io/klog/v2"
 )
 

diff --git a/pkg/backend/manager.go b/pkg/backend/manager.go
@@ -15,12 +15,12 @@
 package backend
 
 import (
+	"context"
 	"fmt"
 	"strings"
 	"sync"
 
 	"github.com/flannel-io/flannel/pkg/subnet"
-	"golang.org/x/net/context"
 )
 
 var constructors = make(map[string]BackendCtor)

diff --git a/pkg/backend/route_network.go b/pkg/backend/route_network.go
@@ -19,14 +19,14 @@ package backend
 
 import (
 	"bytes"
+	"context"
 	"net"
 	"sync"
 	"time"
 
 	"github.com/flannel-io/flannel/pkg/lease"
 	"github.com/flannel-io/flannel/pkg/subnet"
 	"github.com/vishvananda/netlink"
-	"golang.org/x/net/context"
 	log "k8s.io/klog/v2"
 )
 

diff --git a/pkg/backend/route_network_windows.go b/pkg/backend/route_network_windows.go
@@ -15,14 +15,14 @@
 package backend
 
 import (
+	"context"
 	"strings"
 	"sync"
 	"time"
 
 	"github.com/flannel-io/flannel/pkg/lease"
 	"github.com/flannel-io/flannel/pkg/routing"
 	"github.com/flannel-io/flannel/pkg/subnet"
-	"golang.org/x/net/context"
 	log "k8s.io/klog/v2"
 )
 

diff --git a/pkg/backend/simple_network.go b/pkg/backend/simple_network.go
@@ -15,8 +15,9 @@
 package backend
 
 import (
+	"context"
+
 	"github.com/flannel-io/flannel/pkg/lease"
-	"golang.org/x/net/context"
 )
 
 type SimpleNetwork struct {

diff --git a/pkg/backend/tencentvpc/tencentvpc.go b/pkg/backend/tencentvpc/tencentvpc.go
@@ -17,6 +17,7 @@
 package tencentvpc
 
 import (
+	"context"
 	"encoding/json"
 	"fmt"
 	"io"
@@ -31,7 +32,6 @@ import (
 	"github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common"
 	"github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/errors"
 	vpc "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vpc/v20170312"
-	"golang.org/x/net/context"
 	log "k8s.io/klog/v2"
 )
 

diff --git a/pkg/backend/udp/udp_amd64.go b/pkg/backend/udp/udp_amd64.go
@@ -17,6 +17,7 @@
 package udp
 
 import (
+	"context"
 	"encoding/json"
 	"fmt"
 	"sync"
@@ -25,7 +26,6 @@ import (
 	"github.com/flannel-io/flannel/pkg/ip"
 	"github.com/flannel-io/flannel/pkg/lease"
 	"github.com/flannel-io/flannel/pkg/subnet"
-	"golang.org/x/net/context"
 )
 
 func init() {

diff --git a/pkg/backend/udp/udp_network_amd64.go b/pkg/backend/udp/udp_network_amd64.go
@@ -18,6 +18,7 @@
 package udp
 
 import (
+	"context"
 	"fmt"
 	"net"
 	"os"
@@ -29,7 +30,6 @@ import (
 	"github.com/flannel-io/flannel/pkg/lease"
 	"github.com/flannel-io/flannel/pkg/subnet"
 	"github.com/vishvananda/netlink"
-	"golang.org/x/net/context"
 	log "k8s.io/klog/v2"
 )
 

diff --git a/pkg/backend/vxlan/vxlan.go b/pkg/backend/vxlan/vxlan.go
@@ -54,6 +54,7 @@ package vxlan
 // this is called "directRouting"
 
 import (
+	"context"
 	"encoding/json"
 	"fmt"
 	"net"
@@ -63,7 +64,6 @@ import (
 	"github.com/flannel-io/flannel/pkg/ip"
 	"github.com/flannel-io/flannel/pkg/lease"
 	"github.com/flannel-io/flannel/pkg/subnet"
-	"golang.org/x/net/context"
 	log "k8s.io/klog/v2"
 )
 

diff --git a/pkg/backend/vxlan/vxlan_network.go b/pkg/backend/vxlan/vxlan_network.go
@@ -17,6 +17,7 @@
 package vxlan
 
 import (
+	"context"
 	"encoding/json"
 	"net"
 	"sync"
@@ -28,7 +29,6 @@ import (
 	"github.com/flannel-io/flannel/pkg/retry"
 	"github.com/flannel-io/flannel/pkg/subnet"
 	"github.com/vishvananda/netlink"
-	"golang.org/x/net/context"
 	log "k8s.io/klog/v2"
 )
 

diff --git a/pkg/backend/vxlan/vxlan_network_windows.go b/pkg/backend/vxlan/vxlan_network_windows.go
@@ -15,6 +15,7 @@
 package vxlan
 
 import (
+	"context"
 	"encoding/json"
 	"net"
 	"strings"
@@ -25,7 +26,6 @@ import (
 	"github.com/flannel-io/flannel/pkg/ip"
 	"github.com/flannel-io/flannel/pkg/lease"
 	"github.com/flannel-io/flannel/pkg/subnet"
-	"golang.org/x/net/context"
 	log "k8s.io/klog/v2"
 )
 

diff --git a/pkg/backend/vxlan/vxlan_windows.go b/pkg/backend/vxlan/vxlan_windows.go
@@ -22,8 +22,10 @@ package vxlan
 // In this scheme the scaling of table entries (per host) is:
 //  - 1 network entry for the overlay network
 //  - 1 endpoint per local container
-//  - N remote endpoints remote node (total endpoints =
+//  - N remote endpoints remote node (total endpoints = N * number of remote nodes)
+
 import (
+	"context"
 	"encoding/json"
 	"errors"
 	"fmt"
@@ -35,7 +37,6 @@ import (
 	"github.com/flannel-io/flannel/pkg/ip"
 	"github.com/flannel-io/flannel/pkg/lease"
 	"github.com/flannel-io/flannel/pkg/subnet"
-	"golang.org/x/net/context"
 	log "k8s.io/klog/v2"
 )
 

diff --git a/pkg/backend/wireguard/device.go b/pkg/backend/wireguard/device.go
@@ -17,6 +17,7 @@
 package wireguard
 
 import (
+	"context"
 	"errors"
 	"fmt"
 	"net"
@@ -28,7 +29,6 @@ import (
 
 	"github.com/flannel-io/flannel/pkg/ip"
 	"github.com/vishvananda/netlink"
-	"golang.org/x/net/context"
 	"golang.zx2c4.com/wireguard/wgctrl"
 	"golang.zx2c4.com/wireguard/wgctrl/wgtypes"
 	log "k8s.io/klog/v2"

diff --git a/pkg/backend/wireguard/wireguard.go b/pkg/backend/wireguard/wireguard.go
@@ -17,6 +17,7 @@
 package wireguard
 
 import (
+	"context"
 	"encoding/json"
 	"fmt"
 	"net"
@@ -27,7 +28,6 @@ import (
 	"github.com/flannel-io/flannel/pkg/ip"
 	"github.com/flannel-io/flannel/pkg/lease"
 	"github.com/flannel-io/flannel/pkg/subnet"
-	"golang.org/x/net/context"
 )
 
 type Mode string