From 111fc69ab1e2f1340e99005a1610e7c33fb3a050 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=B1=E7=9C=A0=E6=98=AF=E7=9C=9F=E6=BB=B4=E9=9A=BE?= =?UTF-8?q?=E5=8F=97?= Date: Thu, 21 Jul 2022 18:56:52 +0800 Subject: [PATCH] ci: update go version to 1.18 (#5084) * ci: update go version to 1.18 * feat: update Dockerfile go version --- .github/workflows/e2e-test.yml | 4 ++-- .github/workflows/nightly-builds.yml | 4 ++-- build/ks-apiserver/Dockerfile | 6 +++--- build/ks-controller-manager/Dockerfile | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/e2e-test.yml b/.github/workflows/e2e-test.yml index 940f862d7..2f056f5f5 100644 --- a/.github/workflows/e2e-test.yml +++ b/.github/workflows/e2e-test.yml @@ -13,10 +13,10 @@ jobs: GO111MODULE: on steps: - - name: Set up Go 1.16 + - name: Set up Go 1.18 uses: actions/setup-go@v2 with: - go-version: 1.16 + go-version: 1.18 id: go - name: Check out code into the Go module directory diff --git a/.github/workflows/nightly-builds.yml b/.github/workflows/nightly-builds.yml index c33b16630..875b24e75 100644 --- a/.github/workflows/nightly-builds.yml +++ b/.github/workflows/nightly-builds.yml @@ -15,10 +15,10 @@ jobs: GO111MODULE: on steps: - - name: Set up Go 1.16 + - name: Set up Go 1.18 uses: actions/setup-go@v2 with: - go-version: 1.16 + go-version: 1.18 id: go - name: Check out code into the Go module directory diff --git a/build/ks-apiserver/Dockerfile b/build/ks-apiserver/Dockerfile index fd2200415..163a0ec05 100644 --- a/build/ks-apiserver/Dockerfile +++ b/build/ks-apiserver/Dockerfile @@ -14,8 +14,8 @@ WORKDIR /tmp RUN apk add --no-cache ca-certificates -# Build -FROM golang:1.16.3 as build_context +# Build +FROM golang:1.18.4 as build_context ENV OUTDIR=/out RUN mkdir -p ${OUTDIR}/usr/local/bin/ @@ -30,7 +30,7 @@ RUN mv /workspace/bin/cmd/ks-apiserver ${OUTDIR}/usr/local/bin/ # Final image ############# -FROM alpine:3.11 +FROM alpine:3.11 COPY --from=base_os_context /out/ / COPY --from=build_context /out/ / diff --git a/build/ks-controller-manager/Dockerfile b/build/ks-controller-manager/Dockerfile index 5d7ea6afa..6af91880e 100644 --- a/build/ks-controller-manager/Dockerfile +++ b/build/ks-controller-manager/Dockerfile @@ -22,7 +22,7 @@ RUN mv /tmp/ingress-nginx ${OUTDIR}/var/helm-charts/ # Build -FROM golang:1.16.3 as build_context +FROM golang:1.18.4 as build_context ENV OUTDIR=/out RUN mkdir -p ${OUTDIR}/usr/local/bin/ @@ -40,7 +40,7 @@ RUN mv /workspace/config/watches.yaml ${OUTDIR}/var/helm-charts/ # Final Image -FROM alpine:3.11 +FROM alpine:3.11 COPY --from=base_os_context /out/ / COPY --from=build_context /out/ /