Skip to content

Commit

Permalink
update Go to v1.17
Browse files Browse the repository at this point in the history
  • Loading branch information
@zhangzujian
zhangzujian committed Sep 21, 2022
1 parent 41e697a commit a03c806
Show file tree
Hide file tree
Showing 4 changed files with 148 additions and 65 deletions.
9 changes: 6 additions & 3 deletions .github/workflows/build-arm64-image.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,18 @@ on:
- 'docs/**'
- '**.md'

env:
GO_VERSION: '1.17'

jobs:
build:
name: Build arm64
runs-on: ubuntu-20.04
steps:
- name: Set up Go 1.x
uses: actions/setup-go@v2
- uses: actions/setup-go@v3
with:
go-version: 1.16.7
go-version: '${{ env.GO_VERSION }}'
check-latest: true
id: go

- name: Check out code into the Go module directory
Expand Down
85 changes: 43 additions & 42 deletions .github/workflows/build-x86-image.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,17 +16,18 @@ on:
- '**.md'

env:
GO_VERSION: '1.17'
KIND_VERSION: v0.11.1

jobs:
build:
name: Build x86
runs-on: ubuntu-20.04
steps:
- name: Set up Go 1.x
uses: actions/setup-go@v2
- uses: actions/setup-go@v3
with:
go-version: 1.16.7
go-version: '${{ env.GO_VERSION }}'
check-latest: true
id: go

- name: Check out code into the Go module directory
Expand Down Expand Up @@ -100,10 +101,10 @@ jobs:
docker load --input image.tar
sudo make kind-install
- name: Set up Go 1.x
uses: actions/setup-go@v2
- uses: actions/setup-go@v3
with:
go-version: ^1.16
go-version: '${{ env.GO_VERSION }}'
check-latest: true
id: go

- name: Run E2E
Expand Down Expand Up @@ -150,10 +151,10 @@ jobs:
docker load --input image.tar
sudo make kind-install
- name: Set up Go 1.x
uses: actions/setup-go@v2
- uses: actions/setup-go@v3
with:
go-version: ^1.16
go-version: '${{ env.GO_VERSION }}'
check-latest: true
id: go

- name: Run E2E
Expand Down Expand Up @@ -200,10 +201,10 @@ jobs:
docker load --input image.tar
sudo make kind-install
- name: Set up Go 1.x
uses: actions/setup-go@v2
- uses: actions/setup-go@v3
with:
go-version: ^1.16
go-version: '${{ env.GO_VERSION }}'
check-latest: true
id: go

- name: Run E2E
Expand Down Expand Up @@ -250,10 +251,10 @@ jobs:
docker load --input image.tar
sudo make kind-install-underlay
- name: Set up Go 1.x
uses: actions/setup-go@v2
- uses: actions/setup-go@v3
with:
go-version: ^1.16
go-version: '${{ env.GO_VERSION }}'
check-latest: true
id: go

- name: Run E2E
Expand Down Expand Up @@ -316,10 +317,10 @@ jobs:
docker load --input image.tar
sudo make kind-install-single
- name: Set up Go 1.x
uses: actions/setup-go@v2
- uses: actions/setup-go@v3
with:
go-version: ^1.16
go-version: '${{ env.GO_VERSION }}'
check-latest: true
id: go

- name: Run E2E
Expand Down Expand Up @@ -401,10 +402,10 @@ jobs:
docker load --input image.tar
sudo make kind-install-ipv6
- name: Set up Go 1.x
uses: actions/setup-go@v2
- uses: actions/setup-go@v3
with:
go-version: ^1.16
go-version: '${{ env.GO_VERSION }}'
check-latest: true
id: go

- name: Run E2E
Expand Down Expand Up @@ -455,10 +456,10 @@ jobs:
docker load --input image.tar
sudo make kind-install-ipv6
- name: Set up Go 1.x
uses: actions/setup-go@v2
- uses: actions/setup-go@v3
with:
go-version: ^1.16
go-version: '${{ env.GO_VERSION }}'
check-latest: true
id: go

- name: Run E2E
Expand Down Expand Up @@ -509,10 +510,10 @@ jobs:
docker load --input image.tar
sudo make kind-install-underlay-ipv6
- name: Set up Go 1.x
uses: actions/setup-go@v2
- uses: actions/setup-go@v3
with:
go-version: ^1.16
go-version: '${{ env.GO_VERSION }}'
check-latest: true
id: go

- name: Run E2E
Expand Down Expand Up @@ -579,10 +580,10 @@ jobs:
docker load --input image.tar
sudo make kind-install-dual
- name: Set up Go 1.x
uses: actions/setup-go@v2
- uses: actions/setup-go@v3
with:
go-version: ^1.16
go-version: '${{ env.GO_VERSION }}'
check-latest: true
id: go

- name: Run E2E
Expand Down Expand Up @@ -633,10 +634,10 @@ jobs:
docker load --input image.tar
sudo make kind-install-underlay-dual
- name: Set up Go 1.x
uses: actions/setup-go@v2
- uses: actions/setup-go@v3
with:
go-version: ^1.16
go-version: '${{ env.GO_VERSION }}'
check-latest: true
id: go

- name: Run E2E
Expand Down Expand Up @@ -701,10 +702,10 @@ jobs:
docker load --input image.tar
sudo make kind-install
- name: Set up Go 1.x
uses: actions/setup-go@v2
- uses: actions/setup-go@v3
with:
go-version: ^1.16
go-version: '${{ env.GO_VERSION }}'
check-latest: true
id: go

- name: Run E2E
Expand Down Expand Up @@ -753,10 +754,10 @@ jobs:
docker load --input image.tar
sudo make kind-install
- name: Set up Go 1.x
uses: actions/setup-go@v2
- uses: actions/setup-go@v3
with:
go-version: ^1.16
go-version: '${{ env.GO_VERSION }}'
check-latest: true
id: go

- name: Run E2E
Expand Down Expand Up @@ -805,10 +806,10 @@ jobs:
docker load --input image.tar
sudo make kind-install
- name: Set up Go 1.x
uses: actions/setup-go@v2
- uses: actions/setup-go@v3
with:
go-version: ^1.16
go-version: '${{ env.GO_VERSION }}'
check-latest: true
id: go

- name: Run E2E
Expand Down
2 changes: 1 addition & 1 deletion Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
GO_VERSION = 1.16
GO_VERSION = 1.17

REGISTRY = kubeovn
DEV_TAG = dev
Expand Down
117 changes: 98 additions & 19 deletions go.mod
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/kubeovn/kube-ovn

go 1.16
go 1.17

require (
github.com/Mellanox/sriovnet v1.0.2
Expand All @@ -9,42 +9,24 @@ require (
github.com/containernetworking/cni v0.8.0
github.com/containernetworking/plugins v0.8.6
github.com/coreos/go-iptables v0.4.5
github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13 // indirect
github.com/elazarl/goproxy v0.0.0-20190630181448-f1e96bc0f4c5 // indirect
github.com/emicklei/go-restful v2.11.1+incompatible
github.com/fsnotify/fsnotify v1.5.1 // indirect
github.com/go-ini/ini v1.42.0 // indirect
github.com/golang/protobuf v1.5.2
github.com/greenpau/ovsdb v0.0.0-20181114004433-3582b85e8968
github.com/hashicorp/go-version v1.2.0 // indirect
github.com/intel/multus-cni v0.0.0-20200313031649-eaf6ff6e20bb
github.com/k8snetworkplumbingwg/network-attachment-definition-client v1.1.0
github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0 // indirect
github.com/kelseyhightower/envconfig v1.4.0 // indirect
github.com/moul/http2curl v1.0.0 // indirect
github.com/neverlee/keymutex v0.0.0-20171121013845-f593aa834bf9
github.com/oilbeater/go-ping v0.0.0-20200413021620-332b7197c5b5
github.com/onsi/ginkgo v1.16.4
github.com/onsi/gomega v1.16.0
github.com/osrg/gobgp v0.0.0-20190401195721-805d02fdfbc5
github.com/parnurzeal/gorequest v0.2.15
github.com/projectcalico/go-json v0.0.0-20161128004156-6219dc7339ba // indirect
github.com/projectcalico/go-yaml v0.0.0-20161201183616-955bc3e451ef // indirect
github.com/projectcalico/go-yaml-wrapper v0.0.0-20161127220527-598e54215bee // indirect
github.com/projectcalico/libcalico-go v0.0.0-20190305235709-3d935c3b8b86 // indirect
github.com/prometheus/client_golang v1.11.1
github.com/satori/go.uuid v1.2.1-0.20181028125025-b2ce2384e17b // indirect
github.com/sirupsen/logrus v1.6.0
github.com/spf13/pflag v1.0.5
github.com/stretchr/testify v1.6.1
github.com/vishvananda/netlink v1.1.0
golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4 // indirect
golang.org/x/net v0.0.0-20220919232410-f2f64ebce3c1 // indirect
golang.org/x/sys v0.0.0-20220919091848-fb04ddd9f9c8
golang.org/x/term v0.0.0-20220411215600-e5f449aeb171 // indirect
golang.org/x/tools v0.1.5 // indirect
google.golang.org/grpc v1.27.1
google.golang.org/protobuf v1.27.1 // indirect
k8s.io/api v0.20.4
k8s.io/apimachinery v0.20.4
k8s.io/client-go v12.0.0+incompatible
Expand All @@ -55,6 +37,103 @@ require (
sigs.k8s.io/controller-runtime v0.8.3
)

require (
github.com/PuerkitoBio/purell v1.1.1 // indirect
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
github.com/armon/go-radix v1.0.0 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/cespare/xxhash/v2 v2.1.1 // indirect
github.com/coreos/prometheus-operator v0.38.0 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13 // indirect
github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96 // indirect
github.com/eapache/channels v1.1.0 // indirect
github.com/eapache/queue v1.1.0 // indirect
github.com/elazarl/goproxy v0.0.0-20190630181448-f1e96bc0f4c5 // indirect
github.com/evanphx/json-patch v4.9.0+incompatible // indirect
github.com/fsnotify/fsnotify v1.5.1 // indirect
github.com/go-ini/ini v1.42.0 // indirect
github.com/go-kit/kit v0.9.0 // indirect
github.com/go-logfmt/logfmt v0.5.0 // indirect
github.com/go-logr/logr v0.3.0 // indirect
github.com/go-openapi/jsonpointer v0.19.3 // indirect
github.com/go-openapi/jsonreference v0.19.3 // indirect
github.com/go-openapi/spec v0.19.5 // indirect
github.com/go-openapi/swag v0.19.7 // indirect
github.com/gogo/protobuf v1.3.1 // indirect
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b // indirect
github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
github.com/golang/mock v1.4.4 // indirect
github.com/google/go-cmp v0.5.5 // indirect
github.com/google/gofuzz v1.1.0 // indirect
github.com/google/uuid v1.1.2 // indirect
github.com/googleapis/gnostic v0.5.1 // indirect
github.com/gorilla/websocket v1.4.2 // indirect
github.com/hashicorp/go-version v1.2.0 // indirect
github.com/hashicorp/golang-lru v0.5.4 // indirect
github.com/hashicorp/hcl v1.0.0 // indirect
github.com/imdario/mergo v0.3.10 // indirect
github.com/json-iterator/go v1.1.11 // indirect
github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0 // indirect
github.com/kelseyhightower/envconfig v1.4.0 // indirect
github.com/konsorten/go-windows-terminal-sequences v1.0.3 // indirect
github.com/kubernetes-csi/external-snapshotter/v2 v2.1.1 // indirect
github.com/magiconair/properties v1.8.1 // indirect
github.com/mailru/easyjson v0.7.0 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
github.com/mitchellh/mapstructure v1.1.2 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.1 // indirect
github.com/moul/http2curl v1.0.0 // indirect
github.com/nxadm/tail v1.4.8 // indirect
github.com/openshift/api v0.0.0-20210105115604-44119421ec6b // indirect
github.com/openshift/client-go v0.0.0 // indirect
github.com/openshift/custom-resource-status v0.0.0-20200602122900-c002fd1547ca // indirect
github.com/pborman/uuid v1.2.0 // indirect
github.com/pelletier/go-toml v1.2.0 // 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 v0.0.0-20161201183616-955bc3e451ef // indirect
github.com/projectcalico/go-yaml-wrapper v0.0.0-20161127220527-598e54215bee // indirect
github.com/projectcalico/libcalico-go v0.0.0-20190305235709-3d935c3b8b86 // indirect
github.com/prometheus/client_model v0.2.0 // indirect
github.com/prometheus/common v0.26.0 // indirect
github.com/prometheus/procfs v0.6.0 // indirect
github.com/satori/go.uuid v1.2.1-0.20181028125025-b2ce2384e17b // indirect
github.com/spf13/afero v1.4.1 // indirect
github.com/spf13/cast v1.3.0 // indirect
github.com/spf13/jwalterweatherman v1.0.0 // indirect
github.com/spf13/viper v1.7.0 // indirect
github.com/subosito/gotenv v1.2.0 // indirect
github.com/vishvananda/netns v0.0.0-20191106174202-0a2b9b5464df // indirect
golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4 // indirect
golang.org/x/net v0.0.0-20220919232410-f2f64ebce3c1 // indirect
golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d // indirect
golang.org/x/term v0.0.0-20220411215600-e5f449aeb171 // indirect
golang.org/x/text v0.3.7 // indirect
golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e // indirect
golang.org/x/tools v0.1.5 // indirect
gomodules.xyz/jsonpatch/v2 v2.1.0 // indirect
google.golang.org/appengine v1.6.6 // indirect
google.golang.org/genproto v0.0.0-20201110150050-8816d57aaa9a // indirect
google.golang.org/protobuf v1.27.1 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/ini.v1 v1.51.0 // indirect
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776 // indirect
k8s.io/apiextensions-apiserver v0.20.2 // indirect
k8s.io/component-base v0.20.2 // indirect
k8s.io/kube-openapi v0.0.0-20201113171705-d219536bb9fd // indirect
k8s.io/utils v0.0.0-20210111153108-fddb29f9d009 // indirect
kubevirt.io/api v0.0.0-20220111180619-bd15f69822b9 // indirect
kubevirt.io/containerized-data-importer-api v1.41.0 // indirect
kubevirt.io/controller-lifecycle-operator-sdk v0.2.1 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.0.2 // indirect
sigs.k8s.io/yaml v1.2.0 // indirect
)

replace (
github.com/alauda/felix => github.com/kubeovn/felix v0.0.0-20220325073257-c8a0f705d139
github.com/gogo/protobuf => github.com/gogo/protobuf v1.3.2
Expand Down

0 comments on commit a03c806

Please sign in to comment.