Skip to content

Commit 32ea86e

Browse files
Make block e2e compatible with main branch + Fix bugs (#110)
* update ginkgo version * Revert protobuf to 1.31.0 due to failing travis jobs * Fix issue where unable to create ROKS cluster when latest version is selected * Add msg to out file in case cluster creation fails * Unnecessary use of set -e in e2e.sh
1 parent 39e96f1 commit 32ea86e

File tree

6 files changed

+90
-97
lines changed

6 files changed

+90
-97
lines changed

go.mod

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@ require (
88
github.com/gofrs/uuid v4.4.0+incompatible
99
github.com/golang/glog v1.1.0
1010
github.com/kubernetes-csi/external-snapshotter/client/v4 v4.2.0
11-
github.com/onsi/ginkgo/v2 v2.9.4
12-
github.com/onsi/gomega v1.27.6
11+
github.com/onsi/ginkgo/v2 v2.17.2
12+
github.com/onsi/gomega v1.33.0
1313
github.com/prometheus/client_golang v1.16.0
14-
github.com/stretchr/testify v1.8.2
14+
github.com/stretchr/testify v1.8.4
1515
go.uber.org/zap v1.20.0
16-
golang.org/x/net v0.19.0
16+
golang.org/x/net v0.24.0
1717
google.golang.org/grpc v1.56.3
18-
google.golang.org/protobuf v1.31.0
18+
google.golang.org/protobuf v1.33.0
1919
k8s.io/api v0.28.6
2020
k8s.io/apimachinery v0.28.6
2121
k8s.io/client-go v0.28.6
@@ -43,20 +43,20 @@ require (
4343
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
4444
github.com/felixge/httpsnoop v1.0.3 // indirect
4545
github.com/fsnotify/fsnotify v1.6.0 // indirect
46-
github.com/go-logr/logr v1.2.4 // indirect
46+
github.com/go-logr/logr v1.4.1 // indirect
4747
github.com/go-logr/stdr v1.2.2 // indirect
4848
github.com/go-openapi/jsonpointer v0.19.6 // indirect
4949
github.com/go-openapi/jsonreference v0.20.2 // indirect
5050
github.com/go-openapi/swag v0.22.3 // indirect
51-
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
51+
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
5252
github.com/gogo/protobuf v1.3.2 // indirect
5353
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
5454
github.com/golang/protobuf v1.5.3 // indirect
5555
github.com/google/cel-go v0.16.1 // indirect
5656
github.com/google/gnostic-models v0.6.8 // indirect
57-
github.com/google/go-cmp v0.5.9 // indirect
57+
github.com/google/go-cmp v0.6.0 // indirect
5858
github.com/google/gofuzz v1.2.0 // indirect
59-
github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 // indirect
59+
github.com/google/pprof v0.0.0-20240424215950-a892ee059fd6 // indirect
6060
github.com/google/uuid v1.3.0 // indirect
6161
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
6262
github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.0 // indirect
@@ -74,7 +74,6 @@ require (
7474
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
7575
github.com/opencontainers/go-digest v1.0.0 // indirect
7676
github.com/opencontainers/selinux v1.10.0 // indirect
77-
github.com/pierrre/gotestcover v0.0.0-20160517101806-924dca7d15f0 // indirect
7877
github.com/pkg/errors v0.9.1 // indirect
7978
github.com/pmezard/go-difflib v1.0.0 // indirect
8079
github.com/prometheus/client_model v0.4.0 // indirect
@@ -98,15 +97,15 @@ require (
9897
go.opentelemetry.io/proto/otlp v0.19.0 // indirect
9998
go.uber.org/atomic v1.11.0 // indirect
10099
go.uber.org/multierr v1.11.0 // indirect
101-
golang.org/x/crypto v0.16.0 // indirect
100+
golang.org/x/crypto v0.22.0 // indirect
102101
golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect
103102
golang.org/x/oauth2 v0.8.0 // indirect
104-
golang.org/x/sync v0.5.0 // indirect
105-
golang.org/x/sys v0.15.0 // indirect
106-
golang.org/x/term v0.15.0 // indirect
103+
golang.org/x/sync v0.7.0 // indirect
104+
golang.org/x/sys v0.19.0 // indirect
105+
golang.org/x/term v0.19.0 // indirect
107106
golang.org/x/text v0.14.0 // indirect
108107
golang.org/x/time v0.3.0 // indirect
109-
golang.org/x/tools v0.16.1 // indirect
108+
golang.org/x/tools v0.20.0 // indirect
110109
google.golang.org/appengine v1.6.7 // indirect
111110
google.golang.org/genproto v0.0.0-20230526161137-0005af68ea54 // indirect
112111
google.golang.org/genproto/googleapis/api v0.0.0-20230525234035-dd9d682886f9 // indirect
@@ -133,4 +132,7 @@ require (
133132
sigs.k8s.io/yaml v1.3.0 // indirect
134133
)
135134

136-
replace github.com/dgrijalva/jwt-go => github.com/golang-jwt/jwt/v4 v4.1.0
135+
replace (
136+
github.com/dgrijalva/jwt-go => github.com/golang-jwt/jwt/v4 v4.1.0
137+
google.golang.org/protobuf => google.golang.org/protobuf v1.31.0
138+
)

0 commit comments

Comments
 (0)