Skip to content

Commit 228f5ed

Browse files
authored
PWX-23110: use go.etcd.io import instead of coreos/etcd (#145)
As part of move to etcd 3.4.24, we need to use go.etcd.io import everywhere. Replaced github.com/coreos/etcd by go.etcd.io/etcd. Also, added sched-ops to replace section to avoid error in go mod download. Vendored in the latest kvdb repo. Signed-off-by: Neelesh Thakur <[email protected]>
1 parent d8c64b7 commit 228f5ed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

87 files changed

+2086
-1560
lines changed

go.mod

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,20 +11,20 @@ require (
1111
github.com/IBM-Cloud/bluemix-go v0.0.0-20220329045155-d2a8118ac5c7
1212
github.com/aws/aws-sdk-go v1.40.39
1313
github.com/codeskyblue/go-sh v0.0.0-20170112005953-b097669b1569
14-
github.com/coreos/etcd v3.3.27+incompatible
1514
github.com/golang/mock v1.4.4
1615
github.com/google/uuid v1.1.2
1716
github.com/hashicorp/go-version v1.2.1
1817
github.com/libopenstorage/openstorage v8.0.1-0.20210603043922-faf638fed3e5+incompatible
1918
github.com/libopenstorage/secrets v0.0.0-20210908194121-a1d19aa9713a
2019
github.com/oracle/oci-go-sdk/v65 v65.13.1
2120
github.com/pborman/uuid v1.2.0
22-
github.com/portworx/kvdb v0.0.0-20230326003017-21a38cf82d4b
21+
github.com/portworx/kvdb v0.0.0-20230405233801-87666830d3fd
2322
github.com/portworx/sched-ops v1.20.4-rc1.0.20211217234328-ead591c0f22d
24-
github.com/prometheus/client_golang v1.9.0
23+
github.com/prometheus/client_golang v1.11.1
2524
github.com/sirupsen/logrus v1.8.1
26-
github.com/stretchr/testify v1.7.0
25+
github.com/stretchr/testify v1.8.1
2726
github.com/vmware/govmomi v0.22.2
27+
go.etcd.io/etcd v0.5.0-alpha.5.0.20200910180754-dd1b699fc489
2828
golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5
2929
google.golang.org/api v0.30.0
3030
gopkg.in/yaml.v2 v2.4.0
@@ -54,16 +54,16 @@ require (
5454
github.com/gofrs/flock v0.8.1 // indirect
5555
github.com/gogo/protobuf v1.3.2 // indirect
5656
github.com/golang-jwt/jwt/v4 v4.4.3 // indirect
57-
github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
57+
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
5858
github.com/golang/protobuf v1.5.2 // indirect
5959
github.com/google/gofuzz v1.1.0 // indirect
6060
github.com/googleapis/gax-go/v2 v2.0.5 // indirect
6161
github.com/googleapis/gnostic v0.5.1 // indirect
62-
github.com/grpc-ecosystem/go-grpc-middleware v1.2.2 // indirect
62+
github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 // indirect
6363
github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect
6464
github.com/imdario/mergo v0.3.10 // indirect
6565
github.com/jmespath/go-jmespath v0.4.0 // indirect
66-
github.com/json-iterator/go v1.1.10 // indirect
66+
github.com/json-iterator/go v1.1.11 // indirect
6767
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
6868
github.com/mitchellh/go-homedir v1.1.0 // indirect
6969
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
@@ -72,11 +72,10 @@ require (
7272
github.com/pmezard/go-difflib v1.0.0 // indirect
7373
github.com/pquerna/cachecontrol v0.0.0-20180517163645-1555304b9b35 // indirect
7474
github.com/prometheus/client_model v0.2.0 // indirect
75-
github.com/prometheus/common v0.15.0 // indirect
76-
github.com/prometheus/procfs v0.2.0 // indirect
75+
github.com/prometheus/common v0.26.0 // indirect
76+
github.com/prometheus/procfs v0.6.0 // indirect
7777
github.com/sony/gobreaker v0.5.0 // indirect
7878
github.com/spf13/pflag v1.0.5 // indirect
79-
github.com/stretchr/objx v0.2.0 // indirect
8079
go.opencensus.io v0.22.4 // indirect
8180
golang.org/x/crypto v0.6.0 // indirect
8281
golang.org/x/net v0.6.0 // indirect
@@ -90,7 +89,7 @@ require (
9089
google.golang.org/protobuf v1.26.0 // indirect
9190
gopkg.in/inf.v0 v0.9.1 // indirect
9291
gopkg.in/square/go-jose.v2 v2.5.1 // indirect
93-
gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776 // indirect
92+
gopkg.in/yaml.v3 v3.0.1 // indirect
9493
k8s.io/api v0.20.4 // indirect
9594
k8s.io/klog/v2 v2.4.0 // indirect
9695
k8s.io/kube-openapi v0.0.0-20210216185858-15cd8face8d6 // indirect
@@ -102,6 +101,7 @@ require (
102101
replace (
103102
github.com/Azure/go-autorest => github.com/Azure/go-autorest v14.2.0+incompatible
104103
github.com/kubernetes-incubator/external-storage => github.com/libopenstorage/external-storage v5.1.1-0.20190919185747-9394ee8dd536+incompatible
104+
github.com/portworx/sched-ops => github.com/portworx/sched-ops v1.20.4-rc1.0.20211217234328-ead591c0f22d
105105
github.com/prometheus/prometheus v2.9.2+incompatible => github.com/prometheus/prometheus v1.8.2-0.20190424153033-d3245f150225
106106
github.com/vmware/govmomi => github.com/libopenstorage/govmomi v0.22.3-0.20200619175019-4b44cc8cf4d1
107107
k8s.io/api => k8s.io/api v0.20.4

go.sum

Lines changed: 63 additions & 174 deletions
Large diffs are not rendered by default.

store/store_k8s.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ import (
77
"strings"
88
"time"
99

10-
"github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes"
1110
"github.com/portworx/sched-ops/k8s/core/configmap"
1211
"github.com/sirupsen/logrus"
12+
"go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes"
1313
"k8s.io/apimachinery/pkg/util/validation"
1414
"k8s.io/apimachinery/pkg/util/wait"
1515
)

vendor/github.com/grpc-ecosystem/go-grpc-middleware/util/metautils/nicemd.go

Lines changed: 9 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/grpc-ecosystem/go-grpc-middleware/util/metautils/single_key.go

Lines changed: 0 additions & 22 deletions
This file was deleted.

vendor/github.com/json-iterator/go/iter_float.go

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/json-iterator/go/iter_int.go

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/json-iterator/go/reflect.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/json-iterator/go/reflect_json_raw_message.go

Lines changed: 20 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/json-iterator/go/reflect_struct_decoder.go

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)