drop usage of deprecated package/methods

Signed-off-by: Davanum Srinivas <[email protected]> (cherry picked from commit 56e8cf9) Signed-off-by: Kirtana Ashok <[email protected]>
kiashok · Aug 16, 2024 · ba80e0d · ba80e0d
1 parent 88ac0d9
commit ba80e0d
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 2 deletions.
diff --git a/cmd/ncproxy/run.go b/cmd/ncproxy/run.go
@@ -232,8 +232,12 @@ func run(clicontext *cli.Context) error {
 			var cancel context.CancelFunc
 			dialCtx, cancel = context.WithTimeout(ctx, time.Duration(conf.Timeout)*time.Second)
 			defer cancel()
+			//nolint:staticcheck // SA1019: grpc.WithBlock is deprecated
 			opts = append(opts, grpc.WithBlock())
 		}
+
+		// TODO: use grpc.NewClient here instead
+		//nolint:staticcheck // SA1019: grpc.DialContext is deprecated
 		client, err := grpc.DialContext(dialCtx, conf.NodeNetSvcAddr, opts...)
 		if err != nil {
 			return fmt.Errorf("failed to connect to NodeNetworkService at address %s", conf.NodeNetSvcAddr)

diff --git a/internal/tools/networkagent/main.go b/internal/tools/networkagent/main.go
@@ -477,6 +477,8 @@ func main() {
 	signal.Notify(sigChan, os.Interrupt, syscall.SIGTERM)
 	defer signal.Stop(sigChan)
 
+	// TODO: replace with grpc.NewClient
+	//nolint:staticcheck // SA1019: grpc.Dial is deprecated, replace with grpc.NewClient
 	grpcClient, err := grpc.Dial(
 		conf.GRPCAddr,
 		grpc.WithTransportCredentials(insecure.NewCredentials()),

diff --git a/test/cri-containerd/main_test.go b/test/cri-containerd/main_test.go
@@ -162,6 +162,9 @@ func createGRPCConn(ctx context.Context) (*grpc.ClientConn, error) {
 	if err != nil {
 		return nil, err
 	}
+
+	// TODO: use grpc.NewClient here instead
+	//nolint:staticcheck // SA1019: grpc.DialContext is deprecated
 	return grpc.DialContext(ctx, addr,
 		grpc.WithTransportCredentials(insecure.NewCredentials()),
 		grpc.WithContextDialer(dialer))

diff --git a/test/internal/containerd/containerd.go b/test/internal/containerd/containerd.go
@@ -11,12 +11,12 @@ import (
 	"github.com/containerd/containerd"
 	kubeutil "github.com/containerd/containerd/integration/remote/util"
 	"github.com/containerd/containerd/mount"
-	"github.com/containerd/containerd/platforms"
 	"github.com/containerd/containerd/remotes"
 	"github.com/containerd/containerd/remotes/docker"
 	"github.com/containerd/containerd/remotes/docker/config"
 	"github.com/containerd/containerd/snapshots"
 	"github.com/containerd/errdefs"
+	"github.com/containerd/platforms"
 	"github.com/opencontainers/image-spec/identity"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials/insecure"
@@ -34,6 +34,9 @@ func createGRPCConn(ctx context.Context, address string) (*grpc.ClientConn, erro
 	if err != nil {
 		return nil, err
 	}
+
+	// TODO: use grpc.NewClient here instead
+	//nolint:staticcheck // SA1019: grpc.DialContext is deprecated
 	return grpc.DialContext(ctx, addr,
 		grpc.WithTransportCredentials(insecure.NewCredentials()),
 		grpc.WithContextDialer(dialer))

diff --git a/test/pkg/images/constants.go b/test/pkg/images/constants.go
@@ -3,8 +3,8 @@ package images
 import (
 	"fmt"
 
-	"github.com/containerd/containerd/platforms"
 	"github.com/containerd/errdefs"
+	"github.com/containerd/platforms"
 )
 
 const (