get rid of old etcd dependency by more import path changes + remove o…

…penapi related code
Klarrio · Oct 24, 2022 · 471351b · 471351b
1 parent 1e954ea
commit 471351b
Show file tree

Hide file tree

Showing 9 changed files with 21 additions and 147 deletions.
diff --git a/go.mod b/go.mod
@@ -4,7 +4,6 @@ go 1.17
 
 require (
 	github.com/coreos/go-semver v0.3.0
-	github.com/go-openapi/spec v0.20.7
 	github.com/google/uuid v1.3.0
 	github.com/kelseyhightower/envconfig v1.4.0
 	github.com/onsi/ginkgo v1.16.5
@@ -13,9 +12,10 @@ require (
 	github.com/prometheus/client_golang v1.13.0
 	github.com/sirupsen/logrus v1.9.0
 	github.com/tchap/go-patricia/v2 v2.3.1
-	go.etcd.io/etcd v0.5.0-alpha.5.0.20201125193152-8a03d2e9614b
+	go.etcd.io/etcd/api/v3 v3.5.5
 	go.etcd.io/etcd/client/v2 v2.305.5
 	go.etcd.io/etcd/client/v3 v3.5.5
+	go.etcd.io/etcd/client/pkg/v3 v3.5.5
 	golang.org/x/net v0.1.0
 	golang.org/x/sync v0.1.0
 	golang.zx2c4.com/wireguard/wgctrl v0.0.0-20220916014741-473347a5e6e3
@@ -24,9 +24,10 @@ require (
 	k8s.io/apimachinery v0.21.0-rc.0
 	k8s.io/client-go v0.21.0-rc.0
 	k8s.io/code-generator v0.21.0-rc.0
-	k8s.io/kube-openapi v0.0.0-20210305001622-591a79e4bda7
 )
 
+
+
 require (
 	cloud.google.com/go v0.65.0 // indirect
 	github.com/Azure/go-autorest v14.2.0+incompatible // indirect
@@ -37,18 +38,12 @@ require (
 	github.com/Azure/go-autorest/tracing v0.6.0 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/cespare/xxhash/v2 v2.1.2 // indirect
-	github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf // indirect
 	github.com/coreos/go-systemd/v22 v22.3.2 // indirect
-	github.com/coreos/pkg v0.0.0-20220810130054-c7d1c02cb6cf // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/emicklei/go-restful v2.9.5+incompatible // indirect
 	github.com/evanphx/json-patch v4.9.0+incompatible // indirect
 	github.com/form3tech-oss/jwt-go v3.2.3+incompatible // indirect
 	github.com/fsnotify/fsnotify v1.4.9 // indirect
 	github.com/go-logr/logr v0.4.0 // indirect
-	github.com/go-openapi/jsonpointer v0.19.5 // indirect
-	github.com/go-openapi/jsonreference v0.20.0 // indirect
-	github.com/go-openapi/swag v0.19.15 // indirect
 	github.com/go-playground/locales v0.14.0 // indirect
 	github.com/go-playground/universal-translator v0.18.0 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
@@ -59,10 +54,8 @@ require (
 	github.com/googleapis/gnostic v0.4.1 // indirect
 	github.com/hashicorp/golang-lru v0.5.4 // indirect
 	github.com/imdario/mergo v0.3.13 // indirect
-	github.com/josharian/intern v1.0.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
 	github.com/leodido/go-urn v1.2.1 // indirect
-	github.com/mailru/easyjson v0.7.6 // indirect
 	github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
@@ -73,8 +66,6 @@ require (
 	github.com/prometheus/common v0.37.0 // indirect
 	github.com/prometheus/procfs v0.8.0 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
-	go.etcd.io/etcd/api/v3 v3.5.5 // indirect
-	go.etcd.io/etcd/client/pkg/v3 v3.5.5 // indirect
 	go.uber.org/atomic v1.7.0 // indirect
 	go.uber.org/multierr v1.6.0 // indirect
 	go.uber.org/zap v1.23.0 // indirect
@@ -99,6 +90,7 @@ require (
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 	k8s.io/gengo v0.0.0-20201214224949-b6c5ce23f027 // indirect
 	k8s.io/klog/v2 v2.8.0 // indirect
+	k8s.io/kube-openapi v0.0.0-20210305001622-591a79e4bda7 // indirect
 	k8s.io/utils v0.0.0-20201110183641-67b214c5f920 // indirect
 	sigs.k8s.io/structured-merge-diff/v4 v4.1.0 // indirect
 	sigs.k8s.io/yaml v1.2.0 // indirect

diff --git a/go.sum b/go.sum
diff --git a/lib/apis/v1/openapi_generated.go b/lib/apis/v1/openapi_generated.go
diff --git a/lib/apis/v3/openapi_generated.go b/lib/apis/v3/openapi_generated.go
diff --git a/lib/backend/etcd/etcd.go b/lib/backend/etcd/etcd.go
@@ -23,8 +23,8 @@ import (
 
 	log "github.com/sirupsen/logrus"
 	etcd "go.etcd.io/etcd/client/v2"
-	"go.etcd.io/etcd/pkg/srv"
-	"go.etcd.io/etcd/pkg/transport"
+	"go.etcd.io/etcd/client/pkg/v3/srv"
+	"go.etcd.io/etcd/client/pkg/v3/transport"
 	"golang.org/x/net/context"
 
 	v1 "github.com/projectcalico/libcalico-go/lib/apis/v1"

diff --git a/lib/backend/etcdv3/conversion.go b/lib/backend/etcdv3/conversion.go
@@ -20,7 +20,8 @@ import (
 
 	log "github.com/sirupsen/logrus"
 	"go.etcd.io/etcd/client/v3"
-	"go.etcd.io/etcd/mvcc/mvccpb"
+	//mvccpb "go.etcd.io/etcd/mvcc/mvccpb"
+	mvccpb "go.etcd.io/etcd/api/v3/mvccpb"
 
 	"github.com/projectcalico/libcalico-go/lib/backend/api"
 	"github.com/projectcalico/libcalico-go/lib/backend/model"

diff --git a/lib/backend/etcdv3/etcdv3.go b/lib/backend/etcdv3/etcdv3.go
@@ -26,8 +26,8 @@ import (
 
 	log "github.com/sirupsen/logrus"
 	"go.etcd.io/etcd/client/v3"
-	"go.etcd.io/etcd/pkg/srv"
-	"go.etcd.io/etcd/pkg/transport"
+	"go.etcd.io/etcd/client/pkg/v3/srv"
+	"go.etcd.io/etcd/client/pkg/v3/transport"
 
 	"github.com/projectcalico/libcalico-go/lib/apiconfig"
 	apiv3 "github.com/projectcalico/libcalico-go/lib/apis/v3"

diff --git a/lib/numorstring/openapi_generated.go b/lib/numorstring/openapi_generated.go
diff --git a/lib/upgrade/migrator/clients/v1/etcdv2/etcdv2.go b/lib/upgrade/migrator/clients/v1/etcdv2/etcdv2.go
@@ -23,7 +23,7 @@ import (
 
 	log "github.com/sirupsen/logrus"
 	etcd "go.etcd.io/etcd/client/v2"
-	"go.etcd.io/etcd/pkg/transport"
+	"go.etcd.io/etcd/client/pkg/v3/transport"
 	"golang.org/x/net/context"
 
 	apiv1 "github.com/projectcalico/libcalico-go/lib/apis/v1"