kubernetes
/
apiserver
mirror of https://github.com/kubernetes/apiserver.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #113077 from lixiaobing1/WithTransportCredentials 

replace WithInsecure() with WithTransportCredentials()

Kubernetes-commit: 3eeb7cb57f388a594ce24e5a97f81029caad61f8
This commit is contained in:
Kubernetes Publisher 2022-10-19 08:59:02 -07:00
parent 6fe4f87105 c144979a82
commit 90614109fc
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
go.mod
View File

@ -44,7 +44,7 @@ require (
gopkg.in/square/go-jose.v2 v2.2.2
k8s.io/api v0.0.0-20221012115127-0184bd884c5e
k8s.io/apimachinery v0.0.0-20221017194938-70a38aaa19ef
k8s.io/client-go v0.0.0-20221018195526-197e4799dc56
k8s.io/client-go v0.0.0-20221019075459-ef8a2e522779
k8s.io/component-base v0.0.0-20221019000337-4f487d08c46c
k8s.io/klog/v2 v2.80.1
k8s.io/kms v0.0.0-20221014080727-25ac69204108
@ -124,7 +124,7 @@ require (
replace (
k8s.io/api => k8s.io/api v0.0.0-20221012115127-0184bd884c5e
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20221017194938-70a38aaa19ef
k8s.io/client-go => k8s.io/client-go v0.0.0-20221018195526-197e4799dc56
k8s.io/client-go => k8s.io/client-go v0.0.0-20221019075459-ef8a2e522779
k8s.io/component-base => k8s.io/component-base v0.0.0-20221019000337-4f487d08c46c
k8s.io/kms => k8s.io/kms v0.0.0-20221014080727-25ac69204108
)

4
go.sum
View File

@ -986,8 +986,8 @@ k8s.io/api v0.0.0-20221012115127-0184bd884c5e h1:N2+121lkGMNfLeos4/AlwuujPJd5xJf
k8s.io/api v0.0.0-20221012115127-0184bd884c5e/go.mod h1:Q2jmki3lhHeeAyYtbIiEe/2JoGg2Ge1cJoMgpFkjtzg=
k8s.io/apimachinery v0.0.0-20221017194938-70a38aaa19ef h1:4lKLUMgwg9xi0UV4qjwS2NHmxBU2llLMdfO7czD9gUg=
k8s.io/apimachinery v0.0.0-20221017194938-70a38aaa19ef/go.mod h1:/x4E+/xaA5ap3q0tWNh5IPFt63dzY1I2qP8zT4sr5Yg=
k8s.io/client-go v0.0.0-20221018195526-197e4799dc56 h1:RW41+G8r/tFt+qUnYILOeGV9WAyGtjKGeOvuv0TYJzI=
k8s.io/client-go v0.0.0-20221018195526-197e4799dc56/go.mod h1:r+Jiu2RH1zXcJsmml1qRHg9oBq4sHHcMRaiEV0GN0ME=
k8s.io/client-go v0.0.0-20221019075459-ef8a2e522779 h1:+u8zTIggt94pLdjOWhaoW2iJwCaArrP2HnBlmJwk0mM=
k8s.io/client-go v0.0.0-20221019075459-ef8a2e522779/go.mod h1:r+Jiu2RH1zXcJsmml1qRHg9oBq4sHHcMRaiEV0GN0ME=
k8s.io/component-base v0.0.0-20221019000337-4f487d08c46c h1:JEJlkqGJMe1WCIri8MWhUc1vryNLbP6SFmspoSwMbt8=
k8s.io/component-base v0.0.0-20221019000337-4f487d08c46c/go.mod h1:GzuOBZLTCAovez80ouX6fNL7eTjPnb0b2WDJkqL1k5c=
k8s.io/klog/v2 v2.80.1 h1:atnLQ121W371wYYFawwYx1aEY2eUfs4l3J72wtgAwV4=

3
pkg/storage/value/encrypt/envelope/kmsv2/grpc_service.go
View File

@ -24,6 +24,7 @@ import (
"time"
"google.golang.org/grpc"
"google.golang.org/grpc/credentials/insecure"
utilruntime "k8s.io/apimachinery/pkg/util/runtime"
"k8s.io/apiserver/pkg/storage/value/encrypt/envelope/util"
@ -55,7 +56,7 @@ func NewGRPCService(ctx context.Context, endpoint string, callTimeout time.Durat
s := &gRPCService{callTimeout: callTimeout}
s.connection, err = grpc.Dial(
addr,
grpc.WithInsecure(),
grpc.WithTransportCredentials(insecure.NewCredentials()),
grpc.WithDefaultCallOptions(grpc.WaitForReady(true)),
grpc.WithContextDialer(
func(context.Context, string) (net.Conn, error) {