Skip to content

Commit

Permalink
Bump Go to 1.17.7 (#224)
Browse files Browse the repository at this point in the history
* Bump Go to 1.17.7

Because kubernetes 1.23 is built with Go 1.17.
https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG/CHANGELOG-1.23.md

Signed-off-by: Masashi Honma <[email protected]>

* Bump Kubernetes version of autotest

Signed-off-by: Masashi Honma <[email protected]>
  • Loading branch information
masap authored Mar 2, 2022
1 parent 67388f0 commit a1f771a
Show file tree
Hide file tree
Showing 45 changed files with 103 additions and 465 deletions.
2 changes: 1 addition & 1 deletion automation/check-patch.e2e.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ teardown() {
}

main() {
export KUBEVIRT_PROVIDER='k8s-1.20'
export KUBEVIRT_PROVIDER='k8s-1.23'

source automation/setup.sh
cd ${TMP_PROJECT_PATH}
Expand Down
48 changes: 44 additions & 4 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,55 @@ require (
github.com/ovn-org/libovsdb v0.6.0
github.com/pkg/errors v0.9.1
github.com/vishvananda/netlink v1.1.1-0.20210330154013-f5de75959ad5
golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f // indirect
golang.org/x/sys v0.0.0-20211019181941-9d821ace8654 // indirect
golang.org/x/text v0.3.7 // indirect
k8s.io/api v0.20.6
k8s.io/apimachinery v0.20.6
k8s.io/client-go v0.20.6
kubevirt.io/qe-tools v0.1.6
)

require (
github.com/cenkalti/backoff/v4 v4.1.1 // indirect
github.com/cenkalti/hub v1.0.1 // indirect
github.com/cenkalti/rpc2 v0.0.0-20210220005819-4a29bc83afe1 // indirect
github.com/coreos/go-iptables v0.6.0 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96 // indirect
github.com/fsnotify/fsnotify v1.4.9 // indirect
github.com/go-logr/logr v0.2.0 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/protobuf v1.5.2 // indirect
github.com/google/gofuzz v1.1.0 // indirect
github.com/google/uuid v1.2.0 // indirect
github.com/googleapis/gnostic v0.4.1 // indirect
github.com/json-iterator/go v1.1.10 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.1 // indirect
github.com/nxadm/tail v1.4.8 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/safchain/ethtool v0.0.0-20210803160452-9aa261dae9b1 // indirect
github.com/spf13/afero v1.4.1 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/stretchr/testify v1.6.1 // indirect
github.com/vishvananda/netns v0.0.0-20210104183010-2eb08e3e575f // indirect
golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2 // indirect
golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f // indirect
golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6 // indirect
golang.org/x/sys v0.0.0-20211019181941-9d821ace8654 // indirect
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1 // indirect
golang.org/x/text v0.3.7 // indirect
golang.org/x/time v0.0.0-20191024005414-555d28b269f0 // indirect
google.golang.org/appengine v1.6.5 // indirect
google.golang.org/protobuf v1.26.0 // indirect
gopkg.in/inf.v0 v0.9.1 // 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-20200313102051-9f266ea9e77c // indirect
k8s.io/klog/v2 v2.4.0 // indirect
k8s.io/utils v0.0.0-20201110183641-67b214c5f920 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.0.1 // indirect
sigs.k8s.io/yaml v1.2.0 // indirect
)

// Pinned to kubernetes-1.19.1
replace (
golang.org/x/text => golang.org/x/text v0.3.3
Expand Down Expand Up @@ -50,4 +90,4 @@ replace (

replace github.com/gogo/protobuf => github.com/gogo/protobuf v1.3.2

go 1.16
go 1.17
2 changes: 1 addition & 1 deletion hack/docker-builder/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ RUN dnf -y install make git sudo gcc rsync-daemon rsync openvswitch hostname &&
ENV GOPATH="/go"
RUN \
DESTINATION=/opt && \
VERSION=1.16.8 && \
VERSION=1.17.7 && \
TARBALL=go${VERSION}.linux-amd64.tar.gz && \
URL=https://dl.google.com/go && \
mkdir -p ${DESTINATION} && \
Expand Down
2 changes: 1 addition & 1 deletion hack/install-go.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash -xe

destination=$1
version=1.16.8
version=1.17.7
tarball=go$version.linux-amd64.tar.gz
url=https://dl.google.com/go/

Expand Down
1 change: 1 addition & 0 deletions pkg/plugin/plugin.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@

// Go version 1.10 or greater is required. Before that, switching namespaces in
// long running processes in go did not work in a reliable way.
//go:build go1.10
// +build go1.10

package plugin
Expand Down
1 change: 1 addition & 0 deletions pkg/sriov/cache.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@

// Go version 1.10 or greater is required. Before that, switching namespaces in
// long running processes in go did not work in a reliable way.
//go:build go1.10
// +build go1.10

package sriov
Expand Down
1 change: 1 addition & 0 deletions pkg/sriov/sriov.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@

// Go version 1.10 or greater is required. Before that, switching namespaces in
// long running processes in go did not work in a reliable way.
//go:build go1.10
// +build go1.10

package sriov
Expand Down
10 changes: 0 additions & 10 deletions vendor/github.com/Mellanox/sriovnet/go.mod

This file was deleted.

35 changes: 0 additions & 35 deletions vendor/github.com/Mellanox/sriovnet/go.sum

This file was deleted.

3 changes: 0 additions & 3 deletions vendor/github.com/cenkalti/backoff/v4/go.mod

This file was deleted.

5 changes: 0 additions & 5 deletions vendor/github.com/fsnotify/fsnotify/go.mod

This file was deleted.

2 changes: 0 additions & 2 deletions vendor/github.com/fsnotify/fsnotify/go.sum

This file was deleted.

3 changes: 0 additions & 3 deletions vendor/github.com/go-logr/logr/go.mod

This file was deleted.

3 changes: 0 additions & 3 deletions vendor/github.com/google/gofuzz/go.mod

This file was deleted.

1 change: 0 additions & 1 deletion vendor/github.com/google/uuid/go.mod

This file was deleted.

5 changes: 0 additions & 5 deletions vendor/github.com/imdario/mergo/go.mod

This file was deleted.

4 changes: 0 additions & 4 deletions vendor/github.com/imdario/mergo/go.sum

This file was deleted.

3 changes: 0 additions & 3 deletions vendor/github.com/j-keck/arping/go.mod

This file was deleted.

11 changes: 0 additions & 11 deletions vendor/github.com/json-iterator/go/go.mod

This file was deleted.

14 changes: 0 additions & 14 deletions vendor/github.com/json-iterator/go/go.sum

This file was deleted.

8 changes: 0 additions & 8 deletions vendor/github.com/nxadm/tail/go.mod

This file was deleted.

6 changes: 0 additions & 6 deletions vendor/github.com/nxadm/tail/go.sum

This file was deleted.

13 changes: 0 additions & 13 deletions vendor/github.com/onsi/ginkgo/go.mod

This file was deleted.

86 changes: 0 additions & 86 deletions vendor/github.com/onsi/ginkgo/go.sum

This file was deleted.

10 changes: 0 additions & 10 deletions vendor/github.com/onsi/gomega/go.mod

This file was deleted.

Loading

0 comments on commit a1f771a

Please sign in to comment.