From 529c90a589869f5606507bf9390913fc62afc5d6 Mon Sep 17 00:00:00 2001 From: Alex Palesandro Date: Thu, 4 Nov 2021 11:23:27 +0100 Subject: [PATCH] Bump Go to 1.17 --- .../workflows/check-generated-artifacts.yml | 2 +- .github/workflows/integration.yml | 2 +- .github/workflows/lint.yml | 2 +- .../v1alpha1/zz_generated.deepcopy.go | 1 + apis/net/v1alpha1/zz_generated.deepcopy.go | 1 + .../v1alpha1/zz_generated.deepcopy.go | 1 + .../sharing/v1alpha1/zz_generated.deepcopy.go | 1 + .../v1alpha1/zz_generated.deepcopy.go | 1 + build/common/Dockerfile | 2 +- build/liqo-test/Dockerfile | 2 +- build/liqonet/Dockerfile | 2 +- go.mod | 167 +++++++++++++++++- 12 files changed, 171 insertions(+), 13 deletions(-) diff --git a/.github/workflows/check-generated-artifacts.yml b/.github/workflows/check-generated-artifacts.yml index 773c78e674..525c326bbf 100644 --- a/.github/workflows/check-generated-artifacts.yml +++ b/.github/workflows/check-generated-artifacts.yml @@ -20,7 +20,7 @@ jobs: - name: Setup Go uses: actions/setup-go@v1 with: - go-version: 1.16 + go-version: 1.17 - name: Run the automatic generation working-directory: ./ diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml index 926a7ed1d5..985bcbdbee 100644 --- a/.github/workflows/integration.yml +++ b/.github/workflows/integration.yml @@ -203,7 +203,7 @@ jobs: - name: Setup Go uses: actions/setup-go@v2 with: - go-version: 1.16 + go-version: 1.17 env: GOPATH: ${{ github.workspace }} diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index bca55347cf..a7849b700b 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -35,7 +35,7 @@ jobs: - name: Setup Go uses: actions/setup-go@v1 with: - go-version: 1.16 + go-version: 1.17 - name: Execute go mod tidy and check the outcome working-directory: ./ diff --git a/apis/discovery/v1alpha1/zz_generated.deepcopy.go b/apis/discovery/v1alpha1/zz_generated.deepcopy.go index c7149aa232..d6deef2e02 100644 --- a/apis/discovery/v1alpha1/zz_generated.deepcopy.go +++ b/apis/discovery/v1alpha1/zz_generated.deepcopy.go @@ -1,3 +1,4 @@ +//go:build !ignore_autogenerated // +build !ignore_autogenerated // Copyright 2019-2021 The Liqo Authors diff --git a/apis/net/v1alpha1/zz_generated.deepcopy.go b/apis/net/v1alpha1/zz_generated.deepcopy.go index c27539e2a1..7b72203556 100644 --- a/apis/net/v1alpha1/zz_generated.deepcopy.go +++ b/apis/net/v1alpha1/zz_generated.deepcopy.go @@ -1,3 +1,4 @@ +//go:build !ignore_autogenerated // +build !ignore_autogenerated // Copyright 2019-2021 The Liqo Authors diff --git a/apis/offloading/v1alpha1/zz_generated.deepcopy.go b/apis/offloading/v1alpha1/zz_generated.deepcopy.go index ced24ea3ae..c015c0bf73 100644 --- a/apis/offloading/v1alpha1/zz_generated.deepcopy.go +++ b/apis/offloading/v1alpha1/zz_generated.deepcopy.go @@ -1,3 +1,4 @@ +//go:build !ignore_autogenerated // +build !ignore_autogenerated // Copyright 2019-2021 The Liqo Authors diff --git a/apis/sharing/v1alpha1/zz_generated.deepcopy.go b/apis/sharing/v1alpha1/zz_generated.deepcopy.go index 68e48f72c8..e3e389e09f 100644 --- a/apis/sharing/v1alpha1/zz_generated.deepcopy.go +++ b/apis/sharing/v1alpha1/zz_generated.deepcopy.go @@ -1,3 +1,4 @@ +//go:build !ignore_autogenerated // +build !ignore_autogenerated // Copyright 2019-2021 The Liqo Authors diff --git a/apis/virtualkubelet/v1alpha1/zz_generated.deepcopy.go b/apis/virtualkubelet/v1alpha1/zz_generated.deepcopy.go index 83dc61af95..0de0121430 100644 --- a/apis/virtualkubelet/v1alpha1/zz_generated.deepcopy.go +++ b/apis/virtualkubelet/v1alpha1/zz_generated.deepcopy.go @@ -1,3 +1,4 @@ +//go:build !ignore_autogenerated // +build !ignore_autogenerated // Copyright 2019-2021 The Liqo Authors diff --git a/build/common/Dockerfile b/build/common/Dockerfile index 9f75f48b46..74fe0e41c9 100644 --- a/build/common/Dockerfile +++ b/build/common/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.16 as builder +FROM golang:1.17 as builder WORKDIR /tmp/builder COPY go.mod ./go.mod diff --git a/build/liqo-test/Dockerfile b/build/liqo-test/Dockerfile index fbbed03f43..01fb50c0ba 100644 --- a/build/liqo-test/Dockerfile +++ b/build/liqo-test/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.16 as builder +FROM golang:1.17 as builder ENV PATH /go/bin:/usr/local/go/bin:$PATH ENV GOPATH /go ENV K8S_VERSION=1.19.2 diff --git a/build/liqonet/Dockerfile b/build/liqonet/Dockerfile index c3d86f2add..ed9a057262 100644 --- a/build/liqonet/Dockerfile +++ b/build/liqonet/Dockerfile @@ -6,7 +6,7 @@ RUN rustup target add x86_64-unknown-linux-musl RUN cargo build --bin boringtun --release -FROM golang:1.16 as goBuilder +FROM golang:1.17 as goBuilder WORKDIR /tmp/builder COPY go.mod ./go.mod diff --git a/go.mod b/go.mod index 59c1565ca5..db438228a0 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/liqotech/liqo -go 1.16 +go 1.17 require ( github.com/Azure/azure-sdk-for-go v56.2.0+incompatible @@ -10,8 +10,6 @@ require ( github.com/clastix/capsule v0.1.0 github.com/containernetworking/plugins v0.8.6 github.com/coreos/go-iptables v0.4.5 - github.com/google/gofuzz v1.2.0 // indirect - github.com/gorilla/mux v1.8.0 // indirect github.com/grandcat/zeroconf v1.0.0 github.com/gruntwork-io/gruntwork-cli v0.7.0 github.com/gruntwork-io/terratest v0.35.6 @@ -26,20 +24,16 @@ require ( github.com/openshift/api v0.0.0-20210521075222-e273a339932a github.com/openshift/client-go v0.0.0-20210521082421-73d9475a9142 github.com/pkg/errors v0.9.1 - github.com/spf13/cast v1.4.0 // indirect github.com/spf13/cobra v1.2.1 github.com/spf13/pflag v1.0.5 github.com/stretchr/testify v1.7.0 github.com/virtual-kubelet/virtual-kubelet v1.5.1 github.com/vishvananda/netlink v1.1.0 github.com/vishvananda/netns v0.0.0-20200728191858-db3c7e526aae - golang.org/x/oauth2 v0.0.0-20210628180205-a41e5a781914 // indirect golang.org/x/sys v0.0.0-20210817190340-bfb29a6856f2 - golang.org/x/tools v0.1.4 // indirect golang.zx2c4.com/wireguard/wgctrl v0.0.0-20200609130330-bd2cb7843e1b gomodules.xyz/jsonpatch/v2 v2.2.0 google.golang.org/api v0.48.0 - google.golang.org/genproto v0.0.0-20210624195500-8bfb893ecb84 // indirect google.golang.org/grpc v1.38.0 google.golang.org/protobuf v1.26.0 gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b @@ -59,6 +53,165 @@ require ( sigs.k8s.io/sig-storage-lib-external-provisioner/v7 v7.0.1 ) +require ( + cloud.google.com/go v0.83.0 // indirect + github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect + github.com/Azure/go-autorest v14.2.0+incompatible // indirect + github.com/Azure/go-autorest/autorest/adal v0.9.13 // indirect + github.com/Azure/go-autorest/autorest/azure/cli v0.4.2 // indirect + github.com/Azure/go-autorest/autorest/date v0.3.0 // indirect + github.com/Azure/go-autorest/autorest/to v0.3.0 // indirect + github.com/Azure/go-autorest/autorest/validation v0.3.0 // indirect + github.com/Azure/go-autorest/logger v0.2.1 // indirect + github.com/Azure/go-autorest/tracing v0.6.0 // indirect + github.com/BurntSushi/toml v0.3.1 // indirect + github.com/MakeNowJust/heredoc v0.0.0-20170808103936-bb23615498cd // indirect + github.com/Masterminds/goutils v1.1.1 // indirect + github.com/Masterminds/semver/v3 v3.1.1 // indirect + github.com/Masterminds/sprig/v3 v3.2.2 // indirect + github.com/Masterminds/squirrel v1.5.0 // indirect + github.com/Microsoft/go-winio v0.4.17-0.20210211115548-6eac466e5fa3 // indirect + github.com/Microsoft/hcsshim v0.8.15 // indirect + github.com/PuerkitoBio/purell v1.1.1 // indirect + github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect + github.com/asaskevich/govalidator v0.0.0-20200428143746-21a406dcc535 // indirect + github.com/avast/retry-go v3.0.0+incompatible // indirect + github.com/beorn7/perks v1.0.1 // indirect + github.com/blang/semver v3.5.1+incompatible // indirect + github.com/boombuler/barcode v1.0.1-0.20190219062509-6c824513bacc // indirect + github.com/cenkalti/backoff v2.2.1+incompatible // indirect + github.com/cespare/xxhash/v2 v2.1.1 // indirect + github.com/containerd/cgroups v0.0.0-20200824123100-0b889c03f102 // indirect + github.com/containerd/containerd v1.5.0-beta.1 // indirect + github.com/containerd/continuity v0.0.0-20201208142359-180525291bb7 // indirect + github.com/containernetworking/cni v0.8.0 // indirect + github.com/cpuguy83/go-md2man/v2 v2.0.0 // indirect + github.com/cyphar/filepath-securejoin v0.2.2 // indirect + github.com/davecgh/go-spew v1.1.1 // indirect + github.com/deislabs/oras v0.11.1 // indirect + github.com/dimchansky/utfbom v1.1.1 // indirect + github.com/docker/cli v20.10.5+incompatible // indirect + github.com/docker/distribution v2.7.1+incompatible // indirect + github.com/docker/docker v20.10.5+incompatible // indirect + github.com/docker/docker-credential-helpers v0.6.3 // indirect + github.com/docker/go-connections v0.4.0 // indirect + github.com/docker/go-metrics v0.0.1 // indirect + github.com/docker/go-units v0.4.0 // indirect + github.com/emicklei/go-restful v2.9.5+incompatible // indirect + github.com/evanphx/json-patch v4.11.0+incompatible // indirect + github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d // indirect + github.com/fatih/color v1.9.0 // indirect + github.com/form3tech-oss/jwt-go v3.2.3+incompatible // indirect + github.com/fsnotify/fsnotify v1.4.9 // indirect + github.com/go-errors/errors v1.0.2-0.20180813162953-d98b870cc4e0 // indirect + github.com/go-logr/logr v0.4.0 // indirect + github.com/go-openapi/jsonpointer v0.19.5 // indirect + github.com/go-openapi/jsonreference v0.19.5 // indirect + github.com/go-openapi/swag v0.19.14 // indirect + github.com/go-sql-driver/mysql v1.5.0 // indirect + github.com/gobwas/glob v0.2.3 // indirect + github.com/gofrs/flock v0.8.0 // indirect + github.com/gogo/protobuf v1.3.2 // indirect + github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect + github.com/golang/protobuf v1.5.2 // indirect + github.com/google/btree v1.0.1 // indirect + github.com/google/go-cmp v0.5.6 // indirect + github.com/google/gofuzz v1.2.0 // indirect + github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect + github.com/google/uuid v1.2.0 // indirect + github.com/googleapis/gax-go/v2 v2.0.5 // indirect + github.com/googleapis/gnostic v0.5.5 // indirect + github.com/gorilla/mux v1.8.0 // indirect + github.com/gosuri/uitable v0.0.4 // indirect + github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7 // indirect + github.com/gruntwork-io/go-commons v0.8.0 // indirect + github.com/hashicorp/errwrap v1.0.0 // indirect + github.com/hashicorp/go-multierror v1.1.0 // indirect + github.com/huandu/xstrings v1.3.1 // indirect + github.com/imdario/mergo v0.3.12 // indirect + github.com/inconshreveable/mousetrap v1.0.0 // indirect + github.com/jmespath/go-jmespath v0.4.0 // indirect + github.com/jmoiron/sqlx v1.3.1 // indirect + github.com/josharian/intern v1.0.0 // indirect + github.com/json-iterator/go v1.1.11 // indirect + github.com/klauspost/compress v1.11.3 // indirect + github.com/lann/builder v0.0.0-20180802200727-47ae307949d0 // indirect + github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0 // indirect + github.com/lib/pq v1.10.0 // indirect + github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect + github.com/mailru/easyjson v0.7.6 // indirect + github.com/mattn/go-colorable v0.1.4 // indirect + github.com/mattn/go-isatty v0.0.11 // indirect + github.com/mattn/go-runewidth v0.0.7 // indirect + github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect + github.com/mdlayher/genetlink v1.0.0 // indirect + github.com/mdlayher/netlink v1.1.0 // indirect + github.com/mitchellh/copystructure v1.1.1 // indirect + github.com/mitchellh/go-homedir v1.1.0 // indirect + github.com/mitchellh/go-wordwrap v1.0.0 // indirect + github.com/mitchellh/reflectwalk v1.0.1 // indirect + github.com/moby/spdystream v0.2.0 // indirect + github.com/moby/sys/mount v0.2.0 // indirect + github.com/moby/sys/mountinfo v0.4.0 // indirect + github.com/moby/term v0.0.0-20210610120745-9d4ed1856297 // indirect + github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect + github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect + github.com/morikuni/aec v1.0.0 // indirect + github.com/nxadm/tail v1.4.8 // indirect + github.com/opencontainers/go-digest v1.0.0 // indirect + github.com/opencontainers/image-spec v1.0.1 // indirect + github.com/opencontainers/runc v1.0.0-rc93 // indirect + github.com/peterbourgon/diskv v2.0.1+incompatible // indirect + github.com/pmezard/go-difflib v1.0.0 // indirect + github.com/pquerna/otp v1.2.0 // indirect + github.com/prometheus/client_golang v1.11.0 // 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/rubenv/sql-migrate v0.0.0-20200616145509-8d140a17f351 // indirect + github.com/russross/blackfriday v1.5.2 // indirect + github.com/russross/blackfriday/v2 v2.0.1 // indirect + github.com/safchain/ethtool v0.0.0-20190326074333-42ed695e3de8 // indirect + github.com/shopspring/decimal v1.2.0 // indirect + github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect + github.com/sirupsen/logrus v1.8.1 // indirect + github.com/spf13/cast v1.4.0 // indirect + github.com/testcontainers/testcontainers-go v0.10.0 // indirect + github.com/urfave/cli v1.22.2 // indirect + github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f // indirect + github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect + github.com/xeipuuv/gojsonschema v1.2.0 // indirect + github.com/xlab/treeprint v0.0.0-20181112141820-a009c3971eca // indirect + go.opencensus.io v0.23.0 // indirect + go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 // indirect + go4.org/intern v0.0.0-20210108033219-3eb7198706b2 // indirect + go4.org/unsafe/assume-no-moving-gc v0.0.0-20201222180813-1025295fd063 // indirect + golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a // indirect + golang.org/x/net v0.0.0-20210614182718-04defd469f4e // indirect + golang.org/x/oauth2 v0.0.0-20210628180205-a41e5a781914 // indirect + golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect + golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d // indirect + golang.org/x/text v0.3.6 // indirect + golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect + golang.org/x/tools v0.1.4 // indirect + golang.zx2c4.com/wireguard v0.0.20200121 // indirect + google.golang.org/appengine v1.6.7 // indirect + google.golang.org/genproto v0.0.0-20210624195500-8bfb893ecb84 // indirect + gopkg.in/gorp.v1 v1.7.2 // 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 + k8s.io/apiextensions-apiserver v0.22.1 // indirect + k8s.io/apiserver v0.22.1 // indirect + k8s.io/cli-runtime v0.22.1 // indirect + k8s.io/component-base v0.22.1 // indirect + k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e // indirect + sigs.k8s.io/kustomize/api v0.8.11 // indirect + sigs.k8s.io/kustomize/kyaml v0.11.0 // indirect + sigs.k8s.io/structured-merge-diff/v4 v4.1.2 // indirect + sigs.k8s.io/yaml v1.2.0 // indirect +) + replace github.com/virtual-kubelet/virtual-kubelet => github.com/liqotech/virtual-kubelet v1.5.1-0.20211028083903-28902eb9305f replace github.com/grandcat/zeroconf => github.com/liqotech/zeroconf v1.0.1-0.20201020081245-6384f3f21ffb