From c8447dca563dcf49aebd86bca8ba872066ffef7e Mon Sep 17 00:00:00 2001 From: Brad Davidson Date: Tue, 5 Apr 2022 13:13:48 -0700 Subject: [PATCH] Bump golang to 1.18.1 Also update all use of 'go get' => 'go install', update CI tooling for 1.18 compatibility, and gofmt everything so lint passes. Signed-off-by: Brad Davidson --- .github/workflows/integration.yaml | 2 +- .github/workflows/unitcoverage.yaml | 2 +- Dockerfile.dapper | 13 +++++-------- Dockerfile.manifest | 2 +- Dockerfile.test.dapper | 2 +- Dockerfile.test.mod.dapper | 2 +- pkg/agent/loadbalancer/utility_windows.go | 1 + pkg/agent/templates/templates_windows.go | 1 + pkg/cli/cmds/const_windows.go | 1 + pkg/cli/cmds/init_default.go | 1 + pkg/cli/cmds/log_default.go | 1 + pkg/cli/cmds/nostage.go | 1 + pkg/containerd/builtins.go | 1 + pkg/containerd/builtins_cri_linux.go | 1 + pkg/containerd/builtins_linux.go | 1 + pkg/containerd/main.go | 1 + pkg/deploy/nostage.go | 1 + pkg/static/nostage.go | 1 + scripts/provision/generic/alpine312/vagrant | 2 +- scripts/provision/generic/centos7/vagrant | 2 +- scripts/provision/generic/opensuse15/vagrant | 2 +- scripts/provision/generic/ubuntu1804/vagrant | 2 +- tests/integration/Dockerfile.test | 4 ++-- tests/terraform/Dockerfile.build | 8 ++++---- 24 files changed, 32 insertions(+), 23 deletions(-) diff --git a/.github/workflows/integration.yaml b/.github/workflows/integration.yaml index 85be47fac2..7bf1332adc 100644 --- a/.github/workflows/integration.yaml +++ b/.github/workflows/integration.yaml @@ -47,7 +47,7 @@ jobs: - name: Install Go uses: actions/setup-go@v2 with: - go-version: '1.17.5' + go-version: '1.18.1' - name: Checkout uses: actions/checkout@v2 with: diff --git a/.github/workflows/unitcoverage.yaml b/.github/workflows/unitcoverage.yaml index b56e19ee57..c4ad304ea3 100644 --- a/.github/workflows/unitcoverage.yaml +++ b/.github/workflows/unitcoverage.yaml @@ -33,7 +33,7 @@ jobs: - name: Install Go uses: actions/setup-go@v2 with: - go-version: '1.17.5' + go-version: '1.18.1' - name: Checkout uses: actions/checkout@v2 with: diff --git a/Dockerfile.dapper b/Dockerfile.dapper index f20f67d115..3ebcad5798 100644 --- a/Dockerfile.dapper +++ b/Dockerfile.dapper @@ -1,4 +1,4 @@ -ARG GOLANG=golang:1.17.5-alpine3.15 +ARG GOLANG=golang:1.18.1-alpine3.15 FROM ${GOLANG} ARG http_proxy=$http_proxy @@ -11,7 +11,7 @@ ENV no_proxy=$no_proxy RUN apk -U --no-cache add bash git gcc musl-dev docker vim less file curl wget ca-certificates jq linux-headers \ zlib-dev tar zip squashfs-tools npm coreutils python3 openssl-dev libffi-dev libseccomp libseccomp-dev \ libseccomp-static make libuv-static sqlite-dev sqlite-static libselinux libselinux-dev zlib-dev zlib-static \ - zstd pigz alpine-sdk binutils-gold btrfs-progs-dev btrfs-progs-static gawk \ + zstd pigz alpine-sdk binutils-gold btrfs-progs-dev btrfs-progs-static gawk yq \ && \ if [ "$(go env GOARCH)" = "amd64" ]; then \ apk -U --no-cache add mingw-w64-gcc; \ @@ -30,17 +30,14 @@ RUN if [ "$(go env GOARCH)" = "arm64" ]; then tar -zxvf trivy_0.25.3_Linux-64bit.tar.gz && \ mv trivy /usr/local/bin; \ fi -# this works for both go 1.15 and 1.16 -RUN GOPROXY=direct go get golang.org/x/tools/cmd/goimports@gopls/v0.7.0 +# this works for both go 1.17 and 1.18 +RUN GOPROXY=direct go install golang.org/x/tools/cmd/goimports@gopls/v0.8.2 RUN rm -rf /go/src /go/pkg RUN if [ "$(go env GOARCH)" = "amd64" ]; then \ - curl -sL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s v1.45.2; \ + curl -sL https://raw.githubusercontent.com/golangci/golangci-lint/v1.45.2/install.sh | sh -s; \ fi -ENV YQ_URL=https://github.com/mikefarah/yq/releases/download/v4.6.2/yq_linux -RUN wget -O - ${YQ_URL}_$(go env GOARCH) > /usr/bin/yq && chmod +x /usr/bin/yq - ARG SELINUX=true ENV SELINUX $SELINUX diff --git a/Dockerfile.manifest b/Dockerfile.manifest index 31defacf11..648dc2022f 100644 --- a/Dockerfile.manifest +++ b/Dockerfile.manifest @@ -1,4 +1,4 @@ -ARG GOLANG=golang:1.17.5-alpine3.15 +ARG GOLANG=golang:1.18.1-alpine3.15 FROM ${GOLANG} COPY --from=plugins/manifest:1.2.3 /bin/* /bin/ diff --git a/Dockerfile.test.dapper b/Dockerfile.test.dapper index 3db2dc0afd..7e8e8a6075 100644 --- a/Dockerfile.test.dapper +++ b/Dockerfile.test.dapper @@ -1,4 +1,4 @@ -ARG GOLANG=golang:1.17.5-alpine3.15 +ARG GOLANG=golang:1.18.1-alpine3.15 FROM ${GOLANG} RUN apk -U --no-cache add bash git gcc musl-dev docker curl jq coreutils python3 openssl py3-pip procps diff --git a/Dockerfile.test.mod.dapper b/Dockerfile.test.mod.dapper index babad48d05..9eb7186aae 100644 --- a/Dockerfile.test.mod.dapper +++ b/Dockerfile.test.mod.dapper @@ -1,4 +1,4 @@ -ARG GOLANG=golang:1.17.5-alpine3.15 +ARG GOLANG=golang:1.18.1-alpine3.15 FROM ${GOLANG} RUN apk -U --no-cache add bash jq diff --git a/pkg/agent/loadbalancer/utility_windows.go b/pkg/agent/loadbalancer/utility_windows.go index 4648f8fd25..60fe130434 100644 --- a/pkg/agent/loadbalancer/utility_windows.go +++ b/pkg/agent/loadbalancer/utility_windows.go @@ -1,3 +1,4 @@ +//go:build windows // +build windows package loadbalancer diff --git a/pkg/agent/templates/templates_windows.go b/pkg/agent/templates/templates_windows.go index 5d70bd98ae..ce7190d343 100644 --- a/pkg/agent/templates/templates_windows.go +++ b/pkg/agent/templates/templates_windows.go @@ -1,3 +1,4 @@ +//go:build windows // +build windows package templates diff --git a/pkg/cli/cmds/const_windows.go b/pkg/cli/cmds/const_windows.go index c77a966515..f8f59c52e2 100644 --- a/pkg/cli/cmds/const_windows.go +++ b/pkg/cli/cmds/const_windows.go @@ -1,3 +1,4 @@ +//go:build windows // +build windows package cmds diff --git a/pkg/cli/cmds/init_default.go b/pkg/cli/cmds/init_default.go index 12da597a5f..283e18b960 100644 --- a/pkg/cli/cmds/init_default.go +++ b/pkg/cli/cmds/init_default.go @@ -1,3 +1,4 @@ +//go:build !linux || !cgo // +build !linux !cgo package cmds diff --git a/pkg/cli/cmds/log_default.go b/pkg/cli/cmds/log_default.go index b056c2cfed..bafcda9156 100644 --- a/pkg/cli/cmds/log_default.go +++ b/pkg/cli/cmds/log_default.go @@ -1,3 +1,4 @@ +//go:build !linux || !cgo // +build !linux !cgo package cmds diff --git a/pkg/cli/cmds/nostage.go b/pkg/cli/cmds/nostage.go index 9741e4490b..bb9f1b9f08 100644 --- a/pkg/cli/cmds/nostage.go +++ b/pkg/cli/cmds/nostage.go @@ -1,3 +1,4 @@ +//go:build no_stage // +build no_stage package cmds diff --git a/pkg/containerd/builtins.go b/pkg/containerd/builtins.go index 169db2ea44..6aeee7725d 100644 --- a/pkg/containerd/builtins.go +++ b/pkg/containerd/builtins.go @@ -1,3 +1,4 @@ +//go:build ctrd // +build ctrd /* diff --git a/pkg/containerd/builtins_cri_linux.go b/pkg/containerd/builtins_cri_linux.go index 5df1c050ae..41b30de1dc 100644 --- a/pkg/containerd/builtins_cri_linux.go +++ b/pkg/containerd/builtins_cri_linux.go @@ -1,3 +1,4 @@ +//go:build ctrd // +build ctrd /* diff --git a/pkg/containerd/builtins_linux.go b/pkg/containerd/builtins_linux.go index db8c6e26b3..8ca5627ee7 100644 --- a/pkg/containerd/builtins_linux.go +++ b/pkg/containerd/builtins_linux.go @@ -1,3 +1,4 @@ +//go:build ctrd // +build ctrd /* diff --git a/pkg/containerd/main.go b/pkg/containerd/main.go index 75ccc188fa..83750a788c 100644 --- a/pkg/containerd/main.go +++ b/pkg/containerd/main.go @@ -1,3 +1,4 @@ +//go:build ctrd // +build ctrd package containerd diff --git a/pkg/deploy/nostage.go b/pkg/deploy/nostage.go index 40e84e7015..553d624c77 100644 --- a/pkg/deploy/nostage.go +++ b/pkg/deploy/nostage.go @@ -1,3 +1,4 @@ +//go:build no_stage // +build no_stage package deploy diff --git a/pkg/static/nostage.go b/pkg/static/nostage.go index aec21f08e8..f3fc604901 100644 --- a/pkg/static/nostage.go +++ b/pkg/static/nostage.go @@ -1,3 +1,4 @@ +//go:build no_stage // +build no_stage package static diff --git a/scripts/provision/generic/alpine312/vagrant b/scripts/provision/generic/alpine312/vagrant index dddcd23998..ee06985383 100755 --- a/scripts/provision/generic/alpine312/vagrant +++ b/scripts/provision/generic/alpine312/vagrant @@ -15,7 +15,7 @@ EOF # --- . /tmp/docker-run # --- -go get -u github.com/go-delve/delve/cmd/dlv +go install -u github.com/go-delve/delve/cmd/dlv # --- cat </etc/profile.d/docker.sh export DOCKER_HOST=tcp://10.0.2.2:2375 diff --git a/scripts/provision/generic/centos7/vagrant b/scripts/provision/generic/centos7/vagrant index bf88a92b62..45ec5e6eee 100755 --- a/scripts/provision/generic/centos7/vagrant +++ b/scripts/provision/generic/centos7/vagrant @@ -13,7 +13,7 @@ sed -E 's|apk( -U)?( --no-cache)?( --repository [^ ]*)? add|yum install -y|g' -i sed -E 's/-dev/-devel/g' -i /tmp/docker-run . /tmp/docker-run # --- -go get -u github.com/go-delve/delve/cmd/dlv +go install -u github.com/go-delve/delve/cmd/dlv # --- # docker install instructions slightly changed from https://kubernetes.io/docs/setup/production-environment/container-runtimes/ # default "exec-opts": ["native.cgroupdriver=cgroupfs"], and set "selinux-enabled": true diff --git a/scripts/provision/generic/opensuse15/vagrant b/scripts/provision/generic/opensuse15/vagrant index 96713d6b92..a9a94e8ca0 100755 --- a/scripts/provision/generic/opensuse15/vagrant +++ b/scripts/provision/generic/opensuse15/vagrant @@ -19,5 +19,5 @@ zypper -q install -y \ sed -E 's|apk( -U)?( --no-cache)?( --repository [^ ]*)? add .*||g' -i /tmp/docker-run . /tmp/docker-run # --- -go get -u github.com/go-delve/delve/cmd/dlv +go install -u github.com/go-delve/delve/cmd/dlv # --- diff --git a/scripts/provision/generic/ubuntu1804/vagrant b/scripts/provision/generic/ubuntu1804/vagrant index ef3d89eb83..c0b1c735ce 100755 --- a/scripts/provision/generic/ubuntu1804/vagrant +++ b/scripts/provision/generic/ubuntu1804/vagrant @@ -36,5 +36,5 @@ apt-get install -y \ zstd # --- -go get -u github.com/go-delve/delve/cmd/dlv +go install -u github.com/go-delve/delve/cmd/dlv # --- diff --git a/tests/integration/Dockerfile.test b/tests/integration/Dockerfile.test index b533b3ea4b..8b96ad63ef 100644 --- a/tests/integration/Dockerfile.test +++ b/tests/integration/Dockerfile.test @@ -13,5 +13,5 @@ COPY ./tests/integration/test-runner.sh . COPY ./dist/artifacts/k3s /usr/local/bin COPY ./dist/artifacts/k3s-integration-* ./tests/ -RUN go get -u github.com/onsi/gomega -RUN go get -u github.com/onsi/ginkgo +RUN go install -u github.com/onsi/gomega +RUN go install -u github.com/onsi/ginkgo diff --git a/tests/terraform/Dockerfile.build b/tests/terraform/Dockerfile.build index a67d1dbae5..5ddbadc9d0 100644 --- a/tests/terraform/Dockerfile.build +++ b/tests/terraform/Dockerfile.build @@ -19,7 +19,7 @@ RUN apk update && \ WORKDIR $GOPATH/src/github.com/k3s-io/k3s COPY . . -RUN go get github.com/gruntwork-io/terratest/modules/terraform -RUN go get -u github.com/onsi/gomega -RUN go get -u github.com/onsi/ginkgo/v2 -RUN go get -u golang.org/x/crypto/... +RUN go install github.com/gruntwork-io/terratest/modules/terraform +RUN go install -u github.com/onsi/gomega +RUN go install -u github.com/onsi/ginkgo/v2 +RUN go install -u golang.org/x/crypto/...