[skip ci] update requirements

projecteru2 · May 12, 2023 · 4662ed8 · 4662ed8
1 parent 8e50558
commit 4662ed8
Show file tree

Hide file tree

Showing 33 changed files with 539 additions and 898 deletions.
diff --git a/Makefile b/Makefile
@@ -37,16 +37,16 @@ deps:
 	go mod tidy
 
 mock: deps
-	PATH=${HOME}/go/bin:${PATH} mockery --dir pkg/libvirt --output pkg/libvirt/mocks --all
-	PATH=${HOME}/go/bin:${PATH} mockery --dir pkg/sh --output pkg/sh/mocks --name Shell
-	PATH=${HOME}/go/bin:${PATH} mockery --dir pkg/store --output pkg/store/mocks --name Store
-	PATH=${HOME}/go/bin:${PATH} mockery --dir pkg/utils --output pkg/utils/mocks --name Locker
-	PATH=${HOME}/go/bin:${PATH} mockery --dir internal/virt/agent --output internal/virt/agent/mocks --all
-	PATH=${HOME}/go/bin:${PATH} mockery --dir internal/virt/domain --output internal/virt/domain/mocks --name Domain
-	PATH=${HOME}/go/bin:${PATH} mockery --dir internal/virt/guest/manager --output internal/virt/guest/manager/mocks --name Manageable
-	PATH=${HOME}/go/bin:${PATH} mockery --dir internal/virt/guest --output internal/virt/guest/mocks --name Bot
-	PATH=${HOME}/go/bin:${PATH} mockery --dir internal/virt/guestfs --output internal/virt/guestfs/mocks --name Guestfs
-	PATH=${HOME}/go/bin:${PATH} mockery --dir internal/virt/volume --output internal/virt/volume/mocks --name Bot
+	mockery --dir pkg/libvirt --output pkg/libvirt/mocks --all
+	mockery --dir pkg/sh --output pkg/sh/mocks --name Shell
+	mockery --dir pkg/store --output pkg/store/mocks --name Store
+	mockery --dir pkg/utils --output pkg/utils/mocks --name Locker
+	mockery --dir internal/virt/agent --output internal/virt/agent/mocks --all
+	mockery --dir internal/virt/domain --output internal/virt/domain/mocks --name Domain
+	mockery --dir internal/virt/guest/manager --output internal/virt/guest/manager/mocks --name Manageable
+	mockery --dir internal/virt/guest --output internal/virt/guest/mocks --name Bot
+	mockery --dir internal/virt/guestfs --output internal/virt/guestfs/mocks --name Guestfs
+	mockery --dir internal/virt/volume --output internal/virt/volume/mocks --name Bot
 
 clean:
 	rm -fr bin/*

diff --git a/cmd/network/calico/align.go b/cmd/network/calico/align.go
@@ -5,8 +5,8 @@ import (
 	"fmt"
 	"net"
 
-	libcalinet "github.com/projectcalico/libcalico-go/lib/net"
-	libcaliopt "github.com/projectcalico/libcalico-go/lib/options"
+	libcalinet "github.com/projectcalico/calico/libcalico-go/lib/net"
+	libcaliopt "github.com/projectcalico/calico/libcalico-go/lib/options"
 	"github.com/urfave/cli/v2"
 
 	"github.com/projecteru2/yavirt/cmd/run"

diff --git a/configs/config.go b/configs/config.go
@@ -5,7 +5,7 @@ import (
 	"path/filepath"
 	"time"
 
-	"go.etcd.io/etcd/clientv3"
+	clientv3 "go.etcd.io/etcd/client/v3"
 	"go.etcd.io/etcd/pkg/transport"
 
 	"github.com/projecteru2/yavirt/pkg/errors"

diff --git a/go.mod b/go.mod
@@ -3,119 +3,173 @@ module github.com/projecteru2/yavirt
 go 1.20
 
 require (
-	github.com/BurntSushi/toml v0.3.1
-	github.com/containernetworking/cni v0.8.1
-	github.com/getsentry/sentry-go v0.9.0
-	github.com/gin-gonic/gin v1.6.3
+	github.com/BurntSushi/toml v1.2.1
+	github.com/containernetworking/cni v1.1.2
+	github.com/getsentry/sentry-go v0.20.0
+	github.com/gin-gonic/gin v1.9.0
 	github.com/google/uuid v1.3.0
 	github.com/juju/errors v1.0.0
-	github.com/libvirt/libvirt-go v5.2.0+incompatible
-	github.com/projectcalico/api v0.0.0-20211207142834-757e73ac95b9
-	github.com/projectcalico/libcalico-go v1.7.2-0.20211201231514-3402eca9d274
-	github.com/projecteru2/core v0.0.0-20210317082513-84f470562415
-	github.com/projecteru2/libyavirt v0.0.0-20230511035158-650f74b8b68c
-	github.com/prometheus/client_golang v1.7.1
+	github.com/libvirt/libvirt-go v7.4.0+incompatible
+	github.com/projectcalico/api v0.0.0-20230222223746-44aa60c2201f
+	github.com/projectcalico/calico v1.11.0-cni-plugin.0.20230510161715-15d193738928
+	github.com/projecteru2/core v0.0.0-20230512041401-f4113e25d62c
+	github.com/projecteru2/libyavirt v0.0.0-20230512040131-dd14c75027c3
+	github.com/prometheus/client_golang v1.15.0
 	github.com/robfig/cron/v3 v3.0.1
-	github.com/sirupsen/logrus v1.7.0
-	github.com/stretchr/testify v1.7.0
-	github.com/urfave/cli/v2 v2.3.0
-	github.com/vishvananda/netlink v1.1.0
-	go.etcd.io/etcd v0.5.0-alpha.5.0.20201125193152-8a03d2e9614b
+	github.com/sirupsen/logrus v1.9.0
+	github.com/stretchr/testify v1.8.2
+	github.com/urfave/cli/v2 v2.25.1
+	github.com/vishvananda/netlink v1.2.1-beta.2.0.20230206183746-70ca0345eede
+	go.etcd.io/etcd v3.3.27+incompatible
+	go.etcd.io/etcd/client/v3 v3.5.8
+	golang.org/x/exp v0.0.0-20230425010034-47ecfdc1ba53
 	golang.org/x/sys v0.8.0
-	google.golang.org/grpc v1.54.0
-	k8s.io/apimachinery v0.21.0
+	google.golang.org/grpc v1.54.1
+	k8s.io/apimachinery v0.26.3
 )
 
 require (
-	cloud.google.com/go/compute v1.19.0 // indirect
-	cloud.google.com/go/compute/metadata v0.2.3 // indirect
-	github.com/Azure/go-autorest v14.2.0+incompatible // indirect
-	github.com/Azure/go-autorest/autorest v0.11.12 // indirect
-	github.com/Azure/go-autorest/autorest/adal v0.9.5 // indirect
-	github.com/Azure/go-autorest/autorest/date v0.3.0 // indirect
-	github.com/Azure/go-autorest/logger v0.2.0 // indirect
-	github.com/Azure/go-autorest/tracing v0.6.0 // indirect
-	github.com/PuerkitoBio/purell v1.1.1 // indirect
-	github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
+	github.com/alphadose/haxmap v1.2.0 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
-	github.com/cespare/xxhash/v2 v2.1.1 // indirect
-	github.com/coreos/go-semver v0.3.0 // indirect
-	github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f // indirect
-	github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f // indirect
-	github.com/cpuguy83/go-md2man/v2 v2.0.0 // indirect
+	github.com/bytedance/sonic v1.8.7 // indirect
+	github.com/cespare/xxhash/v2 v2.2.0 // indirect
+	github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311 // indirect
+	github.com/cockroachdb/errors v1.9.1 // indirect
+	github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b // indirect
+	github.com/cockroachdb/redact v1.1.3 // indirect
+	github.com/coreos/etcd v3.3.27+incompatible // indirect
+	github.com/coreos/go-semver v0.3.1 // indirect
+	github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf // indirect
+	github.com/coreos/go-systemd/v22 v22.5.0 // indirect
+	github.com/coreos/pkg v0.0.0-20230327231512-ba87abf18a23 // indirect
+	github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/emicklei/go-restful v2.11.2-0.20200112161605-a7c079c43d51+incompatible // indirect
-	github.com/form3tech-oss/jwt-go v3.2.2+incompatible // indirect
+	github.com/docker/go-connections v0.4.0 // indirect
+	github.com/docker/go-units v0.5.0 // indirect
+	github.com/emicklei/go-restful/v3 v3.10.2 // indirect
 	github.com/gin-contrib/sse v0.1.0 // indirect
-	github.com/go-logr/logr v0.4.0 // indirect
-	github.com/go-openapi/jsonpointer v0.19.3 // indirect
-	github.com/go-openapi/jsonreference v0.19.4-0.20191224164422-1f9748e5f45e // indirect
-	github.com/go-openapi/spec v0.19.5 // indirect
-	github.com/go-openapi/swag v0.19.7 // indirect
-	github.com/go-playground/locales v0.13.0 // indirect
-	github.com/go-playground/universal-translator v0.17.0 // indirect
-	github.com/go-playground/validator/v10 v10.2.0 // indirect
+	github.com/go-logr/logr v1.2.4 // indirect
+	github.com/go-openapi/jsonpointer v0.19.6 // indirect
+	github.com/go-openapi/jsonreference v0.20.2 // indirect
+	github.com/go-openapi/swag v0.22.3 // indirect
+	github.com/go-playground/locales v0.14.1 // indirect
+	github.com/go-playground/universal-translator v0.18.1 // indirect
+	github.com/go-playground/validator/v10 v10.12.0 // indirect
+	github.com/goccy/go-json v0.10.2 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang/protobuf v1.5.3 // indirect
+	github.com/google/gnostic v0.6.9 // indirect
 	github.com/google/go-cmp v0.5.9 // indirect
 	github.com/google/gofuzz v1.2.0 // indirect
-	github.com/googleapis/gnostic v0.4.1 // indirect
-	github.com/hashicorp/golang-lru v0.5.3 // indirect
-	github.com/imdario/mergo v0.3.9 // indirect
-	github.com/jinzhu/configor v1.2.0 // indirect
-	github.com/json-iterator/go v1.1.10 // indirect
+	github.com/imdario/mergo v0.3.15 // indirect
+	github.com/jinzhu/configor v1.2.1 // indirect
+	github.com/josharian/intern v1.0.0 // indirect
+	github.com/json-iterator/go v1.1.12 // indirect
 	github.com/kelseyhightower/envconfig v1.4.0 // indirect
-	github.com/leodido/go-urn v1.2.0 // indirect
-	github.com/mailru/easyjson v0.7.0 // indirect
-	github.com/mattn/go-isatty v0.0.12 // indirect
-	github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
+	github.com/klauspost/cpuid/v2 v2.2.4 // indirect
+	github.com/kr/pretty v0.3.1 // indirect
+	github.com/kr/text v0.2.0 // indirect
+	github.com/leodido/go-urn v1.2.3 // indirect
+	github.com/mailru/easyjson v0.7.7 // indirect
+	github.com/mattn/go-colorable v0.1.13 // indirect
+	github.com/mattn/go-isatty v0.0.18 // indirect
+	github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
+	github.com/mitchellh/mapstructure v1.5.0 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
-	github.com/modern-go/reflect2 v1.0.1 // indirect
-	github.com/onsi/gomega v1.10.2 // indirect
+	github.com/modern-go/reflect2 v1.0.2 // indirect
+	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
+	github.com/panjf2000/ants/v2 v2.7.3 // indirect
 	github.com/patrickmn/go-cache v2.1.0+incompatible // indirect
+	github.com/pelletier/go-toml/v2 v2.0.7 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/projectcalico/go-json v0.0.0-20161128004156-6219dc7339ba // indirect
 	github.com/projectcalico/go-yaml-wrapper v0.0.0-20191112210931-090425220c54 // indirect
-	github.com/prometheus/client_model v0.2.0 // indirect
-	github.com/prometheus/common v0.10.0 // indirect
-	github.com/prometheus/procfs v0.1.3 // indirect
-	github.com/russross/blackfriday/v2 v2.0.1 // indirect
-	github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect
+	github.com/prometheus/client_model v0.3.0 // indirect
+	github.com/prometheus/common v0.42.0 // indirect
+	github.com/prometheus/procfs v0.9.0 // indirect
+	github.com/rogpeppe/go-internal v1.10.0 // indirect
+	github.com/rs/zerolog v1.29.1 // indirect
+	github.com/russross/blackfriday/v2 v2.1.0 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
-	github.com/stretchr/objx v0.2.0 // indirect
-	github.com/ugorji/go/codec v1.1.7 // indirect
-	github.com/vishvananda/netns v0.0.0-20210104183010-2eb08e3e575f // indirect
-	go.uber.org/atomic v1.6.0 // indirect
-	go.uber.org/multierr v1.5.0 // indirect
-	go.uber.org/zap v1.15.0 // indirect
-	golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83 // indirect
+	github.com/stretchr/objx v0.5.0 // indirect
+	github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
+	github.com/ugorji/go/codec v1.2.11 // indirect
+	github.com/vishvananda/netns v0.0.4 // indirect
+	github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect
+	go.etcd.io/etcd/api/v3 v3.5.8 // indirect
+	go.etcd.io/etcd/client/pkg/v3 v3.5.8 // indirect
+	go.uber.org/atomic v1.10.0 // indirect
+	go.uber.org/goleak v1.2.1 // indirect
+	go.uber.org/multierr v1.11.0 // indirect
+	go.uber.org/zap v1.24.0 // indirect
+	golang.org/x/arch v0.3.0 // indirect
+	golang.org/x/crypto v0.8.0 // indirect
 	golang.org/x/net v0.10.0 // indirect
-	golang.org/x/oauth2 v0.6.0 // indirect
-	golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
+	golang.org/x/oauth2 v0.7.0 // indirect
+	golang.org/x/sync v0.1.0 // indirect
 	golang.org/x/term v0.8.0 // indirect
 	golang.org/x/text v0.9.0 // indirect
-	golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba // indirect
-	golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
-	golang.zx2c4.com/wireguard/wgctrl v0.0.0-20200324154536-ceff61240acf // indirect
+	golang.org/x/time v0.3.0 // indirect
+	golang.zx2c4.com/wireguard/wgctrl v0.0.0-20230215201556-9c5414ab4bde // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 	google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 // indirect
 	google.golang.org/protobuf v1.30.0 // indirect
-	gopkg.in/go-playground/validator.v9 v9.29.1 // indirect
+	gopkg.in/go-playground/validator.v9 v9.31.0 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
-	gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
-	k8s.io/api v0.21.0 // indirect
-	k8s.io/client-go v0.21.0 // indirect
-	k8s.io/klog/v2 v2.8.0 // indirect
-	k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e // 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
+	gopkg.in/yaml.v3 v3.0.1 // indirect
+	k8s.io/api v0.26.3 // indirect
+	k8s.io/client-go v0.26.3 // indirect
+	k8s.io/klog/v2 v2.90.1 // indirect
+	k8s.io/kube-openapi v0.0.0-20230303024457-afdc3dddf62d // indirect
+	k8s.io/utils v0.0.0-20230406110748-d93618cff8a2 // indirect
+	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
+	sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
+	sigs.k8s.io/yaml v1.3.0 // indirect
 )
 
 replace (
-	github.com/projectcalico/libcalico-go => github.com/projectcalico/calico v1.7.1-libcalico-go.0.20211201231514-3402eca9d274
-	google.golang.org/grpc => google.golang.org/grpc v1.29.1
-	k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20210305001622-591a79e4bda7
+	github.com/Microsoft/hcsshim => github.com/projectcalico/hcsshim v0.8.9-calico
+	github.com/coreos/bbolt => go.etcd.io/bbolt v1.3.7
+	github.com/envoyproxy/data-plane-api => github.com/projectcalico/data-plane-api v0.0.0-20210121211707-a620ff3c8f7e
+	github.com/projectcalico/api => github.com/projectcalico/calico/api v0.0.0-20230510161715-15d193738928
+	github.com/projecteru2/libyavirt => ../libyavirt
+
+	go.etcd.io/bbolt => github.com/coreos/bbolt v1.3.7
+
+	google.golang.org/grpc/naming => google.golang.org/grpc v1.29.1
+	k8s.io/api => k8s.io/api v0.26.3
+	k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.26.3
+	k8s.io/apimachinery => k8s.io/apimachinery v0.26.3
+	k8s.io/apiserver => k8s.io/apiserver v0.26.3
+	k8s.io/cli-runtime => k8s.io/cli-runtime v0.26.3
+	k8s.io/client-go => k8s.io/client-go v0.26.3
+	k8s.io/cloud-provider => k8s.io/cloud-provider v0.26.3
+	k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.26.3
+	k8s.io/code-generator => k8s.io/code-generator v0.26.3
+	k8s.io/component-base => k8s.io/component-base v0.26.3
+	k8s.io/component-helpers => k8s.io/component-helpers v0.26.3
+	k8s.io/controller-manager => k8s.io/controller-manager v0.26.3
+	k8s.io/cri-api => k8s.io/cri-api v0.26.3
+	k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.26.3
+	k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.26.3
+	k8s.io/kms => k8s.io/kms v0.26.3
+	k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.26.3
+	k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.26.3
+	k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20230224204131-30e856af5c3e
+	k8s.io/kube-proxy => k8s.io/kube-proxy v0.26.3
+	k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.26.3
+	k8s.io/kubectl => k8s.io/kubectl v0.26.3
+	k8s.io/kubelet => k8s.io/kubelet v0.26.3
+
+	// Need replacements for all the k8s subsidiary projects that are pulled in indirectly because
+	// the kubernets repo pulls them in via a replacement to its own vendored copies, which doesn't work for
+	// transient imports.
+	k8s.io/kubernetes => k8s.io/kubernetes v1.26.3
+	k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.26.3
+	k8s.io/metrics => k8s.io/metrics v0.26.3
+	k8s.io/mount-utils => k8s.io/mount-utils v0.26.3
+	k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.26.3
+	k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.26.3
 )