Merge pull request #531 from planetscale/create-pull-request/patch

Upgrade Vitess Dependency to Latest
planetscale · Feb 13, 2024 · 4cfa840 · 4cfa840
2 parents 31c020a + 83f6d37
commit 4cfa840
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 18 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.21.0.linux-amd64.tar.gz
-    - tar -C /usr/local -xzf go1.21.0.linux-amd64.tar.gz
+    - wget https://golang.org/dl/go1.22.0.linux-amd64.tar.gz
+    - tar -C /usr/local -xzf go1.22.0.linux-amd64.tar.gz
     - export PATH=$PATH:/usr/local/go/bin
-    - rm go1.21.0.linux-amd64.tar.gz
+    - rm go1.22.0.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.21.0.linux-amd64.tar.gz
-    - tar -C /usr/local -xzf go1.21.0.linux-amd64.tar.gz
+    - wget https://golang.org/dl/go1.22.0.linux-amd64.tar.gz
+    - tar -C /usr/local -xzf go1.22.0.linux-amd64.tar.gz
     - export PATH=$PATH:/usr/local/go/bin
-    - rm go1.21.0.linux-amd64.tar.gz
+    - rm go1.22.0.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.21.0.linux-amd64.tar.gz
-    - tar -C /usr/local -xzf go1.21.0.linux-amd64.tar.gz
+    - wget https://golang.org/dl/go1.22.0.linux-amd64.tar.gz
+    - tar -C /usr/local -xzf go1.22.0.linux-amd64.tar.gz
     - export PATH=$PATH:/usr/local/go/bin
-    - rm go1.21.0.linux-amd64.tar.gz
+    - rm go1.22.0.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.21.1
+        go-version: 1.22.0
       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.21.1
+        go-version: 1.22.0
       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.21.1
+        go-version: 1.22.0
       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.21.1
+          go-version: 1.22.0
 
       - 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.21.1 AS build
+FROM golang:1.22.0 AS build
 
 ENV GO111MODULE=on
 WORKDIR /go/src/planetscale.dev/vitess-operator

diff --git a/go.mod b/go.mod
@@ -1,6 +1,8 @@
 module planetscale.dev/vitess-operator
 
-go 1.21.1
+go 1.22
+
+toolchain go1.22.0
 
 require (
 	github.com/ahmetb/gen-crd-api-reference-docs v0.1.5-0.20190629210212-52e137b8d003
@@ -21,7 +23,7 @@ require (
 	sigs.k8s.io/controller-runtime v0.16.3
 	sigs.k8s.io/controller-tools v0.11.3
 	sigs.k8s.io/kustomize v2.0.3+incompatible
-	vitess.io/vitess v0.10.3-0.20240202215425-940919536a78
+	vitess.io/vitess v0.10.3-0.20240210050533-ea62cee2c58f
 )
 
 require (

diff --git a/go.sum b/go.sum
@@ -825,5 +825,5 @@ sigs.k8s.io/structured-merge-diff/v4 v4.2.3/go.mod h1:qjx8mGObPmV2aSZepjQjbmb2ih
 sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc=
 sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E=
 sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY=
-vitess.io/vitess v0.10.3-0.20240202215425-940919536a78 h1:KS67e4NT+3/u2AY8DUXaiy/nEuRRGHoHDM5UW/6TGLc=
-vitess.io/vitess v0.10.3-0.20240202215425-940919536a78/go.mod h1:OS9UMLc0y9zfPUUGvHqpcURCatpDEgq3U0OzHMyYjr8=
+vitess.io/vitess v0.10.3-0.20240210050533-ea62cee2c58f h1:1Mv8c2FKLginLNCTIPM1ncc09v++rsdZqOuxSE/bBaE=
+vitess.io/vitess v0.10.3-0.20240210050533-ea62cee2c58f/go.mod h1:l74+JJWVrSIuiazQWdg5yNW8Nffv8+uAB4b5wn52iuI=