Upgrade go version everywhere

Signed-off-by: Matt Lord <[email protected]>
planetscale · Jul 16, 2024 · dfc8682 · dfc8682
1 parent 587990c
commit dfc8682
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 16 deletions.
diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
@@ -7,10 +7,10 @@ steps:
   - name: "Upgrade Test"
     command:
     - apk add g++ make bash gcompat curl mysql mysql-client libc6-compat
-    - wget https://golang.org/dl/go1.20.2.linux-amd64.tar.gz
-    - tar -C /usr/local -xzf go1.20.2.linux-amd64.tar.gz
+    - wget https://golang.org/dl/go1.21.10.linux-amd64.tar.gz
+    - tar -C /usr/local -xzf go1.21.10.linux-amd64.tar.gz
     - export PATH=$PATH:/usr/local/go/bin
-    - rm go1.20.2.linux-amd64.tar.gz
+    - rm go1.21.10.linux-amd64.tar.gz
     - ln -s /lib/libc.so.6 /usr/lib/libresolv.so.2
     - make upgrade-test
     concurrency: 1
@@ -26,10 +26,10 @@ steps:
   - name: "Backup Restore Test"
     command:
     - apk add g++ make bash gcompat curl mysql mysql-client libc6-compat
-    - wget https://golang.org/dl/go1.20.2.linux-amd64.tar.gz
-    - tar -C /usr/local -xzf go1.20.2.linux-amd64.tar.gz
+    - wget https://golang.org/dl/go1.21.10.linux-amd64.tar.gz
+    - tar -C /usr/local -xzf go1.21.10.linux-amd64.tar.gz
     - export PATH=$PATH:/usr/local/go/bin
-    - rm go1.20.2.linux-amd64.tar.gz
+    - rm go1.21.10.linux-amd64.tar.gz
     - ln -s /lib/libc.so.6 /usr/lib/libresolv.so.2
     - make backup-restore-test
     concurrency: 1
@@ -45,10 +45,10 @@ steps:
   - name: "VTOrc and VTAdmin Test"
     command:
     - apk add g++ make bash gcompat curl mysql mysql-client libc6-compat chromium
-    - wget https://golang.org/dl/go1.20.2.linux-amd64.tar.gz
-    - tar -C /usr/local -xzf go1.20.2.linux-amd64.tar.gz
+    - wget https://golang.org/dl/go1.21.10.linux-amd64.tar.gz
+    - tar -C /usr/local -xzf go1.21.10.linux-amd64.tar.gz
     - export PATH=$PATH:/usr/local/go/bin
-    - rm go1.20.2.linux-amd64.tar.gz
+    - rm go1.21.10.linux-amd64.tar.gz
     - ln -s /lib/libc.so.6 /usr/lib/libresolv.so.2
     - make vtorc-vtadmin-test
     concurrency: 1

diff --git a/.github/workflows/integration-test.yaml b/.github/workflows/integration-test.yaml
@@ -17,7 +17,7 @@ jobs:
     - name: Set up Go
       uses: actions/setup-go@v2
       with:
-        go-version: 1.20.2
+        go-version: 1.21.10
       id: go
 
     - name: Check out code into the Go module directory

diff --git a/.github/workflows/make-generate-and-diff.yaml b/.github/workflows/make-generate-and-diff.yaml
@@ -17,7 +17,7 @@ jobs:
     - name: Set up Go
       uses: actions/setup-go@v2
       with:
-        go-version: 1.20.2
+        go-version: 1.21.10
       id: go
 
     - name: Check out code into the Go module directory

diff --git a/.github/workflows/unit-test.yaml b/.github/workflows/unit-test.yaml
@@ -17,7 +17,7 @@ jobs:
     - name: Set up Go
       uses: actions/setup-go@v2
       with:
-        go-version: 1.20.2
+        go-version: 1.21.10
       id: go
 
     - name: Check out code into the Go module directory

diff --git a/.github/workflows/upgrade-vitess-dependency.yaml b/.github/workflows/upgrade-vitess-dependency.yaml
@@ -20,7 +20,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v2
         with:
-          go-version: 1.20.2
+          go-version: 1.21.10
 
       - name: Check out code into the Go module directory
         uses: actions/checkout@v2

diff --git a/build/Dockerfile.release b/build/Dockerfile.release
@@ -11,7 +11,7 @@
 # without messing up file permissions, since the Docker container doesn't run as
 # your actual user.
 
-FROM golang:1.20.2 AS build
+FROM golang:1.21.10 AS build
 
 ENV GO111MODULE=on
 WORKDIR /go/src/planetscale.dev/vitess-operator

diff --git a/go.mod b/go.mod
@@ -2,8 +2,6 @@ module planetscale.dev/vitess-operator
 
 go 1.21.10
 
-toolchain go1.22.5
-
 require (
 	github.com/ahmetb/gen-crd-api-reference-docs v0.1.5-0.20190629210212-52e137b8d003
 	github.com/google/uuid v1.3.1