Commit c8447dca authored by Brad Davidson's avatar Brad Davidson Committed by Brad Davidson

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: 's avatarBrad Davidson <brad.davidson@rancher.com>
parent e6385b23
......@@ -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:
......
......@@ -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:
......
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
......
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/
......
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
......
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
......
//go:build windows
// +build windows
package loadbalancer
......
//go:build windows
// +build windows
package templates
......
//go:build windows
// +build windows
package cmds
......
//go:build !linux || !cgo
// +build !linux !cgo
package cmds
......
//go:build !linux || !cgo
// +build !linux !cgo
package cmds
......
//go:build no_stage
// +build no_stage
package cmds
......
//go:build ctrd
// +build ctrd
/*
......
//go:build ctrd
// +build ctrd
/*
......
//go:build ctrd
// +build ctrd
/*
......
//go:build ctrd
// +build ctrd
package containerd
......
//go:build no_stage
// +build no_stage
package deploy
......
//go:build no_stage
// +build no_stage
package static
......
......@@ -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 <<EOF >/etc/profile.d/docker.sh
export DOCKER_HOST=tcp://10.0.2.2:2375
......
......@@ -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
......
......@@ -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
# ---
......@@ -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
# ---
......@@ -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
......@@ -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/...
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment