Merge remote-tracking branch 'origin/main' into keyspace_level_backups

Author: mattlord

.buildkite/pipeline.yml

@@ -2,7 +2,7 @@ agents:
   queue: "public"
 
 env:
-  GO_VERSION_FILE: "go1.25.6.linux-amd64.tar.gz"
+  GO_VERSION_FILE: "go1.26.1.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.

.github/workflows/integration-test.yaml

@@ -14,14 +14,14 @@ jobs:
     runs-on: ubuntu-latest
     steps:
 
+    - name: Check out code into the Go module directory
+      uses: actions/checkout@v6
+
     - name: Set up Go
-      uses: actions/setup-go@v6
+      uses: actions/setup-go@4b73464bb391d4059bd26b0524d20df3927bd417 # v6.3.0
       with:
-        go-version: 1.25.6
+        go-version-file: go.mod
       id: go
 
-    - name: Check out code into the Go module directory
-      uses: actions/checkout@v6
-
     - name: Integration Test
       run: make integration-test

.github/workflows/make-generate-and-diff.yaml

@@ -14,16 +14,14 @@ jobs:
     runs-on: ubuntu-latest
     steps:
 
-    - name: Set up Go
-      uses: actions/setup-go@v6
-      with:
-        go-version: 1.25.6
-      id: go
-
     - name: Check out code into the Go module directory
       uses: actions/checkout@v6
+
+    - name: Set up Go
+      uses: actions/setup-go@4b73464bb391d4059bd26b0524d20df3927bd417 # v6.3.0
       with:
-        path: src/planetscale.dev/vitess-operator
+        go-version-file: go.mod
+      id: go
 
     - name: make generate-and-diff
-      run: make -C src/planetscale.dev/vitess-operator generate-and-diff
+      run: make generate-and-diff

.github/workflows/unit-test.yaml

@@ -14,15 +14,15 @@ jobs:
     runs-on: ubuntu-latest
     steps:
 
+    - name: Check out code into the Go module directory
+      uses: actions/checkout@v6
+
     - name: Set up Go
-      uses: actions/setup-go@v6
+      uses: actions/setup-go@4b73464bb391d4059bd26b0524d20df3927bd417 # v6.3.0
       with:
-        go-version: 1.25.6
+        go-version-file: go.mod
       id: go
 
-    - name: Check out code into the Go module directory
-      uses: actions/checkout@v6
-
     - name: Build
       run: CGO_ENABLED=0 go install -v ./...
 

.github/workflows/upgrade-vitess-dependency.yaml

@@ -17,14 +17,14 @@ jobs:
     name: Upgrade Vitess Dependency
     runs-on: ubuntu-latest
     steps:
-      - name: Set up Go
-        uses: actions/setup-go@v6
-        with:
-          go-version: 1.25.6
-
       - name: Check out code into the Go module directory
         uses: actions/checkout@v6
 
+      - name: Set up Go
+        uses: actions/setup-go@4b73464bb391d4059bd26b0524d20df3927bd417 # v6.3.0
+        with:
+          go-version-file: go.mod
+
       - name: Go Get latest Vitess Dependency
         run: |
           go get -d vitess.io/vitess@main
@@ -39,5 +39,6 @@ jobs:
           title: "Upgrade Vitess Dependency to Latest"
           body: "Weekly Vitess dependency upgrade running on a cron schedule"
           reviewers: |
-            frouioui
-            GuptaManan100
+            mattlord
+            mhamza15
+            timvaillancourt

README.md

@@ -16,13 +16,10 @@ compatible with certain Vitess and Kubernetes versions, as shown in this table:
 
 | Vitess Operator Version | Recommended Vitess Versions | Recommended Kubernetes Versions               |
 |-------------------------|-----------------------------|-----------------------------------------------|
-| `v2.11.*`               | `v18.0.*`                   | `v1.22.*`, `v1.23.*`, `v1.24.*`, or `v1.25.*` |
-| `v2.12.*`               | `v19.0.*`                   | `v1.25.*`, `v1.26.*`, `v1.27.*`, or `v1.28.*` |
-| `v2.13.*`               | `v20.0.*`                   | `v1.25.*`, `v1.26.*`, `v1.27.*`, or `v1.28.*` |
 | `v2.14.*`               | `v21.0.*`                   | `v1.29.*`, `v1.30.*`, `v1.31.*`               |
 | `v2.15.*`               | `v22.0.*`                   | `v1.30.*`, `v1.31.*`, `v1.32.*`               |
 | `v2.16.*`               | `v23.0.*`                   | `v1.31.*`, `v1.32.*`, `v1.33.*`, or `v1.34.*` |
-| `latest`                | `latest`                    | `v1.31.*`, `v1.32.*`, `v1.33.*`, or `v1.34.*` |
+| `latest`                | `latest`                    | `v1.32.*`, `v1.33.*`, `v1.34.*`, or `v1.35.*` |
 
 If for some reason you must attempt to use versions outside the recommend
 window, we still welcome bug reports since a workaround might be possible.

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

deploy/crds/planetscale.com_etcdlockservers.yaml

@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.2
+    controller-gen.kubebuilder.io/version: v0.20.1
   name: etcdlockservers.planetscale.com
 spec:
   group: planetscale.com

deploy/crds/planetscale.com_vitessbackups.yaml

@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.2
+    controller-gen.kubebuilder.io/version: v0.20.1
   name: vitessbackups.planetscale.com
 spec:
   group: planetscale.com

deploy/crds/planetscale.com_vitessbackupschedules.yaml

@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.2
+    controller-gen.kubebuilder.io/version: v0.20.1
   name: vitessbackupschedules.planetscale.com
 spec:
   group: planetscale.com