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

Upgrade Vitess Dependency to Latest
planetscale · Jan 28, 2025 · 5849311 · 5849311
2 parents 70ed84e + a085753
commit 5849311
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 17 deletions.
diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
@@ -2,7 +2,7 @@ agents:
   queue: "public"
 
 env:
-  GO_VERSION_FILE: "go1.23.4.linux-amd64.tar.gz"
+  GO_VERSION_FILE: "go1.23.5.linux-amd64.tar.gz"
 
 # Mount the docker.sock as to the docker container, so that we are able to
 # run docker build command and kind is spawned as a sibling container.
@@ -12,7 +12,7 @@ steps:
     - apk add g++ make bash gcompat curl mysql mysql-client libc6-compat
     - wget https://golang.org/dl/$GO_VERSION_FILE
     - tar -C /usr/local -xzf $GO_VERSION_FILE
-    - export PATH=$PATH:/usr/local/go/bin
+    - export PATH=$PATH:/usr/local/go/bin:/bin
     - rm $GO_VERSION_FILE
     - ln -s /lib/libc.so.6 /usr/lib/libresolv.so.2
     - make upgrade-test
@@ -31,7 +31,7 @@ steps:
     - apk add g++ make bash gcompat curl mysql mysql-client libc6-compat
     - wget https://golang.org/dl/$GO_VERSION_FILE
     - tar -C /usr/local -xzf $GO_VERSION_FILE
-    - export PATH=$PATH:/usr/local/go/bin
+    - export PATH=$PATH:/usr/local/go/bin:/bin
     - rm $GO_VERSION_FILE
     - ln -s /lib/libc.so.6 /usr/lib/libresolv.so.2
     - make backup-restore-test
@@ -50,7 +50,7 @@ steps:
       - apk add g++ make bash gcompat curl mysql mysql-client libc6-compat
       - wget https://golang.org/dl/$GO_VERSION_FILE
       - tar -C /usr/local -xzf $GO_VERSION_FILE
-      - export PATH=$PATH:/usr/local/go/bin
+      - export PATH=$PATH:/usr/local/go/bin:/bin
       - rm $GO_VERSION_FILE
       - ln -s /lib/libc.so.6 /usr/lib/libresolv.so.2
       - make backup-schedule-test
@@ -69,7 +69,7 @@ steps:
     - apk add g++ make bash gcompat curl mysql mysql-client libc6-compat chromium
     - wget https://golang.org/dl/$GO_VERSION_FILE
     - tar -C /usr/local -xzf $GO_VERSION_FILE
-    - export PATH=$PATH:/usr/local/go/bin
+    - export PATH=$PATH:/usr/local/go/bin:/bin
     - rm $GO_VERSION_FILE
     - ln -s /lib/libc.so.6 /usr/lib/libresolv.so.2
     - make vtorc-vtadmin-test
@@ -85,10 +85,10 @@ steps:
 
   - name: "Unmanaged Tablet Test"
     command:
-    - apk add g++ make bash gcompat curl mysql mysql-client libc6-compat chromium
+    - apk add g++ make bash gcompat curl mysql mysql-client libc6-compat chromium coreutils
     - wget https://golang.org/dl/$GO_VERSION_FILE
     - tar -C /usr/local -xzf $GO_VERSION_FILE
-    - export PATH=$PATH:/usr/local/go/bin
+    - export PATH=$PATH:/usr/local/go/bin:/bin
     - rm $GO_VERSION_FILE
     - ln -s /lib/libc.so.6 /usr/lib/libresolv.so.2
     - make unmanaged-tablet-test
@@ -107,7 +107,7 @@ steps:
     - apk add g++ make bash gcompat curl mysql mysql-client libc6-compat
     - wget https://golang.org/dl/$GO_VERSION_FILE
     - tar -C /usr/local -xzf $GO_VERSION_FILE
-    - export PATH=$PATH:/usr/local/go/bin
+    - export PATH=$PATH:/usr/local/go/bin:/bin
     - rm $GO_VERSION_FILE
     - ln -s /lib/libc.so.6 /usr/lib/libresolv.so.2
     - make hpa-test

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.23.4
+        go-version: 1.23.5
       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.23.4
+        go-version: 1.23.5
       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.23.4
+        go-version: 1.23.5
       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.23.4
+          go-version: 1.23.5
 
       - 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.23.4 AS build
+FROM golang:1.23.5 AS build
 
 ENV GO111MODULE=on
 WORKDIR /go/src/planetscale.dev/vitess-operator

diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module planetscale.dev/vitess-operator
 
-go 1.23.4
+go 1.23.5
 
 require (
 	github.com/ahmetb/gen-crd-api-reference-docs v0.3.0
@@ -22,7 +22,7 @@ require (
 	sigs.k8s.io/controller-runtime v0.19.0
 	sigs.k8s.io/controller-tools v0.16.1
 	sigs.k8s.io/kustomize v2.0.3+incompatible
-	vitess.io/vitess v0.10.3-0.20250117025239-eaaa2063ef87
+	vitess.io/vitess v0.10.3-0.20250124174950-8412fe81d4a5
 )
 
 require (

diff --git a/go.sum b/go.sum
@@ -866,5 +866,5 @@ sigs.k8s.io/structured-merge-diff/v4 v4.4.1/go.mod h1:N8hJocpFajUSSeSJ9bOZ77Vzej
 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.20250117025239-eaaa2063ef87 h1:9GngLsEJlYvJqj5+e3Xi/qcCScwuEG4c1SHRe3CfWZE=
-vitess.io/vitess v0.10.3-0.20250117025239-eaaa2063ef87/go.mod h1:tVAQJjOna/biF5AETcIrN7SPu/hsY/vrTkN67qDVrzc=
+vitess.io/vitess v0.10.3-0.20250124174950-8412fe81d4a5 h1:zA8m6IgiK7+AfaUV+1MuXasnnUnhk4OpZNc9S6GhMIg=
+vitess.io/vitess v0.10.3-0.20250124174950-8412fe81d4a5/go.mod h1:kKWkRaLpz9Dox87PUiWDS3N5oHWV/eAvNRRnalnyD88=