Manual backport of upstream https://github.com/vitessio/vitess/pull/17300

.github/CODEOWNERS

@@ -1,51 +1 @@
-bootstrap.sh @deepthi
-/config/mycnf/ @deepthi @shlomi-noach @mattlord
-/docker/ @derekperkins @dkhenry @mattlord
-/examples/compose @shlomi-noach
-/examples/demo @sougou @mattlord
-/examples/legacy_local @deepthi
-/examples/local @rohit-nayak-ps @frouioui @mattlord
-/examples/operator @GuptaManan100 @frouioui
-/examples/region_sharding @deepthi
-/java/ @harshit-gangal
-/go/cache @vmg
-/go/cmd @ajm188
-/go/cmd/vtadmin @ajm188 @doeg @notfelineit
-/go/cmd/vtctldclient @ajm188 @notfelineit
-/go/internal/flag @ajm188
-/go/mysql @harshit-gangal @systay @mattlord
-/go/protoutil @ajm188
-/go/test/endtoend/onlineddl @shlomi-noach
-/go/test/endtoend/vtorc @deepthi @shlomi-noach @GuptaManan100
-/go/test/endtoend/messaging @mattlord @rohit-nayak-ps @derekperkins
-/go/test/endtoend/vtgate @harshit-gangal @systay @frouioui
-/go/vt/discovery @deepthi
-/go/vt/mysqlctl @deepthi @mattlord
-/go/vt/vtorc @deepthi @shlomi-noach @GuptaManan100
-/go/vt/proto/vtadmin @ajm188 @doeg @notfelineit
-/go/vt/schema @shlomi-noach
-/go/vt/servenv @deepthi @ajm188
-/go/vt/sqlparser @harshit-gangal @systay @GuptaManan100
-/go/vt/srvtopo @rafael
-/go/vt/topo @deepthi @rafael
-/go/vt/vtadmin @ajm188 @doeg @notfelineit @rohit-nayak-ps
-/go/vt/vtctl @deepthi
-/go/vt/vtctl/vtctl.go @ajm188 @notfelineit
-/go/vt/vtctl/grpcvtctldclient @ajm188 @notfelineit
-/go/vt/vtctl/grpcvtctldserver @ajm188 @notfelineit
-/go/vt/vtctl/vtctldclient @ajm188 @notfelineit
-/go/vt/vtctld @ajm188 @deepthi @notfelineit @rohit-nayak-ps
-/go/vt/vtexplain @systay
-/go/vt/vtgate @harshit-gangal @systay @frouioui
-/go/vt/vttablet/tabletmanager @deepthi @shlomi-noach
-/go/vt/vttablet/tabletmanager/vreplication @rohit-nayak-ps @mattlord
-/go/vt/vttablet/tabletmanager/vstreamer @rohit-nayak-ps @mattlord
-/go/vt/vttablet/tabletserver @harshit-gangal @systay @shlomi-noach
-/go/vt/vttablet/tabletserver/messager @mattlord @rohit-nayak-ps @derekperkins
-/go/vt/wrangler @deepthi @rohit-nayak-ps @mattlord
-/go/vt/workflow @rohit-nayak-ps @mattlord
-/proto/vtadmin.proto @ajm188 @doeg @notfelineit
-/proto/vtctldata.proto @ajm188 @notfelineit
-/proto/vtctlservice.proto @ajm188 @notfelineit
-/web/vtadmin @ajm188 @doeg @notfelineit
-/web/vtctld2 @notfelineit @rohit-nayak-ps
+* @slackhq/vitess-approvers

.github/pull_request_template.md

@@ -18,7 +18,7 @@
 
 ## Checklist
 
--   [ ] "Backport me!" label has been added if this change should be backported
+-   [ ] "Backport to:" labels have been added if this change should be back-ported
 -   [ ] Tests were added or are not required
 -   [ ] Documentation was added or is not required
 

.github/workflows/assign_milestone.yml

@@ -0,0 +1,30 @@
+name: Assign Milestone
+
+on:
+  pull_request_target:
+    types: [opened]
+
+permissions: read-all
+
+env:
+  GH_TOKEN: ${{ github.token }}
+
+jobs:
+  build:
+    name: Assign Milestone
+    runs-on: ubuntu-22.04
+    permissions:
+      pull-requests: write
+
+    steps:
+      - name: Set up Go
+        uses: actions/setup-go@v3
+        with:
+          go-version: 1.21.10
+
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: Assign Milestone
+        run: |
+          gh pr edit ${{ github.event.number }} --milestone "v$(sed -n 's/.*versionName.*\"\([[:digit:]\.]*\).*\"/\1/p' ./go/vt/servenv/version.go)"

.github/workflows/check_make_vtadmin_authz_testgen.yml

@@ -5,20 +5,20 @@ jobs:
   build:
     name: Check Make vtadmin_authz_testgen
     runs-on: ubuntu-latest
+    env:
+      GOPRIVATE: github.com/slackhq/vitess-addons
+      GH_ACCESS_TOKEN: ${{ secrets.GH_ACCESS_TOKEN }}
     steps:
     - name: Check if workflow needs to be skipped
       id: skip-workflow
       run: |
         skip='false'
-        if [[ "${{github.event.pull_request}}" ==  "" ]] && [[ "${{github.ref}}" != "refs/heads/main" ]] && [[ ! "${{github.ref}}" =~ ^refs/heads/release-[0-9]+\.[0-9]$ ]] && [[ ! "${{github.ref}}" =~ "refs/tags/.*" ]]; then
-          skip='true'
-        fi
         echo Skip ${skip}
-        echo "::set-output name=skip-workflow::${skip}"
+        echo "skip-workflow=${skip}" >> $GITHUB_OUTPUT
 
     - name: Check out code
       if: steps.skip-workflow.outputs.skip-workflow == 'false'
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
 
     - name: Check for changes in relevant files
       if: steps.skip-workflow.outputs.skip-workflow == 'false'
@@ -31,16 +31,20 @@ jobs:
             - 'bootstrap.sh'
             - 'tools/**'
             - 'build.env'
-            - 'go.[sumod]'
+            - 'go.sum'
+            - 'go.mod'
             - 'Makefile'
             - 'go/vt/vtadmin/**'
             - '.github/workflows/check_make_vtadmin_authz_testgen.yml'
 
     - name: Set up Go
-      uses: actions/setup-go@v2
+      uses: actions/setup-go@v3
       if: steps.skip-workflow.outputs.skip-workflow == 'false' && steps.changes.outputs.vtadmin_changes == 'true'
       with:
-        go-version: 1.18.5
+        go-version: 1.21.10
+
+    - name: Setup github.com/slackhq/vitess-additions access token
+      run: git config --global url.https://[email protected]/.insteadOf https://github.com/
 
     - name: Tune the OS
       if: steps.skip-workflow.outputs.skip-workflow == 'false' && steps.changes.outputs.vtadmin_changes == 'true'

.github/workflows/check_make_vtadmin_web_proto.yml

@@ -10,15 +10,12 @@ jobs:
       id: skip-workflow
       run: |
         skip='false'
-        if [[ "${{github.event.pull_request}}" ==  "" ]] && [[ "${{github.ref}}" != "refs/heads/main" ]] && [[ ! "${{github.ref}}" =~ ^refs/heads/release-[0-9]+\.[0-9]$ ]] && [[ ! "${{github.ref}}" =~ "refs/tags/.*" ]]; then
-          skip='true'
-        fi
         echo Skip ${skip}
-        echo "::set-output name=skip-workflow::${skip}"
+        echo "skip-workflow=${skip}" >> $GITHUB_OUTPUT
 
     - name: Check out code
       if: steps.skip-workflow.outputs.skip-workflow == 'false'
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
 
     - name: Check for changes in relevant files
       if: steps.skip-workflow.outputs.skip-workflow == 'false'
@@ -31,18 +28,19 @@ jobs:
             - 'bootstrap.sh'
             - 'tools/**'
             - 'build.env'
-            - 'go.[sumod]'
+            - 'go.sum'
+            - 'go.mod'
             - 'Makefile'
             - 'go/vt/proto/**'
             - 'proto/*.proto'
             - 'web/vtadmin/src/proto/**'
             - '.github/workflows/check_make_vtadmin_web_proto.yml'
 
     - name: Set up Go
-      uses: actions/setup-go@v2
+      uses: actions/setup-go@v3
       if: steps.skip-workflow.outputs.skip-workflow == 'false' && steps.changes.outputs.proto_changes == 'true'
       with:
-        go-version: 1.18.5
+        go-version: 1.21.10
 
     - name: Setup Node
       if: steps.skip-workflow.outputs.skip-workflow == 'false' && steps.changes.outputs.proto_changes == 'true'