From 2ee3ce510cf26d5eb400fac118aeeec5c20ed83f Mon Sep 17 00:00:00 2001 From: Kazuyoshi Kato Date: Thu, 16 Dec 2021 22:35:57 +0000 Subject: [PATCH] Use insecure.NewCredentials instead of grpc.WithInsecure grpc.WithInsecure is being deprecated. Signed-off-by: Kazuyoshi Kato --- client.go | 3 ++- cmd/containerd/command/publish.go | 3 ++- integration/main_test.go | 6 +++++- integration/remote/remote_image.go | 7 ++++++- integration/remote/remote_runtime.go | 7 ++++++- services/server/server.go | 3 ++- tracing/plugin/otlp.go | 3 ++- 7 files changed, 25 insertions(+), 7 deletions(-) diff --git a/client.go b/client.go index 44144d2fb..c6e47d2a2 100644 --- a/client.go +++ b/client.go @@ -66,6 +66,7 @@ import ( "golang.org/x/sync/semaphore" "google.golang.org/grpc" "google.golang.org/grpc/backoff" + "google.golang.org/grpc/credentials/insecure" "google.golang.org/grpc/health/grpc_health_v1" ) @@ -119,7 +120,7 @@ func New(address string, opts ...ClientOpt) (*Client, error) { } gopts := []grpc.DialOption{ grpc.WithBlock(), - grpc.WithInsecure(), + grpc.WithTransportCredentials(insecure.NewCredentials()), grpc.FailOnNonTempDialError(true), grpc.WithConnectParams(connParams), grpc.WithContextDialer(dialer.ContextDialer), diff --git a/cmd/containerd/command/publish.go b/cmd/containerd/command/publish.go index 02ceecb0d..efe0ad7c8 100644 --- a/cmd/containerd/command/publish.go +++ b/cmd/containerd/command/publish.go @@ -32,6 +32,7 @@ import ( "github.com/urfave/cli" "google.golang.org/grpc" "google.golang.org/grpc/backoff" + "google.golang.org/grpc/credentials/insecure" ) var publishCommand = cli.Command{ @@ -99,7 +100,7 @@ func connect(address string, d func(gocontext.Context, string) (net.Conn, error) } gopts := []grpc.DialOption{ grpc.WithBlock(), - grpc.WithInsecure(), + grpc.WithTransportCredentials(insecure.NewCredentials()), grpc.WithContextDialer(d), grpc.FailOnNonTempDialError(true), grpc.WithConnectParams(connParams), diff --git a/integration/main_test.go b/integration/main_test.go index ce395168e..c29abad89 100644 --- a/integration/main_test.go +++ b/integration/main_test.go @@ -43,6 +43,7 @@ import ( "github.com/stretchr/testify/require" exec "golang.org/x/sys/execabs" "google.golang.org/grpc" + "google.golang.org/grpc/credentials/insecure" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" ) @@ -405,7 +406,10 @@ func RawRuntimeClient() (runtime.RuntimeServiceClient, error) { } ctx, cancel := context.WithTimeout(context.Background(), timeout) defer cancel() - conn, err := grpc.DialContext(ctx, addr, grpc.WithInsecure(), grpc.WithContextDialer(dialer)) + conn, err := grpc.DialContext(ctx, addr, + grpc.WithTransportCredentials(insecure.NewCredentials()), + grpc.WithContextDialer(dialer), + ) if err != nil { return nil, errors.Wrap(err, "failed to connect cri endpoint") } diff --git a/integration/remote/remote_image.go b/integration/remote/remote_image.go index a722d41ce..16088a9e4 100644 --- a/integration/remote/remote_image.go +++ b/integration/remote/remote_image.go @@ -39,6 +39,7 @@ import ( "time" "google.golang.org/grpc" + "google.golang.org/grpc/credentials/insecure" "k8s.io/klog/v2" internalapi "github.com/containerd/containerd/integration/cri-api/pkg/apis" @@ -64,7 +65,11 @@ func NewImageService(endpoint string, connectionTimeout time.Duration) (internal ctx, cancel := context.WithTimeout(context.Background(), connectionTimeout) defer cancel() - conn, err := grpc.DialContext(ctx, addr, grpc.WithInsecure(), grpc.WithContextDialer(dialer), grpc.WithDefaultCallOptions(grpc.MaxCallRecvMsgSize(maxMsgSize))) + conn, err := grpc.DialContext(ctx, addr, + grpc.WithTransportCredentials(insecure.NewCredentials()), + grpc.WithContextDialer(dialer), + grpc.WithDefaultCallOptions(grpc.MaxCallRecvMsgSize(maxMsgSize)), + ) if err != nil { klog.Errorf("Connect remote image service %s failed: %v", addr, err) return nil, err diff --git a/integration/remote/remote_runtime.go b/integration/remote/remote_runtime.go index d9bd813be..b172b949a 100644 --- a/integration/remote/remote_runtime.go +++ b/integration/remote/remote_runtime.go @@ -40,6 +40,7 @@ import ( "time" "google.golang.org/grpc" + "google.golang.org/grpc/credentials/insecure" "k8s.io/klog/v2" internalapi "github.com/containerd/containerd/integration/cri-api/pkg/apis" @@ -73,7 +74,11 @@ func NewRuntimeService(endpoint string, connectionTimeout time.Duration) (intern ctx, cancel := context.WithTimeout(context.Background(), connectionTimeout) defer cancel() - conn, err := grpc.DialContext(ctx, addr, grpc.WithInsecure(), grpc.WithContextDialer(dialer), grpc.WithDefaultCallOptions(grpc.MaxCallRecvMsgSize(maxMsgSize))) + conn, err := grpc.DialContext(ctx, addr, + grpc.WithTransportCredentials(insecure.NewCredentials()), + grpc.WithContextDialer(dialer), + grpc.WithDefaultCallOptions(grpc.MaxCallRecvMsgSize(maxMsgSize)), + ) if err != nil { klog.Errorf("Connect remote runtime %s failed: %v", addr, err) return nil, err diff --git a/services/server/server.go b/services/server/server.go index d001c5066..d56c41764 100644 --- a/services/server/server.go +++ b/services/server/server.go @@ -59,6 +59,7 @@ import ( "google.golang.org/grpc" "google.golang.org/grpc/backoff" "google.golang.org/grpc/credentials" + "google.golang.org/grpc/credentials/insecure" ) const ( @@ -548,7 +549,7 @@ func (pc *proxyClients) getClient(address string) (*grpc.ClientConn, error) { Backoff: backoffConfig, } gopts := []grpc.DialOption{ - grpc.WithInsecure(), + grpc.WithTransportCredentials(insecure.NewCredentials()), grpc.WithConnectParams(connParams), grpc.WithContextDialer(dialer.ContextDialer), diff --git a/tracing/plugin/otlp.go b/tracing/plugin/otlp.go index bc52115b7..e95a78b6b 100644 --- a/tracing/plugin/otlp.go +++ b/tracing/plugin/otlp.go @@ -29,6 +29,7 @@ import ( sdktrace "go.opentelemetry.io/otel/sdk/trace" semconv "go.opentelemetry.io/otel/semconv/v1.4.0" "google.golang.org/grpc" + "google.golang.org/grpc/credentials/insecure" ) const exporterPlugin = "otlp" @@ -45,7 +46,7 @@ func init() { } dialOpts := []grpc.DialOption{grpc.WithBlock()} if cfg.Insecure { - dialOpts = append(dialOpts, grpc.WithInsecure()) + dialOpts = append(dialOpts, grpc.WithTransportCredentials(insecure.NewCredentials())) } exp, err := otlptracegrpc.New(ic.Context,