Skip to content

Commit d3e6e42

Browse files
njhillnjhill
authored
chore: Update dependencies (#20)
Refresh all of the go dependencies Signed-off-by: Nick Hill <[email protected]>
1 parent 9fb8506 commit d3e6e42

File tree

10 files changed

+396
-118
lines changed

10 files changed

+396
-118
lines changed

‎Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
###############################################################################
1818
FROM registry.access.redhat.com/ubi8/ubi-minimal:8.4 AS develop
1919

20-
ARG GOLANG_VERSION=1.17.3
21-
ARG PROTOC_VERSION=3.19.1
20+
ARG GOLANG_VERSION=1.17.8
21+
ARG PROTOC_VERSION=3.19.4
2222

2323
USER root
2424

‎go.mod

Lines changed: 32 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -3,60 +3,55 @@ module github.com/kserve/modelmesh-runtime-adapter
33
go 1.17
44

55
require (
6+
cloud.google.com/go/storage v1.21.0
67
github.com/IBM/ibm-cos-sdk-go v1.8.0
7-
github.com/cyphar/filepath-securejoin v0.2.2
8-
github.com/go-logr/logr v0.4.0
9-
github.com/golang/mock v1.5.0
10-
github.com/joho/godotenv v1.3.0
11-
github.com/stretchr/testify v1.7.0
8+
github.com/cyphar/filepath-securejoin v0.2.3
9+
github.com/go-logr/logr v1.2.3
10+
github.com/go-logr/zapr v1.2.3
11+
github.com/golang/mock v1.6.0
12+
github.com/joho/godotenv v1.4.0
13+
github.com/stretchr/testify v1.7.1
14+
go.uber.org/zap v1.19.1
1215
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
13-
google.golang.org/grpc v1.42.0
14-
google.golang.org/protobuf v1.27.1
15-
sigs.k8s.io/controller-runtime v0.10.2
16+
google.golang.org/api v0.69.0
17+
google.golang.org/grpc v1.45.0
18+
google.golang.org/protobuf v1.28.0
19+
// controller-runtime dependency is only used for logging
20+
sigs.k8s.io/controller-runtime v0.11.1
1621
)
1722

1823
require (
19-
cloud.google.com/go v0.54.0 // indirect
20-
github.com/BurntSushi/toml v0.3.1 // indirect
24+
cloud.google.com/go v0.100.2 // indirect
25+
cloud.google.com/go/compute v1.2.0 // indirect
26+
cloud.google.com/go/iam v0.1.1 // indirect
2127
github.com/davecgh/go-spew v1.1.1 // indirect
2228
github.com/gogo/protobuf v1.3.2 // indirect
2329
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
2430
github.com/golang/protobuf v1.5.2 // indirect
25-
github.com/google/go-cmp v0.5.5 // indirect
26-
github.com/googleapis/gax-go/v2 v2.0.5 // indirect
31+
github.com/google/go-cmp v0.5.7 // indirect
32+
github.com/google/gofuzz v1.1.0 // indirect
33+
github.com/googleapis/gax-go/v2 v2.1.1 // indirect
2734
github.com/jmespath/go-jmespath v0.4.0 // indirect
28-
github.com/json-iterator/go v1.1.11 // indirect
29-
github.com/jstemmer/go-junit-report v0.9.1 // indirect
35+
github.com/json-iterator/go v1.1.12 // indirect
3036
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
31-
github.com/modern-go/reflect2 v1.0.1 // indirect
32-
github.com/pkg/errors v0.9.1 // indirect
37+
github.com/modern-go/reflect2 v1.0.2 // indirect
3338
github.com/pmezard/go-difflib v1.0.0 // indirect
34-
go.opencensus.io v0.22.3 // indirect
39+
go.opencensus.io v0.23.0 // indirect
3540
go.uber.org/atomic v1.7.0 // indirect
3641
go.uber.org/multierr v1.6.0 // indirect
37-
golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 // indirect
38-
golang.org/x/mod v0.4.2 // indirect
39-
golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d // indirect
40-
golang.org/x/sys v0.0.0-20210817190340-bfb29a6856f2 // indirect
41-
golang.org/x/text v0.3.6 // indirect
42-
golang.org/x/tools v0.1.2 // indirect
42+
golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd // indirect
43+
golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 // indirect
44+
golang.org/x/sys v0.0.0-20220209214540-3681064d5158 // indirect
45+
golang.org/x/text v0.3.7 // indirect
4346
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
4447
google.golang.org/appengine v1.6.7 // indirect
45-
google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c // indirect
48+
google.golang.org/genproto v0.0.0-20220216160803-4663080d8bc8 // indirect
4649
gopkg.in/inf.v0 v0.9.1 // indirect
4750
gopkg.in/yaml.v2 v2.4.0 // indirect
4851
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
49-
honnef.co/go/tools v0.0.1-2020.1.3 // indirect
50-
k8s.io/apimachinery v0.22.2 // indirect
51-
k8s.io/klog/v2 v2.9.0 // indirect
52-
sigs.k8s.io/structured-merge-diff/v4 v4.1.2 // indirect
53-
)
54-
55-
require (
56-
cloud.google.com/go/storage v1.6.0
57-
github.com/go-logr/zapr v0.4.0
58-
github.com/google/gofuzz v1.2.0 // indirect
59-
go.uber.org/zap v1.19.0
60-
golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d // indirect
61-
google.golang.org/api v0.20.0
52+
k8s.io/apimachinery v0.23.0 // indirect
53+
k8s.io/klog/v2 v2.30.0 // indirect
54+
k8s.io/utils v0.0.0-20210930125809-cb0fa318a74b // indirect
55+
sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6 // indirect
56+
sigs.k8s.io/structured-merge-diff/v4 v4.2.0 // indirect
6257
)

‎go.sum

Lines changed: 335 additions & 72 deletions
Large diffs are not rendered by default.

‎model-mesh-mlserver-adapter/server/server.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ import (
2323
"strings"
2424
"time"
2525

26+
"google.golang.org/grpc/credentials/insecure"
27+
2628
"github.com/go-logr/logr"
2729
"google.golang.org/grpc"
2830
"google.golang.org/grpc/backoff"
@@ -76,7 +78,8 @@ func NewMLServerAdapterServer(runtimePort int, config *AdapterConfiguration, log
7678
mlserverClientCtx, cancel := context.WithTimeout(context.Background(), 1*time.Minute)
7779
defer cancel()
7880

79-
conn, err := grpc.DialContext(mlserverClientCtx, fmt.Sprintf("localhost:%d", runtimePort), grpc.WithInsecure(), grpc.WithBlock(),
81+
conn, err := grpc.DialContext(mlserverClientCtx, fmt.Sprintf("localhost:%d", runtimePort),
82+
grpc.WithTransportCredentials(insecure.NewCredentials()), grpc.WithBlock(),
8083
grpc.WithConnectParams(grpc.ConnectParams{Backoff: backoff.DefaultConfig, MinConnectTimeout: 10 * time.Second}))
8184

8285
if err != nil {

‎model-mesh-mlserver-adapter/server/server_test.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ import (
2626
"testing"
2727
"time"
2828

29+
"google.golang.org/grpc/credentials/insecure"
30+
2931
"github.com/kserve/modelmesh-runtime-adapter/internal/proto/mmesh"
3032
"github.com/kserve/modelmesh-runtime-adapter/internal/util"
3133
"google.golang.org/grpc"
@@ -90,7 +92,8 @@ func TestAdapter(t *testing.T) {
9092
mmeshClientCtx, cancel := context.WithTimeout(context.Background(), 2*time.Second)
9193
defer cancel()
9294

93-
conn, err := grpc.DialContext(mmeshClientCtx, "localhost:8085", grpc.WithBlock(), grpc.WithInsecure())
95+
conn, err := grpc.DialContext(mmeshClientCtx, "localhost:8085", grpc.WithBlock(),
96+
grpc.WithTransportCredentials(insecure.NewCredentials()))
9497
if err != nil {
9598
t.Fatalf("Failed to connect to MMesh: %v", err)
9699
}

‎model-mesh-triton-adapter/server/server.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ import (
2020
"os"
2121
"time"
2222

23+
"google.golang.org/grpc/credentials/insecure"
24+
2325
"github.com/go-logr/logr"
2426
"google.golang.org/grpc"
2527
"google.golang.org/grpc/backoff"
@@ -63,7 +65,8 @@ func NewTritonAdapterServer(runtimePort int, config *AdapterConfiguration, log l
6365
tritonClientCtx, cancel := context.WithTimeout(context.Background(), 1*time.Minute)
6466
defer cancel()
6567

66-
conn, err := grpc.DialContext(tritonClientCtx, fmt.Sprintf("localhost:%d", runtimePort), grpc.WithInsecure(), grpc.WithBlock(),
68+
conn, err := grpc.DialContext(tritonClientCtx, fmt.Sprintf("localhost:%d", runtimePort),
69+
grpc.WithTransportCredentials(insecure.NewCredentials()), grpc.WithBlock(),
6770
grpc.WithConnectParams(grpc.ConnectParams{Backoff: backoff.DefaultConfig, MinConnectTimeout: 10 * time.Second}))
6871

6972
if err != nil {

‎model-mesh-triton-adapter/server/server_test.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ import (
2424
"testing"
2525
"time"
2626

27+
"google.golang.org/grpc/credentials/insecure"
28+
2729
"sigs.k8s.io/controller-runtime/pkg/log/zap"
2830

2931
"github.com/kserve/modelmesh-runtime-adapter/internal/proto/mmesh"
@@ -93,7 +95,8 @@ func TestAdapter(t *testing.T) {
9395
mmeshClientCtx, cancel := context.WithTimeout(context.Background(), 2*time.Second)
9496
defer cancel()
9597

96-
conn, err := grpc.DialContext(mmeshClientCtx, "localhost:8085", grpc.WithBlock(), grpc.WithInsecure())
98+
conn, err := grpc.DialContext(mmeshClientCtx, "localhost:8085", grpc.WithBlock(),
99+
grpc.WithTransportCredentials(insecure.NewCredentials()))
97100
if err != nil {
98101
t.Fatalf("Failed to connect to MMesh: %v", err)
99102
}

‎model-mesh-triton-adapter/triton/adapter_client/adapter_client.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ import (
1818
"os"
1919
"time"
2020

21+
"google.golang.org/grpc/credentials/insecure"
22+
2123
"github.com/kserve/modelmesh-runtime-adapter/internal/proto/mmesh"
2224
"google.golang.org/grpc"
2325
"sigs.k8s.io/controller-runtime/pkg/log/zap"
@@ -30,7 +32,8 @@ func main() {
3032
mmeshClientCtx, cancel := context.WithTimeout(context.Background(), 2*time.Second)
3133
defer cancel()
3234

33-
conn, err := grpc.DialContext(mmeshClientCtx, "localhost:8085", grpc.WithBlock(), grpc.WithInsecure())
35+
conn, err := grpc.DialContext(mmeshClientCtx, "localhost:8085", grpc.WithBlock(),
36+
grpc.WithTransportCredentials(insecure.NewCredentials()))
3437
if err != nil {
3538
log.Error(err, "Failed to connect to MMesh")
3639
os.Exit(1)

‎model-mesh-triton-adapter/triton/mesh_client/mesh_client.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ import (
1818
"os"
1919
"time"
2020

21+
"google.golang.org/grpc/credentials/insecure"
22+
2123
"github.com/kserve/modelmesh-runtime-adapter/internal/proto/mmesh"
2224
"google.golang.org/grpc"
2325
"sigs.k8s.io/controller-runtime/pkg/log/zap"
@@ -30,7 +32,8 @@ func main() {
3032
mmeshClientCtx, cancel := context.WithTimeout(context.Background(), 2*time.Second)
3133
defer cancel()
3234

33-
conn, err := grpc.DialContext(mmeshClientCtx, "localhost:8033", grpc.WithBlock(), grpc.WithInsecure())
35+
conn, err := grpc.DialContext(mmeshClientCtx, "localhost:8033", grpc.WithBlock(),
36+
grpc.WithTransportCredentials(insecure.NewCredentials()))
3437

3538
if err != nil {
3639
log.Error(err, "Failed to connect to MMesh")

‎model-serving-puller/server/server.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ import (
2323
"strings"
2424
"time"
2525

26+
"google.golang.org/grpc/credentials/insecure"
27+
2628
"github.com/go-logr/logr"
2729

2830
"google.golang.org/grpc"
@@ -82,7 +84,7 @@ func (s *PullerServer) StartServer() error {
8284
modelRuntimeConnection, err := grpc.DialContext(
8385
runtimeClientCtx,
8486
modelServerEndpoint,
85-
grpc.WithInsecure(),
87+
grpc.WithTransportCredentials(insecure.NewCredentials()),
8688
grpc.WithBlock(),
8789
grpc.WithConnectParams(grpc.ConnectParams{
8890
Backoff: backoff.DefaultConfig,

0 commit comments

Comments
 (0)