github/intel-device-plugins-for-kubernetes
7
0
Fork 0
mirror of https://github.com/intel/intel-device-plugins-for-kubernetes.git synced 2025-06-03 03:59:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

drop deprecated grpc.WithInsecure()

Browse Source 
grpc-go v1.43.0 deprecated grpc.WithInsecure() in favor of
insecure.NewCredentials(). Move to use the recommended approach
and drop the linter annotations.

Signed-off-by: Mikko Ylinen <mikko.ylinen@intel.com>
This commit is contained in:
Mikko Ylinen 2022-04-07 13:39:16 +03:00
parent 7598c0dfd7
commit 2adad5ae76
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/gpu_plugin/rm/gpu_plugin_resource_manager_test.go
View File

@ -22,6 +22,7 @@ import (
"time" "time"
"google.golang.org/grpc" "google.golang.org/grpc"
"google.golang.org/grpc/credentials/insecure"
v1 "k8s.io/api/core/v1" v1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/resource" "k8s.io/apimachinery/pkg/api/resource"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@ -85,8 +86,7 @@ func (w *mockPodResources) GetAllocatableResources(ctx context.Context,
} }
func newMockResourceManager(pods []v1.Pod) ResourceManager { func newMockResourceManager(pods []v1.Pod) ResourceManager {
//nolint: staticcheck client, err := grpc.Dial("", grpc.WithTransportCredentials(insecure.NewCredentials()))
client, err := grpc.Dial("", grpc.WithInsecure())
if err != nil { if err != nil {
os.Exit(1) os.Exit(1)
} }

5
pkg/deviceplugin/server.go
View File

@ -26,6 +26,7 @@ import (
"github.com/fsnotify/fsnotify" "github.com/fsnotify/fsnotify"
"github.com/pkg/errors" "github.com/pkg/errors"
"google.golang.org/grpc" "google.golang.org/grpc"
"google.golang.org/grpc/credentials/insecure"
"k8s.io/klog/v2" "k8s.io/klog/v2"
pluginapi "k8s.io/kubelet/pkg/apis/deviceplugin/v1beta1" pluginapi "k8s.io/kubelet/pkg/apis/deviceplugin/v1beta1"
@ -328,8 +329,8 @@ func watchFile(file string) error {
func (srv *server) registerWithKubelet(kubeletSocket, pluginEndPoint, resourceName string) error { func (srv *server) registerWithKubelet(kubeletSocket, pluginEndPoint, resourceName string) error {
ctx := context.Background() ctx := context.Background()
//nolint: staticcheck conn, err := grpc.DialContext(ctx, kubeletSocket,
conn, err := grpc.DialContext(ctx, kubeletSocket, grpc.WithInsecure(), grpc.WithTransportCredentials(insecure.NewCredentials()),
grpc.WithContextDialer(func(ctx context.Context, addr string) (net.Conn, error) { grpc.WithContextDialer(func(ctx context.Context, addr string) (net.Conn, error) {
return (&net.Dialer{}).DialContext(ctx, "unix", addr) return (&net.Dialer{}).DialContext(ctx, "unix", addr)
})) }))

9
pkg/deviceplugin/server_test.go
View File

@ -27,6 +27,7 @@ import (
"time" "time"
"google.golang.org/grpc" "google.golang.org/grpc"
"google.golang.org/grpc/credentials/insecure"
"google.golang.org/grpc/metadata" "google.golang.org/grpc/metadata"
"k8s.io/klog/v2" "k8s.io/klog/v2"
@ -179,8 +180,8 @@ func TestSetupAndServe(t *testing.T) {
ctx := context.Background() ctx := context.Background()
//nolint: staticcheck conn, err := grpc.DialContext(ctx, pluginSocket,
conn, err := grpc.DialContext(ctx, pluginSocket, grpc.WithInsecure(), grpc.WithTransportCredentials(insecure.NewCredentials()),
grpc.WithContextDialer(func(ctx context.Context, addr string) (net.Conn, error) { grpc.WithContextDialer(func(ctx context.Context, addr string) (net.Conn, error) {
return (&net.Dialer{}).DialContext(ctx, "unix", addr) return (&net.Dialer{}).DialContext(ctx, "unix", addr)
})) }))
@ -230,8 +231,8 @@ func TestSetupAndServe(t *testing.T) {
time.Sleep(1 * time.Second) time.Sleep(1 * time.Second)
} }
//nolint: staticcheck conn, err = grpc.DialContext(ctx, pluginSocket,
conn, err = grpc.DialContext(ctx, pluginSocket, grpc.WithInsecure(), grpc.WithTransportCredentials(insecure.NewCredentials()),
grpc.WithContextDialer(func(ctx context.Context, addr string) (net.Conn, error) { grpc.WithContextDialer(func(ctx context.Context, addr string) (net.Conn, error) {
return (&net.Dialer{}).DialContext(ctx, "unix", addr) return (&net.Dialer{}).DialContext(ctx, "unix", addr)
})) }))