feat: upgrade go 1.17 to 1.18 (#1255)

Signed-off-by: fengshunli <[email protected]>
openyurtio · Feb 22, 2023 · d4f1f3a · d4f1f3a
1 parent c3a80ba
commit d4f1f3a
Show file tree

Hide file tree

Showing 13 changed files with 19 additions and 19 deletions.
diff --git a/hack/dockerfiles/build/Dockerfile.node-servant b/hack/dockerfiles/build/Dockerfile.node-servant
@@ -1,6 +1,6 @@
 # multi-arch image building for yurt-node-servant
 
-FROM --platform=${TARGETPLATFORM} alpine:3.14
+FROM --platform=${TARGETPLATFORM} alpine:3.17
 ARG TARGETOS TARGETARCH MIRROR_REPO
 RUN if [ ! -z "${MIRROR_REPO+x}" ]; then sed -i "s/dl-cdn.alpinelinux.org/${MIRROR_REPO}/g" /etc/apk/repositories; fi && \
     apk add ca-certificates bash libc6-compat && update-ca-certificates && rm /var/cache/apk/*

diff --git a/hack/dockerfiles/build/Dockerfile.yurt-controller-manager b/hack/dockerfiles/build/Dockerfile.yurt-controller-manager
@@ -1,6 +1,6 @@
 # multi-arch image building for yurt-controller-manager
 
-FROM --platform=${TARGETPLATFORM} alpine:3.14
+FROM --platform=${TARGETPLATFORM} alpine:3.17
 ARG TARGETOS TARGETARCH MIRROR_REPO
 RUN if [ ! -z "${MIRROR_REPO+x}" ]; then sed -i "s/dl-cdn.alpinelinux.org/${MIRROR_REPO}/g" /etc/apk/repositories; fi && \
     apk add ca-certificates bash libc6-compat && update-ca-certificates && rm /var/cache/apk/*

diff --git a/hack/dockerfiles/build/Dockerfile.yurt-manager b/hack/dockerfiles/build/Dockerfile.yurt-manager
@@ -1,6 +1,6 @@
 # multi-arch image building for yurt-controller-manager
 
-FROM --platform=${TARGETPLATFORM} alpine:3.14
+FROM --platform=${TARGETPLATFORM} alpine:3.17
 ARG TARGETOS TARGETARCH MIRROR_REPO
 RUN if [ ! -z "${MIRROR_REPO+x}" ]; then sed -i "s/dl-cdn.alpinelinux.org/${MIRROR_REPO}/g" /etc/apk/repositories; fi && \
     apk add ca-certificates bash libc6-compat && update-ca-certificates && rm /var/cache/apk/*

diff --git a/hack/dockerfiles/build/Dockerfile.yurt-tunnel-agent b/hack/dockerfiles/build/Dockerfile.yurt-tunnel-agent
@@ -1,6 +1,6 @@
 # multi-arch image building for yurt-tunnel-agent
 
-FROM --platform=${TARGETPLATFORM} alpine:3.14
+FROM --platform=${TARGETPLATFORM} alpine:3.17
 ARG TARGETOS TARGETARCH MIRROR_REPO
 RUN if [ ! -z "${MIRROR_REPO+x}" ]; then sed -i "s/dl-cdn.alpinelinux.org/${MIRROR_REPO}/g" /etc/apk/repositories; fi && \
     apk add ca-certificates bash libc6-compat && update-ca-certificates && rm /var/cache/apk/*

diff --git a/hack/dockerfiles/build/Dockerfile.yurt-tunnel-server b/hack/dockerfiles/build/Dockerfile.yurt-tunnel-server
@@ -1,6 +1,6 @@
 # multi-arch image building for yurt-tunnel-server
 
-FROM --platform=${TARGETPLATFORM} alpine:3.14
+FROM --platform=${TARGETPLATFORM} alpine:3.17
 ARG TARGETOS TARGETARCH MIRROR_REPO
 RUN if [ ! -z "${MIRROR_REPO+x}" ]; then sed -i "s/dl-cdn.alpinelinux.org/${MIRROR_REPO}/g" /etc/apk/repositories; fi && \
     apk add ca-certificates bash libc6-compat iptables ip6tables conntrack-tools && update-ca-certificates && rm /var/cache/apk/*

diff --git a/hack/dockerfiles/build/Dockerfile.yurthub b/hack/dockerfiles/build/Dockerfile.yurthub
@@ -1,6 +1,6 @@
 # multi-arch image building for yurthub
 
-FROM --platform=${TARGETPLATFORM} alpine:3.14
+FROM --platform=${TARGETPLATFORM} alpine:3.17
 ARG TARGETOS TARGETARCH MIRROR_REPO
 RUN if [ ! -z "${MIRROR_REPO+x}" ]; then sed -i "s/dl-cdn.alpinelinux.org/${MIRROR_REPO}/g" /etc/apk/repositories; fi && \
     apk add ca-certificates bash libc6-compat iptables ip6tables && update-ca-certificates && rm /var/cache/apk/*

diff --git a/hack/dockerfiles/release/Dockerfile.node-servant b/hack/dockerfiles/release/Dockerfile.node-servant
@@ -1,12 +1,12 @@
 # multi-arch image building for yurt-node-servant
 
-FROM --platform=${BUILDPLATFORM} golang:1.17.1 as builder
+FROM --platform=${BUILDPLATFORM} golang:1.18 as builder
 ADD . /build
 ARG TARGETOS TARGETARCH GIT_VERSION GOPROXY MIRROR_REPO
 WORKDIR /build/
 RUN CGO_ENABLED=0 GOOS=${TARGETOS} GOARCH=${TARGETARCH} GIT_VERSION=${GIT_VERSION} make build WHAT=cmd/yurt-node-servant
 
-FROM --platform=${TARGETPLATFORM} alpine:3.14
+FROM --platform=${TARGETPLATFORM} alpine:3.17
 ARG TARGETOS TARGETARCH MIRROR_REPO
 RUN if [ ! -z "${MIRROR_REPO+x}" ]; then sed -i "s/dl-cdn.alpinelinux.org/${MIRROR_REPO}/g" /etc/apk/repositories; fi && \
     apk add ca-certificates bash libc6-compat && update-ca-certificates && rm /var/cache/apk/*

diff --git a/hack/dockerfiles/release/Dockerfile.yurt-controller-manager b/hack/dockerfiles/release/Dockerfile.yurt-controller-manager
@@ -1,12 +1,12 @@
 # multi-arch image building for yurt-controller-manager
 
-FROM --platform=${BUILDPLATFORM} golang:1.17.1 as builder
+FROM --platform=${BUILDPLATFORM} golang:1.18 as builder
 ADD . /build
 ARG TARGETOS TARGETARCH GIT_VERSION GOPROXY MIRROR_REPO
 WORKDIR /build/
 RUN CGO_ENABLED=0 GOOS=${TARGETOS} GOARCH=${TARGETARCH} GIT_VERSION=${GIT_VERSION} make build WHAT=cmd/yurt-controller-manager
 
-FROM --platform=${TARGETPLATFORM} alpine:3.14
+FROM --platform=${TARGETPLATFORM} alpine:3.17
 ARG TARGETOS TARGETARCH MIRROR_REPO
 RUN if [ ! -z "${MIRROR_REPO+x}" ]; then sed -i "s/dl-cdn.alpinelinux.org/${MIRROR_REPO}/g" /etc/apk/repositories; fi && \
     apk add ca-certificates bash libc6-compat && update-ca-certificates && rm /var/cache/apk/*

diff --git a/hack/dockerfiles/release/Dockerfile.yurt-manager b/hack/dockerfiles/release/Dockerfile.yurt-manager
@@ -1,12 +1,12 @@
 # multi-arch image building for yurt-tunnel-server
 
-FROM --platform=${BUILDPLATFORM} golang:1.17.1 as builder
+FROM --platform=${BUILDPLATFORM} golang:1.18 as builder
 ADD . /build
 ARG TARGETOS TARGETARCH GIT_VERSION GOPROXY MIRROR_REPO
 WORKDIR /build/
 RUN CGO_ENABLED=0 GOOS=${TARGETOS} GOARCH=${TARGETARCH} GIT_VERSION=${GIT_VERSION} make build WHAT=cmd/yurt-manager
 
-FROM --platform=${TARGETPLATFORM} alpine:3.14
+FROM --platform=${TARGETPLATFORM} alpine:3.17
 ARG TARGETOS TARGETARCH MIRROR_REPO
 RUN if [ ! -z "${MIRROR_REPO+x}" ]; then sed -i "s/dl-cdn.alpinelinux.org/${MIRROR_REPO}/g" /etc/apk/repositories; fi && \
     apk add ca-certificates bash libc6-compat iptables ip6tables conntrack-tools curl && update-ca-certificates && rm /var/cache/apk/*

diff --git a/hack/dockerfiles/release/Dockerfile.yurt-tunnel-agent b/hack/dockerfiles/release/Dockerfile.yurt-tunnel-agent
@@ -1,12 +1,12 @@
 # multi-arch image building for yurt-tunnel-agent
 
-FROM --platform=${BUILDPLATFORM} golang:1.17.1 as builder
+FROM --platform=${BUILDPLATFORM} golang:1.18 as builder
 ADD . /build
 ARG TARGETOS TARGETARCH GIT_VERSION GOPROXY MIRROR_REPO
 WORKDIR /build/
 RUN CGO_ENABLED=0 GOOS=${TARGETOS} GOARCH=${TARGETARCH} GIT_VERSION=${GIT_VERSION} make build WHAT=cmd/yurt-tunnel-agent
 
-FROM --platform=${TARGETPLATFORM} alpine:3.14
+FROM --platform=${TARGETPLATFORM} alpine:3.17
 ARG TARGETOS TARGETARCH MIRROR_REPO
 RUN if [ ! -z "${MIRROR_REPO+x}" ]; then sed -i "s/dl-cdn.alpinelinux.org/${MIRROR_REPO}/g" /etc/apk/repositories; fi && \
     apk add ca-certificates bash libc6-compat && update-ca-certificates && rm /var/cache/apk/*

diff --git a/hack/dockerfiles/release/Dockerfile.yurt-tunnel-server b/hack/dockerfiles/release/Dockerfile.yurt-tunnel-server
@@ -1,12 +1,12 @@
 # multi-arch image building for yurt-tunnel-server
 
-FROM --platform=${BUILDPLATFORM} golang:1.17.1 as builder
+FROM --platform=${BUILDPLATFORM} golang:1.18 as builder
 ADD . /build
 ARG TARGETOS TARGETARCH GIT_VERSION GOPROXY MIRROR_REPO
 WORKDIR /build/
 RUN CGO_ENABLED=0 GOOS=${TARGETOS} GOARCH=${TARGETARCH} GIT_VERSION=${GIT_VERSION} make build WHAT=cmd/yurt-tunnel-server
 
-FROM --platform=${TARGETPLATFORM} alpine:3.14
+FROM --platform=${TARGETPLATFORM} alpine:3.17
 ARG TARGETOS TARGETARCH MIRROR_REPO
 RUN if [ ! -z "${MIRROR_REPO+x}" ]; then sed -i "s/dl-cdn.alpinelinux.org/${MIRROR_REPO}/g" /etc/apk/repositories; fi && \
     apk add ca-certificates bash libc6-compat iptables ip6tables conntrack-tools && update-ca-certificates && rm /var/cache/apk/*

diff --git a/hack/dockerfiles/release/Dockerfile.yurthub b/hack/dockerfiles/release/Dockerfile.yurthub
@@ -1,12 +1,12 @@
 # multi-arch image building for yurthub
 
-FROM --platform=${BUILDPLATFORM} golang:1.17.1 as builder
+FROM --platform=${BUILDPLATFORM} golang:1.18 as builder
 ADD . /build
 ARG TARGETOS TARGETARCH GIT_VERSION GOPROXY MIRROR_REPO
 WORKDIR /build/
 RUN CGO_ENABLED=0 GOOS=${TARGETOS} GOARCH=${TARGETARCH} GIT_VERSION=${GIT_VERSION} make build WHAT=cmd/yurthub
 
-FROM --platform=${TARGETPLATFORM} alpine:3.14
+FROM --platform=${TARGETPLATFORM} alpine:3.17
 ARG TARGETOS TARGETARCH MIRROR_REPO
 RUN if [ ! -z "${MIRROR_REPO+x}" ]; then sed -i "s/dl-cdn.alpinelinux.org/${MIRROR_REPO}/g" /etc/apk/repositories; fi && \
     apk add ca-certificates bash libc6-compat iptables ip6tables && update-ca-certificates && rm /var/cache/apk/*

diff --git a/hack/make-rules/image_build.sh b/hack/make-rules/image_build.sh
@@ -37,7 +37,7 @@ REGION=${REGION:-}
 IMAGE_REPO=${IMAGE_REPO:-"openyurt"}
 IMAGE_TAG=${IMAGE_TAG:-$(get_image_tag)}
 DOCKER_BUILD_ARGS=""
-BUILD_BASE_IMAGE="golang:1.17.1"
+BUILD_BASE_IMAGE="golang:1.18"
 BUILD_GOPROXY=$(go env GOPROXY)
 GOPROXY_CN="https://goproxy.cn"
 APKREPO_MIRROR_CN="mirrors.aliyun.com"