Skip to content

Commit

Permalink
Upgrate to vpp-agent v3
Browse files Browse the repository at this point in the history 
Signed-off-by: Milan Lenco <milan.lenco@pantheon.tech>
  • Loading branch information
Milan Lenco committed Feb 11, 2020
1 parent 3966f03 commit 29b2f5f
Show file tree
Hide file tree
Showing 63 changed files with 553 additions and 375 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ git:
depth: 1

go:
- 1.12.9
- 1.13.1

cache:
directories:
Expand Down
32 changes: 16 additions & 16 deletions cmd/contiv-agent/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,22 +46,22 @@ import (
"github.com/contiv/vpp/plugins/sfc"
"github.com/contiv/vpp/plugins/statscollector"

"go.ligato.io/vpp-agent/v2/plugins/govppmux"
"go.ligato.io/vpp-agent/v2/plugins/kvscheduler"
linux_ifplugin "go.ligato.io/vpp-agent/v2/plugins/linux/ifplugin"
linux_iptablesplugin "go.ligato.io/vpp-agent/v2/plugins/linux/iptablesplugin"
linux_l3plugin "go.ligato.io/vpp-agent/v2/plugins/linux/l3plugin"
linux_nsplugin "go.ligato.io/vpp-agent/v2/plugins/linux/nsplugin"
rest_plugin "go.ligato.io/vpp-agent/v2/plugins/restapi"
"go.ligato.io/vpp-agent/v2/plugins/telemetry"
vpp_aclplugin "go.ligato.io/vpp-agent/v2/plugins/vpp/aclplugin"
vpp_ifplugin "go.ligato.io/vpp-agent/v2/plugins/vpp/ifplugin"
vpp_l2plugin "go.ligato.io/vpp-agent/v2/plugins/vpp/l2plugin"
vpp_l3plugin "go.ligato.io/vpp-agent/v2/plugins/vpp/l3plugin"
vpp_natplugin "go.ligato.io/vpp-agent/v2/plugins/vpp/natplugin"
vpp_puntplugin "go.ligato.io/vpp-agent/v2/plugins/vpp/puntplugin"
vpp_srplugin "go.ligato.io/vpp-agent/v2/plugins/vpp/srplugin"
vpp_stnplugin "go.ligato.io/vpp-agent/v2/plugins/vpp/stnplugin"
"go.ligato.io/vpp-agent/v3/plugins/govppmux"
"go.ligato.io/vpp-agent/v3/plugins/kvscheduler"
linux_ifplugin "go.ligato.io/vpp-agent/v3/plugins/linux/ifplugin"
linux_iptablesplugin "go.ligato.io/vpp-agent/v3/plugins/linux/iptablesplugin"
linux_l3plugin "go.ligato.io/vpp-agent/v3/plugins/linux/l3plugin"
linux_nsplugin "go.ligato.io/vpp-agent/v3/plugins/linux/nsplugin"
rest_plugin "go.ligato.io/vpp-agent/v3/plugins/restapi"
"go.ligato.io/vpp-agent/v3/plugins/telemetry"
vpp_aclplugin "go.ligato.io/vpp-agent/v3/plugins/vpp/aclplugin"
vpp_ifplugin "go.ligato.io/vpp-agent/v3/plugins/vpp/ifplugin"
vpp_l2plugin "go.ligato.io/vpp-agent/v3/plugins/vpp/l2plugin"
vpp_l3plugin "go.ligato.io/vpp-agent/v3/plugins/vpp/l3plugin"
vpp_natplugin "go.ligato.io/vpp-agent/v3/plugins/vpp/natplugin"
vpp_puntplugin "go.ligato.io/vpp-agent/v3/plugins/vpp/puntplugin"
vpp_srplugin "go.ligato.io/vpp-agent/v3/plugins/vpp/srplugin"
vpp_stnplugin "go.ligato.io/vpp-agent/v3/plugins/vpp/stnplugin"
)

const (
Expand Down
8 changes: 4 additions & 4 deletions cmd/contiv-crd/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@ import (
"github.com/ligato/cn-infra/servicelabel"

// load all VPP-agent models for CustomConfiguration CRD handler to use
_ "go.ligato.io/vpp-agent/v2/proto/ligato/linux"
_ "go.ligato.io/vpp-agent/v2/proto/ligato/linux/iptables"
_ "go.ligato.io/vpp-agent/v2/proto/ligato/vpp"
_ "go.ligato.io/vpp-agent/v2/proto/ligato/vpp/srv6"
_ "go.ligato.io/vpp-agent/v3/proto/ligato/linux"
_ "go.ligato.io/vpp-agent/v3/proto/ligato/linux/iptables"
_ "go.ligato.io/vpp-agent/v3/proto/ligato/vpp"
_ "go.ligato.io/vpp-agent/v3/proto/ligato/vpp/srv6"
)

// ContivCRD is a custom resource to provide Contiv-VPP telemetry information.
Expand Down
78 changes: 40 additions & 38 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,32 +3,32 @@ module github.com/contiv/vpp
go 1.13

require (
git.fd.io/govpp.git v0.2.1-0.20191115113328-e45d8802fd8d
git.fd.io/govpp.git v0.2.1-0.20200131102335-2df59463fcbb
github.com/Microsoft/go-winio v0.4.12 // indirect
github.com/apparentlymart/go-cidr v0.0.0-20170616213631-2bd8b58cf427
github.com/boltdb/bolt v1.3.2-0.20180302180052-fd01fc79c553 // indirect
github.com/containerd/continuity v0.0.0-20181203112020-004b46473808 // indirect
github.com/containernetworking/cni v0.7.1
github.com/containernetworking/plugins v0.7.5
github.com/coreos/etcd v3.3.13+incompatible // indirect
github.com/docker/docker v1.4.2-0.20180620002508-3dfb26ab3cbf // indirect
github.com/docker/go-connections v0.4.0 // indirect
github.com/docker/libnetwork v0.8.0-dev.2.0.20180726175142-9ffeaf7d8b64 // indirect
github.com/evanphx/json-patch v4.5.0+incompatible // indirect
github.com/fluent/fluent-logger-golang v1.4.0 // indirect
github.com/fsouza/go-dockerclient v1.2.2
github.com/ghodss/yaml v1.0.0
github.com/go-errors/errors v1.0.1
github.com/golang/protobuf v1.3.2
github.com/golang/protobuf v1.3.3
github.com/google/go-cmp v0.3.1 // indirect
github.com/googleapis/gnostic v0.2.0 // indirect
github.com/gorilla/mux v1.7.1 // indirect
github.com/imdario/mergo v0.3.7 // indirect
github.com/ligato/cn-infra v2.2.1-0.20191030081411-42c7431fdca1+incompatible
github.com/namsral/flag v1.7.4-pre
github.com/onsi/gomega v1.5.0
github.com/pkg/errors v0.8.1
github.com/prometheus/client_golang v0.9.3
github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90
github.com/onsi/gomega v1.7.0
github.com/pkg/errors v0.9.1
github.com/prometheus/client_golang v1.0.0
github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4
github.com/safchain/ethtool v0.0.0-20170622225139-7ff1ba29eca2
github.com/satori/go.uuid v1.2.1-0.20181028125025-b2ce2384e17b // indirect
github.com/sirupsen/logrus v1.4.2
Expand All @@ -37,41 +37,43 @@ require (
github.com/unrolled/render v1.0.1-0.20190325150441-1ac792296fd4
github.com/vishvananda/netlink v1.0.1-0.20190319163122-f504738125a5
github.com/wadey/gocovmerge v0.0.0-20160331181800-b5bfa59ec0ad // indirect
go.ligato.io/vpp-agent/v2 v2.5.0-alpha.0.20200108085843-0e2148d3dd11
golang.org/x/net v0.0.0-20190918130420-a8b05e9114ab
golang.org/x/sys v0.0.0-20200107162124-548cf772de50
google.golang.org/grpc v1.24.0
gopkg.in/inf.v0 v0.9.1 // indirect
k8s.io/api v0.0.0
go.ligato.io/vpp-agent/v3 v3.0.0
golang.org/x/net v0.0.0-20191004110552-13f9640d40b9
golang.org/x/sys v0.0.0-20200117145432-59e60aa80a0c
google.golang.org/grpc v1.27.0
k8s.io/api v0.17.1
k8s.io/apiextensions-apiserver v0.0.0
k8s.io/apimachinery v0.0.0
k8s.io/client-go v0.0.0
k8s.io/kubernetes v1.16.0
k8s.io/apimachinery v0.17.1
k8s.io/client-go v11.0.0+incompatible
k8s.io/kubelet v0.0.0
k8s.io/kubernetes v1.17.1
)

// pin kubernetes version to 1.16
replace (
k8s.io/api => k8s.io/api v0.0.0-20191004120104-195af9ec3521
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.0.0-20191205124210-07afe84a85e4
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20191028221656-72ed19daf4bb
k8s.io/apiserver => k8s.io/apiserver v0.0.0-20191205122933-ebfe712c1fff
k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20191004123735-6bff60de4370
k8s.io/client-go => k8s.io/client-go v0.0.0-20191114101535-6c5935290e33
k8s.io/cloud-provider => k8s.io/cloud-provider v0.0.0-20191004125000-f72359dfc58e
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.0.0-20191004124811-493ca03acbc1
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20191004115455-8e001e5d1894
k8s.io/component-base => k8s.io/component-base v0.0.0-20191004121439-41066ddd0b23
k8s.io/cri-api => k8s.io/cri-api v0.0.0-20190828162817-608eb1dad4ac
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.0.0-20191004125145-7118cc13aa0a
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.0.0-20191205123210-2c2890b1bb12
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.0.0-20191004124629-b9859bb1ce71
k8s.io/kube-proxy => k8s.io/kube-proxy v0.0.0-20191004124112-c4ee2f9e1e0a
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.0.0-20191004124444-89f3bbd82341
k8s.io/kubectl => k8s.io/kubectl v0.0.0-20191004125858-14647fd13a8b
k8s.io/kubelet => k8s.io/kubelet v0.0.0-20191004124258-ac1ea479bd3a
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.0.0-20191207050024-0fd2720a0db9
k8s.io/metrics => k8s.io/metrics v0.0.0-20191004123543-798934cf5e10
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.0.0-20191205123445-8deb8ea9603c
k8s.io/api => k8s.io/api v0.17.1
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.17.1
k8s.io/apimachinery => k8s.io/apimachinery v0.17.1
k8s.io/apiserver => k8s.io/apiserver v0.17.1
k8s.io/cli-runtime => k8s.io/cli-runtime v0.17.1
k8s.io/client-go => k8s.io/client-go v0.17.1
k8s.io/cloud-provider => k8s.io/cloud-provider v0.17.1
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.17.1
k8s.io/code-generator => k8s.io/code-generator v0.17.1
k8s.io/component-base => k8s.io/component-base v0.17.1
k8s.io/cri-api => k8s.io/cri-api v0.17.1
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.17.1
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.17.1
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.17.1
k8s.io/kube-proxy => k8s.io/kube-proxy v0.17.1
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.17.1
k8s.io/kubectl => k8s.io/kubectl v0.17.1
k8s.io/kubelet => k8s.io/kubelet v0.17.1
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.17.1
k8s.io/metrics => k8s.io/metrics v0.17.1
k8s.io/node-api => k8s.io/node-api v0.17.1
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.17.1
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.17.1
k8s.io/sample-controller => k8s.io/sample-controller v0.17.1
)

// fix compatibility issue in containernetworking
Expand Down
Loading

0 comments on commit 29b2f5f

Please sign in to comment.