From b9e8a4a94756df17b70c78b577d7e1a5cd14ac8c Mon Sep 17 00:00:00 2001 From: Ivan Kolodyazhny Date: Tue, 4 Oct 2022 14:23:51 +0300 Subject: [PATCH 1/3] Delete outdated Dockerfile.rhel7 file --- Dockerfile.rhel7 | 17 ----------------- 1 file changed, 17 deletions(-) delete mode 100644 Dockerfile.rhel7 diff --git a/Dockerfile.rhel7 b/Dockerfile.rhel7 deleted file mode 100644 index b59bd2a..0000000 --- a/Dockerfile.rhel7 +++ /dev/null @@ -1,17 +0,0 @@ -FROM registry.svc.ci.openshift.org/ocp/builder:golang-1.13 AS builder - -COPY . /usr/src/ib-sriov-cni - -WORKDIR /usr/src/ib-sriov-cni -RUN make clean && \ - make build - -FROM registry.svc.ci.openshift.org/ocp/4.0:base -COPY --from=builder /usr/src/ib-sriov-cni/build/ib-sriov /usr/bin/ -WORKDIR / - -LABEL io.k8s.display-name="InfiniBand SR-IOV CNI" - -COPY ./images/entrypoint.sh / - -ENTRYPOINT ["/entrypoint.sh"] From 3484113fbbe8abb0cc1f0fb09bcd6bf892cf0767 Mon Sep 17 00:00:00 2001 From: Ivan Kolodyazhny Date: Tue, 24 Jan 2023 16:34:38 +0200 Subject: [PATCH 2/3] Bump golang to 1.19 --- .github/workflows/buildtest.yml | 4 +-- Dockerfile | 2 +- Dockerfile.ppc64le | 2 +- Makefile | 21 +++++------- cmd/ib-sriov-cni/main.go | 5 +-- go.mod | 23 ++++++++++--- pkg/utils/testing.go | 14 +++++--- pkg/utils/utils.go | 21 +++++++----- vendor/github.com/Mellanox/rdmamap/go.mod | 8 ----- vendor/github.com/Mellanox/rdmamap/go.sum | 6 ---- vendor/github.com/Mellanox/sriovnet/go.mod | 10 ------ vendor/github.com/Mellanox/sriovnet/go.sum | 35 -------------------- vendor/github.com/google/uuid/go.mod | 1 - vendor/github.com/onsi/ginkgo/go.mod | 9 ----- vendor/github.com/onsi/ginkgo/go.sum | 26 --------------- vendor/github.com/onsi/gomega/go.mod | 17 ---------- vendor/github.com/onsi/gomega/go.sum | 26 --------------- vendor/github.com/spf13/afero/go.mod | 9 ----- vendor/github.com/spf13/afero/go.sum | 29 ---------------- vendor/github.com/stretchr/objx/go.mod | 8 ----- vendor/github.com/stretchr/objx/go.sum | 8 ----- vendor/github.com/vishvananda/netlink/go.mod | 8 ----- vendor/github.com/vishvananda/netlink/go.sum | 4 --- vendor/github.com/vishvananda/netns/go.mod | 3 -- vendor/github.com/vishvananda/netns/go.sum | 0 vendor/golang.org/x/xerrors/go.mod | 3 -- vendor/gopkg.in/yaml.v2/go.mod | 5 --- vendor/modules.txt | 26 +++++++++++++++ 28 files changed, 82 insertions(+), 251 deletions(-) delete mode 100644 vendor/github.com/Mellanox/rdmamap/go.mod delete mode 100644 vendor/github.com/Mellanox/rdmamap/go.sum delete mode 100644 vendor/github.com/Mellanox/sriovnet/go.mod delete mode 100644 vendor/github.com/Mellanox/sriovnet/go.sum delete mode 100644 vendor/github.com/google/uuid/go.mod delete mode 100644 vendor/github.com/onsi/ginkgo/go.mod delete mode 100644 vendor/github.com/onsi/ginkgo/go.sum delete mode 100644 vendor/github.com/onsi/gomega/go.mod delete mode 100644 vendor/github.com/onsi/gomega/go.sum delete mode 100644 vendor/github.com/spf13/afero/go.mod delete mode 100644 vendor/github.com/spf13/afero/go.sum delete mode 100644 vendor/github.com/stretchr/objx/go.mod delete mode 100644 vendor/github.com/stretchr/objx/go.sum delete mode 100644 vendor/github.com/vishvananda/netlink/go.mod delete mode 100644 vendor/github.com/vishvananda/netlink/go.sum delete mode 100644 vendor/github.com/vishvananda/netns/go.mod delete mode 100644 vendor/github.com/vishvananda/netns/go.sum delete mode 100644 vendor/golang.org/x/xerrors/go.mod delete mode 100644 vendor/gopkg.in/yaml.v2/go.mod diff --git a/.github/workflows/buildtest.yml b/.github/workflows/buildtest.yml index 966c823..6be04fe 100644 --- a/.github/workflows/buildtest.yml +++ b/.github/workflows/buildtest.yml @@ -9,8 +9,8 @@ jobs: build: strategy: matrix: - go-version: [1.13.x, 1.14.x, 1.15.x, 1.16.x] - os: [ubuntu-20.04] + go-version: [1.19.x] + os: [ubuntu-22.04] runs-on: ${{ matrix.os }} env: GO111MODULE: on diff --git a/Dockerfile b/Dockerfile index 3d285fa..1f635e9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:alpine as builder +FROM golang:1.19-alpine as builder COPY . /usr/src/ib-sriov-cni diff --git a/Dockerfile.ppc64le b/Dockerfile.ppc64le index 43ca310..6f5d0b0 100644 --- a/Dockerfile.ppc64le +++ b/Dockerfile.ppc64le @@ -1,4 +1,4 @@ -FROM ppc64le/golang:alpine as builder +FROM ppc64le/golang:1.19-alpine as builder COPY . /usr/src/ib-sriov-cni diff --git a/Makefile b/Makefile index d489633..8fde4ed 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ # Package related BINARY_NAME=ib-sriov PACKAGE=ib-sriov-cni -ORG_PATH=github.com/Mellanox +ORG_PATH=github.com/k8snetworkplumbingwg REPO_PATH=$(ORG_PATH)/$(PACKAGE) GOPATH=$(CURDIR)/.gopath GOBIN =$(CURDIR)/bin @@ -24,7 +24,7 @@ LDFLAGS="-X main.version=$(VERSION) -X main.commit=$(COMMIT) -X main.date=$(DATE IMAGE_BUILDER?=@docker IMAGEDIR=$(BASE)/images DOCKERFILE?=$(CURDIR)/Dockerfile -TAG?=mellanox/ib-sriov-cni +TAG?=k8snetworkplumbingwg/ib-sriov-cni IMAGE_BUILD_OPTS?= # Accept proxy settings for docker # To pass proxy for Docker invoke it as 'make image HTTP_POXY=http://192.168.0.1:8080' @@ -43,7 +43,7 @@ GOLANGCI_LINT = $(GOBIN)/golangci-lint # golangci-lint version should be updated periodically # we keep it fixed to avoid it from unexpectedly failing on the project # in case of a version bump -GOLANGCI_LINT_VER = v1.23.8 +GOLANGCI_LINT_VER = v1.46.2 TIMEOUT = 15 Q = $(if $(filter 1,$V),,@) @@ -67,22 +67,19 @@ $(BUILDDIR)/$(BINARY_NAME): $(GOFILES) | $(BUILDDIR) @cd $(BASE)/cmd/$(PACKAGE) && CGO_ENABLED=0 $(GO) build -o $(BUILDDIR)/$(BINARY_NAME) -tags no_openssl -ldflags $(LDFLAGS) -v # Tools -$(GOLANGCI_LINT): | $(BASE) ; $(info building golangci-lint...) - $Q curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(GOBIN) $(GOLANGCI_LINT_VER) +$(GOLANGCI_LINT): ; $(info installing golangci-lint...) + $Q go install github.com/golangci/golangci-lint/cmd/golangci-lint@$(GOLANGCI_LINT_VER) + GOVERALLS = $(GOBIN)/goveralls $(GOBIN)/goveralls: | $(BASE) ; $(info building goveralls...) - $Q go get github.com/mattn/goveralls + $Q go install github.com/mattn/goveralls # Tests .PHONY: lint -lint: | $(BASE) $(GOLANGCI_LINT) ; $(info running golangci-lint...) @ ## Run golangci-lint - $Q mkdir -p $(BASE)/test - $Q cd $(BASE) && ret=0 && \ - test -z "$$($(GOLANGCI_LINT) run | tee $(BASE)/test/lint.out)" || ret=1 ; \ - cat $(BASE)/test/lint.out ; rm -rf $(BASE)/test ; \ - exit $$ret +lint: | $(GOLANGCI_LINT) ; $(info running golangci-lint...) @ ## Run golangci-lint + $Q $(GOLANGCI_LINT) run --timeout=5m TEST_TARGETS := test-default test-bench test-short test-verbose test-race .PHONY: $(TEST_TARGETS) test-xml check test tests diff --git a/cmd/ib-sriov-cni/main.go b/cmd/ib-sriov-cni/main.go index 8e05c16..14d4081 100644 --- a/cmd/ib-sriov-cni/main.go +++ b/cmd/ib-sriov-cni/main.go @@ -65,7 +65,7 @@ func lockCNIExecution() (*flock.Flock, error) { // As the mapping of RDMA resources is done in Device plugin prior to CNI invocation, it must not change here. // We serialize the CNI's operation causing kernel to allocate the VF's RDMA resources under the same name. // In the future, Systems should use udev PCI based RDMA device names, ensuring consistent RDMA resources names. - err := os.MkdirAll(config.CniFileLockDir, 0700) + err := os.MkdirAll(config.CniFileLockDir, utils.OwnerReadWriteExecuteAttrs) if err != nil { return nil, fmt.Errorf("failed to create ib-sriov-cni lock file directory(%q): %v", config.CniFileLockDir, err) } @@ -300,7 +300,8 @@ func cmdDel(args *skel.CmdArgs) error { if err != nil { // According to the CNI spec, a DEL action should complete without errors // even if there are some resources missing. For more details, see - // https://github.com/containernetworking/cni/blob/main/SPEC.md#del-remove-container-from-network-or-un-apply-modifications + //nolint + // https://github.com/containernetworking/cni/blob/main/SPEC.md#del-remove-container-from-network-or-un-apply-modifications return nil } diff --git a/go.mod b/go.mod index 726e5e5..fb2ad97 100644 --- a/go.mod +++ b/go.mod @@ -1,20 +1,35 @@ module github.com/Mellanox/ib-sriov-cni -go 1.13 +go 1.19 require ( github.com/Mellanox/rdma-cni v1.0.1 github.com/Mellanox/sriovnet v1.0.2 github.com/containernetworking/cni v0.8.1 github.com/containernetworking/plugins v0.8.5 - github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect github.com/gofrs/flock v0.7.1 github.com/onsi/ginkgo v1.12.0 github.com/onsi/gomega v1.9.0 - github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect - github.com/stretchr/objx v0.2.1-0.20190415111823-35313a95ee26 // indirect github.com/stretchr/testify v1.5.1 github.com/vishvananda/netlink v1.1.0 +) + +require ( + github.com/Mellanox/rdmamap v1.0.0 // indirect + github.com/coreos/go-iptables v0.4.5 // indirect + github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect + github.com/google/uuid v1.1.1 // indirect + github.com/hpcloud/tail v1.0.0 // indirect + github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect + github.com/safchain/ethtool v0.0.0-20190326074333-42ed695e3de8 // indirect + github.com/spf13/afero v1.4.1 // indirect + github.com/stretchr/objx v0.2.1-0.20190415111823-35313a95ee26 // indirect + github.com/vishvananda/netns v0.0.0-20191106174202-0a2b9b5464df // indirect + golang.org/x/net v0.0.0-20190620200207-3b0461eec859 // indirect + golang.org/x/sys v0.0.0-20200327173247-9dae0f8f5775 // indirect golang.org/x/text v0.3.7 // indirect + golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7 // indirect + gopkg.in/fsnotify.v1 v1.4.7 // indirect + gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect gopkg.in/yaml.v2 v2.2.8 // indirect ) diff --git a/pkg/utils/testing.go b/pkg/utils/testing.go index c4e2777..ecd2dd6 100644 --- a/pkg/utils/testing.go +++ b/pkg/utils/testing.go @@ -7,11 +7,15 @@ package utils import ( - "io/ioutil" "os" "path/filepath" ) +const ( + OwnerReadWriteExecuteOthersReadExecuteAttrs = 0755 + OwnerReadWriteOthersReadAttrs = 0644 +) + func check(e error) { if e != nil { panic(e) @@ -75,7 +79,7 @@ func CreateTmpSysFs() error { originalRoot, _ := os.Open("/") ts.originalRoot = originalRoot - tmpdir, ioErr := ioutil.TempDir("/tmp", "ib-sriov-cni-plugin-testfiles-") + tmpdir, ioErr := os.MkdirTemp("/tmp", "ib-sriov-cni-plugin-testfiles-") if ioErr != nil { return ioErr } @@ -83,12 +87,12 @@ func CreateTmpSysFs() error { ts.dirRoot = tmpdir for _, dir := range ts.dirList { - if err := os.MkdirAll(filepath.Join(ts.dirRoot, dir), 0755); err != nil { + if err := os.MkdirAll(filepath.Join(ts.dirRoot, dir), OwnerReadWriteExecuteOthersReadExecuteAttrs); err != nil { return err } } for filename, body := range ts.fileList { - if err := ioutil.WriteFile(filepath.Join(ts.dirRoot, filename), body, 0644); err != nil { + if err := os.WriteFile(filepath.Join(ts.dirRoot, filename), body, OwnerReadWriteOthersReadAttrs); err != nil { return err } } @@ -117,7 +121,7 @@ func CreateTmpSysFs() error { } func createSymlinks(link, target string) error { - if err := os.MkdirAll(target, 0755); err != nil { + if err := os.MkdirAll(target, OwnerReadWriteExecuteOthersReadExecuteAttrs); err != nil { return err } if err := os.Symlink(target, link); err != nil { diff --git a/pkg/utils/utils.go b/pkg/utils/utils.go index fe56062..52f52a7 100644 --- a/pkg/utils/utils.go +++ b/pkg/utils/utils.go @@ -3,7 +3,6 @@ package utils import ( "encoding/json" "fmt" - "io/ioutil" "net" "os" "path/filepath" @@ -20,7 +19,11 @@ var ( SysBusPci = "/sys/bus/pci/devices" ) -const IPoIBAddrLengthBytes = 20 +const ( + IPoIBAddrLengthBytes = 20 + OwnerReadWriteExecuteAttrs = 0700 + OwnerReadWriteAttrs = 0600 +) // GetSriovNumVfs takes in a PF name(ifName) as string and returns number of VF configured as int func GetSriovNumVfs(ifName string) (int, error) { @@ -31,7 +34,7 @@ func GetSriovNumVfs(ifName string) (int, error) { return vfTotal, fmt.Errorf("failed to open the sriov_numfs of device %q: %v", ifName, err) } - data, err := ioutil.ReadFile(sriovFile) + data, err := os.ReadFile(sriovFile) if err != nil { return vfTotal, fmt.Errorf("failed to read the sriov_numfs of device %q: %v", ifName, err) } @@ -82,7 +85,7 @@ func GetPfName(vf string) (string, error) { return "", err } - files, err := ioutil.ReadDir(pfSymLink) + files, err := os.ReadDir(pfSymLink) if err != nil { return "", err } @@ -123,7 +126,7 @@ func GetVFLinkNames(pciAddr string) (string, error) { return "", err } - fInfos, err := ioutil.ReadDir(vfDir) + fInfos, err := os.ReadDir(vfDir) if err != nil { return "", fmt.Errorf("failed to read net dir of the device %s: %v", pciAddr, err) } @@ -147,7 +150,7 @@ func GetVFLinkNamesFromVFID(pfName string, vfID int) ([]string, error) { return nil, err } - fInfos, err := ioutil.ReadDir(vfDir) + fInfos, err := os.ReadDir(vfDir) if err != nil { return nil, fmt.Errorf("failed to read the virtfn%d dir of the device %q: %v", vfID, pfName, err) } @@ -181,13 +184,13 @@ func SaveNetConf(cid, dataDir, podIfName string, conf interface{}) error { } func saveScratchNetConf(containerID, dataDir string, netconf []byte) error { - if err := os.MkdirAll(dataDir, 0700); err != nil { + if err := os.MkdirAll(dataDir, OwnerReadWriteExecuteAttrs); err != nil { return fmt.Errorf("failed to create the sriov data directory(%q): %v", dataDir, err) } path := filepath.Join(dataDir, containerID) - err := ioutil.WriteFile(path, netconf, 0600) + err := os.WriteFile(path, netconf, OwnerReadWriteAttrs) if err != nil { return fmt.Errorf("failed to write container data in the path(%q): %v", path, err) } @@ -197,7 +200,7 @@ func saveScratchNetConf(containerID, dataDir string, netconf []byte) error { // ReadScratchNetConf takes in container ID, Pod interface name and data dir as string and returns a pointer to Conf func ReadScratchNetConf(cRefPath string) ([]byte, error) { - data, err := ioutil.ReadFile(cRefPath) + data, err := os.ReadFile(cRefPath) if err != nil { return nil, fmt.Errorf("failed to read container data in the path(%q): %v", cRefPath, err) } diff --git a/vendor/github.com/Mellanox/rdmamap/go.mod b/vendor/github.com/Mellanox/rdmamap/go.mod deleted file mode 100644 index 1a2fbc7..0000000 --- a/vendor/github.com/Mellanox/rdmamap/go.mod +++ /dev/null @@ -1,8 +0,0 @@ -module github.com/Mellanox/rdmamap - -go 1.13 - -require ( - github.com/vishvananda/netlink v1.1.0 - github.com/vishvananda/netns v0.0.0-20191106174202-0a2b9b5464df -) diff --git a/vendor/github.com/Mellanox/rdmamap/go.sum b/vendor/github.com/Mellanox/rdmamap/go.sum deleted file mode 100644 index 3f05898..0000000 --- a/vendor/github.com/Mellanox/rdmamap/go.sum +++ /dev/null @@ -1,6 +0,0 @@ -github.com/vishvananda/netlink v1.1.0 h1:1iyaYNBLmP6L0220aDnYQpo1QEV4t4hJ+xEEhhJH8j0= -github.com/vishvananda/netlink v1.1.0/go.mod h1:cTgwzPIzzgDAYoQrMm0EdrjRUBkTqKYppBueQtXaqoE= -github.com/vishvananda/netns v0.0.0-20191106174202-0a2b9b5464df h1:OviZH7qLw/7ZovXvuNyL3XQl8UFofeikI1NW1Gypu7k= -github.com/vishvananda/netns v0.0.0-20191106174202-0a2b9b5464df/go.mod h1:JP3t17pCcGlemwknint6hfoeCVQrEMVwxRLRjXpq+BU= -golang.org/x/sys v0.0.0-20190606203320-7fc4e5ec1444 h1:/d2cWp6PSamH4jDPFLyO150psQdqvtoNX8Zjg3AQ31g= -golang.org/x/sys v0.0.0-20190606203320-7fc4e5ec1444/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= diff --git a/vendor/github.com/Mellanox/sriovnet/go.mod b/vendor/github.com/Mellanox/sriovnet/go.mod deleted file mode 100644 index 626663c..0000000 --- a/vendor/github.com/Mellanox/sriovnet/go.mod +++ /dev/null @@ -1,10 +0,0 @@ -module github.com/Mellanox/sriovnet - -go 1.13 - -require ( - github.com/google/uuid v1.1.1 - github.com/spf13/afero v1.4.1 - github.com/stretchr/testify v1.5.1 - github.com/vishvananda/netlink v1.1.0 -) diff --git a/vendor/github.com/Mellanox/sriovnet/go.sum b/vendor/github.com/Mellanox/sriovnet/go.sum deleted file mode 100644 index 5c22592..0000000 --- a/vendor/github.com/Mellanox/sriovnet/go.sum +++ /dev/null @@ -1,35 +0,0 @@ -github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= -github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/google/uuid v1.1.1 h1:Gkbcsh/GbpXz7lPftLA3P6TYMwjCLYm83jiFQZF/3gY= -github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg= -github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= -github.com/pkg/sftp v1.10.1/go.mod h1:lYOWFsE0bwd1+KfKJaKeuokY15vzFx25BLbzYYoAxZI= -github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= -github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/spf13/afero v1.4.1 h1:asw9sl74539yqavKaglDM5hFpdJVK0Y5Dr/JOgQ89nQ= -github.com/spf13/afero v1.4.1/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z93I= -github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= -github.com/stretchr/testify v1.5.1 h1:nOGnQDM7FYENwehXlg/kFVnos3rEvtKTjRvOWSzb6H4= -github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= -github.com/vishvananda/netlink v1.1.0 h1:1iyaYNBLmP6L0220aDnYQpo1QEV4t4hJ+xEEhhJH8j0= -github.com/vishvananda/netlink v1.1.0/go.mod h1:cTgwzPIzzgDAYoQrMm0EdrjRUBkTqKYppBueQtXaqoE= -github.com/vishvananda/netns v0.0.0-20191106174202-0a2b9b5464df h1:OviZH7qLw/7ZovXvuNyL3XQl8UFofeikI1NW1Gypu7k= -github.com/vishvananda/netns v0.0.0-20191106174202-0a2b9b5464df/go.mod h1:JP3t17pCcGlemwknint6hfoeCVQrEMVwxRLRjXpq+BU= -golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190606203320-7fc4e5ec1444 h1:/d2cWp6PSamH4jDPFLyO150psQdqvtoNX8Zjg3AQ31g= -golang.org/x/sys v0.0.0-20190606203320-7fc4e5ec1444/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg= -golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.3.3 h1:cokOdA+Jmi5PJGXLlLllQSgYigAEfHXJAERHVMaCc2k= -golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= -gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw= -gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= diff --git a/vendor/github.com/google/uuid/go.mod b/vendor/github.com/google/uuid/go.mod deleted file mode 100644 index fc84cd7..0000000 --- a/vendor/github.com/google/uuid/go.mod +++ /dev/null @@ -1 +0,0 @@ -module github.com/google/uuid diff --git a/vendor/github.com/onsi/ginkgo/go.mod b/vendor/github.com/onsi/ginkgo/go.mod deleted file mode 100644 index 15a4ab5..0000000 --- a/vendor/github.com/onsi/ginkgo/go.mod +++ /dev/null @@ -1,9 +0,0 @@ -module github.com/onsi/ginkgo - -require ( - github.com/hpcloud/tail v1.0.0 - github.com/onsi/gomega v1.7.1 - golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e -) - -go 1.12 diff --git a/vendor/github.com/onsi/ginkgo/go.sum b/vendor/github.com/onsi/ginkgo/go.sum deleted file mode 100644 index 29adce4..0000000 --- a/vendor/github.com/onsi/ginkgo/go.sum +++ /dev/null @@ -1,26 +0,0 @@ -github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I= -github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= -github.com/golang/protobuf v1.2.0 h1:P3YflyNX/ehuJFLhxviNdFxQPkGK5cDcApsge1SqnvM= -github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI= -github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= -github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= -github.com/onsi/gomega v1.7.1 h1:K0jcRCwNQM3vFGh1ppMtDh/+7ApJrjldlX8fA0jDTLQ= -github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= -golang.org/x/net v0.0.0-20180906233101-161cd47e91fd h1:nTDtHvHSdCn1m6ITfMRqtOd/9+7a3s8RBNOZ3eYZzJA= -golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f h1:wMNYb4v58l5UBM7MYRLPG6ZhfOqbKu7X5eyFl8ZhKvA= -golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e h1:N7DeIrjYszNmSW409R3frPPwglRwMkXSBzwVbkOjLLA= -golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg= -golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= -gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4= -gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= -gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= -gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= -gopkg.in/yaml.v2 v2.2.4 h1:/eiJrUcujPVeJ3xlSWaiNi3uSVmDGBK1pDHUHAnao1I= -gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= diff --git a/vendor/github.com/onsi/gomega/go.mod b/vendor/github.com/onsi/gomega/go.mod deleted file mode 100644 index 1eb0dfa..0000000 --- a/vendor/github.com/onsi/gomega/go.mod +++ /dev/null @@ -1,17 +0,0 @@ -module github.com/onsi/gomega - -require ( - github.com/fsnotify/fsnotify v1.4.7 // indirect - github.com/golang/protobuf v1.2.0 - github.com/hpcloud/tail v1.0.0 // indirect - github.com/onsi/ginkgo v1.6.0 - golang.org/x/net v0.0.0-20180906233101-161cd47e91fd - golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f // indirect - golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e // indirect - golang.org/x/text v0.3.0 // indirect - golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7 - gopkg.in/fsnotify.v1 v1.4.7 // indirect - gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect - gopkg.in/yaml.v2 v2.2.4 -) - diff --git a/vendor/github.com/onsi/gomega/go.sum b/vendor/github.com/onsi/gomega/go.sum deleted file mode 100644 index b872e8a..0000000 --- a/vendor/github.com/onsi/gomega/go.sum +++ /dev/null @@ -1,26 +0,0 @@ -github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I= -github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= -github.com/golang/protobuf v1.2.0 h1:P3YflyNX/ehuJFLhxviNdFxQPkGK5cDcApsge1SqnvM= -github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI= -github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= -github.com/onsi/ginkgo v1.6.0 h1:Ix8l273rp3QzYgXSR+c8d1fTG7UPgYkOSELPhiY/YGw= -github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= -golang.org/x/net v0.0.0-20180906233101-161cd47e91fd h1:nTDtHvHSdCn1m6ITfMRqtOd/9+7a3s8RBNOZ3eYZzJA= -golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f h1:wMNYb4v58l5UBM7MYRLPG6ZhfOqbKu7X5eyFl8ZhKvA= -golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e h1:o3PsSEY8E4eXWkXrIP9YJALUkVZqzHJT5DOasTyn8Vs= -golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg= -golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7 h1:9zdDQZ7Thm29KFXgAX/+yaf3eVbP7djjWp/dXAppNCc= -golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= -gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4= -gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= -gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= -gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= -gopkg.in/yaml.v2 v2.2.4 h1:/eiJrUcujPVeJ3xlSWaiNi3uSVmDGBK1pDHUHAnao1I= -gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= diff --git a/vendor/github.com/spf13/afero/go.mod b/vendor/github.com/spf13/afero/go.mod deleted file mode 100644 index abe4fe1..0000000 --- a/vendor/github.com/spf13/afero/go.mod +++ /dev/null @@ -1,9 +0,0 @@ -module github.com/spf13/afero - -require ( - github.com/pkg/sftp v1.10.1 - golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586 - golang.org/x/text v0.3.3 -) - -go 1.13 diff --git a/vendor/github.com/spf13/afero/go.sum b/vendor/github.com/spf13/afero/go.sum deleted file mode 100644 index 89d9bfb..0000000 --- a/vendor/github.com/spf13/afero/go.sum +++ /dev/null @@ -1,29 +0,0 @@ -github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= -github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/kr/fs v0.1.0 h1:Jskdu9ieNAYnjxsi0LbQp1ulIKZV1LAFgK1tWhpZgl8= -github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg= -github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I= -github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= -github.com/pkg/sftp v1.10.1 h1:VasscCm72135zRysgrJDKsntdmPN+OuU3+nnHYA9wyc= -github.com/pkg/sftp v1.10.1/go.mod h1:lYOWFsE0bwd1+KfKJaKeuokY15vzFx25BLbzYYoAxZI= -github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= -github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk= -github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= -golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586 h1:7KByu05hhLed2MO29w7p1XfZvZ13m8mub3shuVftRs0= -golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190412213103-97732733099d h1:+R4KGOnez64A81RvjARKc4UT5/tI9ujCIVX+P5KiHuI= -golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg= -golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.3.3 h1:cokOdA+Jmi5PJGXLlLllQSgYigAEfHXJAERHVMaCc2k= -golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= -gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw= -gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= diff --git a/vendor/github.com/stretchr/objx/go.mod b/vendor/github.com/stretchr/objx/go.mod deleted file mode 100644 index 31ec5a7..0000000 --- a/vendor/github.com/stretchr/objx/go.mod +++ /dev/null @@ -1,8 +0,0 @@ -module github.com/stretchr/objx - -go 1.12 - -require ( - github.com/davecgh/go-spew v1.1.1 // indirect - github.com/stretchr/testify v1.3.0 -) diff --git a/vendor/github.com/stretchr/objx/go.sum b/vendor/github.com/stretchr/objx/go.sum deleted file mode 100644 index 4f89841..0000000 --- a/vendor/github.com/stretchr/objx/go.sum +++ /dev/null @@ -1,8 +0,0 @@ -github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= -github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= -github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q= -github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= diff --git a/vendor/github.com/vishvananda/netlink/go.mod b/vendor/github.com/vishvananda/netlink/go.mod deleted file mode 100644 index 09ee60e..0000000 --- a/vendor/github.com/vishvananda/netlink/go.mod +++ /dev/null @@ -1,8 +0,0 @@ -module github.com/vishvananda/netlink - -go 1.12 - -require ( - github.com/vishvananda/netns v0.0.0-20191106174202-0a2b9b5464df - golang.org/x/sys v0.0.0-20190606203320-7fc4e5ec1444 -) diff --git a/vendor/github.com/vishvananda/netlink/go.sum b/vendor/github.com/vishvananda/netlink/go.sum deleted file mode 100644 index 402d14e..0000000 --- a/vendor/github.com/vishvananda/netlink/go.sum +++ /dev/null @@ -1,4 +0,0 @@ -github.com/vishvananda/netns v0.0.0-20191106174202-0a2b9b5464df h1:OviZH7qLw/7ZovXvuNyL3XQl8UFofeikI1NW1Gypu7k= -github.com/vishvananda/netns v0.0.0-20191106174202-0a2b9b5464df/go.mod h1:JP3t17pCcGlemwknint6hfoeCVQrEMVwxRLRjXpq+BU= -golang.org/x/sys v0.0.0-20190606203320-7fc4e5ec1444 h1:/d2cWp6PSamH4jDPFLyO150psQdqvtoNX8Zjg3AQ31g= -golang.org/x/sys v0.0.0-20190606203320-7fc4e5ec1444/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= diff --git a/vendor/github.com/vishvananda/netns/go.mod b/vendor/github.com/vishvananda/netns/go.mod deleted file mode 100644 index 8221f78..0000000 --- a/vendor/github.com/vishvananda/netns/go.mod +++ /dev/null @@ -1,3 +0,0 @@ -module github.com/vishvananda/netns - -go 1.12 diff --git a/vendor/github.com/vishvananda/netns/go.sum b/vendor/github.com/vishvananda/netns/go.sum deleted file mode 100644 index e69de29..0000000 diff --git a/vendor/golang.org/x/xerrors/go.mod b/vendor/golang.org/x/xerrors/go.mod deleted file mode 100644 index 870d4f6..0000000 --- a/vendor/golang.org/x/xerrors/go.mod +++ /dev/null @@ -1,3 +0,0 @@ -module golang.org/x/xerrors - -go 1.11 diff --git a/vendor/gopkg.in/yaml.v2/go.mod b/vendor/gopkg.in/yaml.v2/go.mod deleted file mode 100644 index 1934e87..0000000 --- a/vendor/gopkg.in/yaml.v2/go.mod +++ /dev/null @@ -1,5 +0,0 @@ -module "gopkg.in/yaml.v2" - -require ( - "gopkg.in/check.v1" v0.0.0-20161208181325-20d25e280405 -) diff --git a/vendor/modules.txt b/vendor/modules.txt index 1021f21..df17e8d 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1,12 +1,16 @@ # github.com/Mellanox/rdma-cni v1.0.1 +## explicit; go 1.13 github.com/Mellanox/rdma-cni/pkg/rdma github.com/Mellanox/rdma-cni/pkg/types # github.com/Mellanox/rdmamap v1.0.0 +## explicit; go 1.13 github.com/Mellanox/rdmamap # github.com/Mellanox/sriovnet v1.0.2 +## explicit; go 1.13 github.com/Mellanox/sriovnet github.com/Mellanox/sriovnet/pkg/utils/filesystem # github.com/containernetworking/cni v0.8.1 +## explicit github.com/containernetworking/cni/pkg/invoke github.com/containernetworking/cni/pkg/skel github.com/containernetworking/cni/pkg/types @@ -15,26 +19,33 @@ github.com/containernetworking/cni/pkg/types/current github.com/containernetworking/cni/pkg/utils github.com/containernetworking/cni/pkg/version # github.com/containernetworking/plugins v0.8.5 +## explicit; go 1.12 github.com/containernetworking/plugins/pkg/ip github.com/containernetworking/plugins/pkg/ipam github.com/containernetworking/plugins/pkg/ns github.com/containernetworking/plugins/pkg/utils/hwaddr github.com/containernetworking/plugins/pkg/utils/sysctl # github.com/coreos/go-iptables v0.4.5 +## explicit github.com/coreos/go-iptables/iptables # github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc +## explicit github.com/davecgh/go-spew/spew # github.com/gofrs/flock v0.7.1 +## explicit github.com/gofrs/flock # github.com/google/uuid v1.1.1 +## explicit github.com/google/uuid # github.com/hpcloud/tail v1.0.0 +## explicit github.com/hpcloud/tail github.com/hpcloud/tail/ratelimiter github.com/hpcloud/tail/util github.com/hpcloud/tail/watch github.com/hpcloud/tail/winfile # github.com/onsi/ginkgo v1.12.0 +## explicit; go 1.12 github.com/onsi/ginkgo github.com/onsi/ginkgo/config github.com/onsi/ginkgo/internal/codelocation @@ -54,6 +65,7 @@ github.com/onsi/ginkgo/reporters/stenographer/support/go-colorable github.com/onsi/ginkgo/reporters/stenographer/support/go-isatty github.com/onsi/ginkgo/types # github.com/onsi/gomega v1.9.0 +## explicit github.com/onsi/gomega github.com/onsi/gomega/format github.com/onsi/gomega/internal/assertion @@ -67,29 +79,39 @@ github.com/onsi/gomega/matchers/support/goraph/node github.com/onsi/gomega/matchers/support/goraph/util github.com/onsi/gomega/types # github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 +## explicit github.com/pmezard/go-difflib/difflib # github.com/safchain/ethtool v0.0.0-20190326074333-42ed695e3de8 +## explicit github.com/safchain/ethtool # github.com/spf13/afero v1.4.1 +## explicit; go 1.13 github.com/spf13/afero github.com/spf13/afero/mem # github.com/stretchr/objx v0.2.1-0.20190415111823-35313a95ee26 +## explicit; go 1.12 github.com/stretchr/objx # github.com/stretchr/testify v1.5.1 +## explicit; go 1.13 github.com/stretchr/testify/assert github.com/stretchr/testify/mock # github.com/vishvananda/netlink v1.1.0 +## explicit; go 1.12 github.com/vishvananda/netlink github.com/vishvananda/netlink/nl # github.com/vishvananda/netns v0.0.0-20191106174202-0a2b9b5464df +## explicit; go 1.12 github.com/vishvananda/netns # golang.org/x/net v0.0.0-20190620200207-3b0461eec859 +## explicit; go 1.11 golang.org/x/net/html golang.org/x/net/html/atom golang.org/x/net/html/charset # golang.org/x/sys v0.0.0-20200327173247-9dae0f8f5775 +## explicit; go 1.12 golang.org/x/sys/unix # golang.org/x/text v0.3.7 +## explicit; go 1.17 golang.org/x/text/encoding golang.org/x/text/encoding/charmap golang.org/x/text/encoding/htmlindex @@ -109,11 +131,15 @@ golang.org/x/text/runes golang.org/x/text/transform golang.org/x/text/unicode/norm # golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7 +## explicit; go 1.11 golang.org/x/xerrors golang.org/x/xerrors/internal # gopkg.in/fsnotify.v1 v1.4.7 +## explicit gopkg.in/fsnotify.v1 # gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 +## explicit gopkg.in/tomb.v1 # gopkg.in/yaml.v2 v2.2.8 +## explicit gopkg.in/yaml.v2 From 27165010b1bb72ae20e0078f5e397b1f479be6db Mon Sep 17 00:00:00 2001 From: Ivan Kolodyazhny Date: Mon, 6 Feb 2023 13:23:25 +0200 Subject: [PATCH 3/3] Remove unsupported Travis CI Signed-off-by: Ivan Kolodyazhny --- .travis.yml | 35 ----------------------------------- scripts/deploy.sh | 10 ---------- 2 files changed, 45 deletions(-) delete mode 100644 .travis.yml delete mode 100755 scripts/deploy.sh diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 33c18c7..0000000 --- a/.travis.yml +++ /dev/null @@ -1,35 +0,0 @@ -language: go - -go: - - 1.13.x - -env: - - IMAGE_NAME=mellanox/ib-sriov-cni - -before_script: - - go get github.com/mattn/goveralls - -script: - - make lint - - make test-coverage - - goveralls -coverprofile=ib-sriov-cni.cover -service=travis-ci - - make image - -before_deploy: - - docker login -u "$REGISTRY_USER" -p "$REGISTRY_PASS" - -deploy: - # Push image to Dockerhub on merge to master - - provider: script - skip_cleanup: true - script: bash scripts/deploy.sh $IMAGE_NAME latest $TRAVIS_CPU_ARCH - on: - branch: master - # Push image to Dockerhub on tag - - provider: script - skip_cleanup: true - script: bash scripts/deploy.sh $IMAGE_NAME $TRAVIS_TAG $TRAVIS_CPU_ARCH - on: - tags: true - all_branches: true - condition: "$TRAVIS_TAG =~ ^v[0-9].*$" diff --git a/scripts/deploy.sh b/scripts/deploy.sh deleted file mode 100755 index ad49f1f..0000000 --- a/scripts/deploy.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash -IMAGE_NAME=$1 -VERSION=$2 -CPU_ARCH=$3 -export DOCKER_CLI_EXPERIMENTAL="enabled"; -docker tag $IMAGE_NAME ${IMAGE_NAME}-${CPU_ARCH}:${VERSION} -docker push ${IMAGE_NAME}-${CPU_ARCH}:${VERSION} -docker manifest create ${IMAGE_NAME}:${VERSION} ${IMAGE_NAME}-${CPU_ARCH}:${VERSION} -docker manifest annotate ${IMAGE_NAME}:${VERSION} ${IMAGE_NAME}-${CPU_ARCH}:${VERSION} --arch ${CPU_ARCH} -docker manifest push ${IMAGE_NAME}:${VERSION}