Merge pull request #1342 from ktock/go-1.21

Bump up Golang to 1.21
containerd · Aug 14, 2023 · c3b60cf · c3b60cf
2 parents 45af8ff + 086797f
commit c3b60cf
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
@@ -89,7 +89,7 @@ jobs:
     steps:
     - uses: actions/setup-go@v4
       with:
-        go-version: '1.20.x'
+        go-version: '1.21.x'
     - name: Install k3d
       run: |
         wget -q -O - https://raw.githubusercontent.com/rancher/k3d/v5.0.0/install.sh | bash

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -190,7 +190,7 @@ jobs:
     steps:
     - uses: actions/setup-go@v4
       with:
-        go-version: '1.20.x'
+        go-version: '1.21.x'
     - name: Install k3d
       run: |
         wget -q -O - https://raw.githubusercontent.com/rancher/k3d/v5.0.0/install.sh | bash
@@ -220,7 +220,7 @@ jobs:
     steps:
     - uses: actions/setup-go@v4
       with:
-        go-version: '1.20.x'
+        go-version: '1.21.x'
     - name: Install k3d
       run: |
         wget -q -O - https://raw.githubusercontent.com/rancher/k3d/v5.0.0/install.sh | bash

diff --git a/Dockerfile b/Dockerfile
@@ -32,7 +32,7 @@ ARG CRI_TOOLS_VERSION=v1.27.0
 # Legacy builder that doesn't support TARGETARCH should set this explicitly using --build-arg.
 # If TARGETARCH isn't supported by the builder, the default value is "amd64".
 
-FROM golang:1.20.7-bullseye AS golang-base
+FROM golang:1.21.0-bullseye AS golang-base
 
 # Build containerd
 FROM golang-base AS containerd-dev