up bootstrap version to 3.2

Signed-off-by: 'Stanislav Maksimov' <smaksimov@slack-corp.com>

.github/docker/cluster_test_vreplication_basic/Dockerfile

@@ -1,6 +1,6 @@
 # DO NOT MODIFY: THIS FILE IS GENERATED USING "make generate_ci_workflows"
 
-ARG bootstrap_version=3.1
+ARG bootstrap_version=3.2
 ARG image="vitess/bootstrap:${bootstrap_version}-mysql57"
 
 FROM "${image}"

.github/docker/cluster_test_vreplication_cellalias/Dockerfile

@@ -1,6 +1,6 @@
 # DO NOT MODIFY: THIS FILE IS GENERATED USING "make generate_ci_workflows"
 
-ARG bootstrap_version=3.1
+ARG bootstrap_version=3.2
 ARG image="vitess/bootstrap:${bootstrap_version}-mysql57"
 
 FROM "${image}"

.github/docker/cluster_test_vreplication_multicell/Dockerfile

@@ -1,6 +1,6 @@
 # DO NOT MODIFY: THIS FILE IS GENERATED USING "make generate_ci_workflows"
 
-ARG bootstrap_version=3.1
+ARG bootstrap_version=3.2
 ARG image="vitess/bootstrap:${bootstrap_version}-mysql57"
 
 FROM "${image}"

.github/docker/cluster_test_vreplication_v2/Dockerfile

@@ -1,6 +1,6 @@
 # DO NOT MODIFY: THIS FILE IS GENERATED USING "make generate_ci_workflows"
 
-ARG bootstrap_version=3.1
+ARG bootstrap_version=3.2
 ARG image="vitess/bootstrap:${bootstrap_version}-mysql57"
 
 FROM "${image}"

.github/docker/unit_test_mariadb103/Dockerfile

@@ -1,6 +1,6 @@
 # DO NOT MODIFY: THIS FILE IS GENERATED USING "make generate_ci_workflows"
 
-ARG bootstrap_version=3.1
+ARG bootstrap_version=3.2
 ARG image="vitess/bootstrap:${bootstrap_version}-mariadb103"
 
 FROM "${image}"

.github/docker/unit_test_mysql57/Dockerfile

@@ -1,6 +1,6 @@
 # DO NOT MODIFY: THIS FILE IS GENERATED USING "make generate_ci_workflows"
 
-ARG bootstrap_version=3.1
+ARG bootstrap_version=3.2
 ARG image="vitess/bootstrap:${bootstrap_version}-mysql57"
 
 FROM "${image}"

.github/docker/unit_test_race/Dockerfile

@@ -1,4 +1,4 @@
-ARG bootstrap_version=3.1
+ARG bootstrap_version=3.2
 ARG image="vitess/bootstrap:${bootstrap_version}-mysql57"
 
 FROM "${image}"

Makefile

@@ -243,7 +243,7 @@ $(PROTO_GO_OUTS): minimaltools install_protoc-gen-go proto/*.proto
 # This rule builds the bootstrap images for all flavors.
 DOCKER_IMAGES_FOR_TEST = mariadb mariadb103 mysql56 mysql57 mysql80 percona percona57 percona80
 DOCKER_IMAGES = common $(DOCKER_IMAGES_FOR_TEST)
-BOOTSTRAP_VERSION=3.1
+BOOTSTRAP_VERSION=3.2
 ensure_bootstrap_version:
 	find docker/ -type f -exec sed -i "s/^\(ARG bootstrap_version\)=.*/\1=${BOOTSTRAP_VERSION}/" {} \;
 	sed -i 's/\(^.*flag.String(\"bootstrap-version\",\) *\"[^\"]\+\"/\1 \"${BOOTSTRAP_VERSION}\"/' test.go

docker/base/Dockerfile

@@ -21,7 +21,7 @@
 # TODO(mberlin): Remove the symlink and this note once
 # https://github.com/docker/hub-feedback/issues/292 is fixed.
 
-ARG bootstrap_version=3.1
+ARG bootstrap_version=3.2
 ARG image="vitess/bootstrap:${bootstrap_version}-mysql57"
 
 FROM "${image}"

docker/base/Dockerfile.mariadb

@@ -1,4 +1,4 @@
-ARG bootstrap_version=3.1
+ARG bootstrap_version=3.2
 ARG image="vitess/bootstrap:${bootstrap_version}-mariadb"
 
 FROM "${image}"

docker/base/Dockerfile.mariadb103

@@ -1,4 +1,4 @@
-ARG bootstrap_version=3.1
+ARG bootstrap_version=3.2
 ARG image="vitess/bootstrap:${bootstrap_version}-mariadb103"
 
 FROM "${image}"

docker/base/Dockerfile.mysql56

@@ -1,4 +1,4 @@
-ARG bootstrap_version=3.1
+ARG bootstrap_version=3.2
 ARG image="vitess/bootstrap:${bootstrap_version}-mysql56"
 
 FROM "${image}"

docker/base/Dockerfile.mysql80

@@ -1,4 +1,4 @@
-ARG bootstrap_version=3.1
+ARG bootstrap_version=3.2
 ARG image="vitess/bootstrap:${bootstrap_version}-mysql80"
 
 FROM "${image}"

docker/base/Dockerfile.percona

@@ -1,4 +1,4 @@
-ARG bootstrap_version=3.1
+ARG bootstrap_version=3.2
 ARG image="vitess/bootstrap:${bootstrap_version}-percona"
 
 FROM "${image}"

docker/base/Dockerfile.percona57

@@ -1,4 +1,4 @@
-ARG bootstrap_version=3.1
+ARG bootstrap_version=3.2
 ARG image="vitess/bootstrap:${bootstrap_version}-percona57"
 
 FROM "${image}"

docker/base/Dockerfile.percona80

@@ -1,4 +1,4 @@
-ARG bootstrap_version=3.1
+ARG bootstrap_version=3.2
 ARG image="vitess/bootstrap:${bootstrap_version}-percona80"
 
 FROM "${image}"

docker/lite/Dockerfile.alpine

@@ -17,7 +17,7 @@
 #       ensure images contain the right binaries.
 
 # Use a temporary layer for the build stage.
-ARG bootstrap_version=3.1
+ARG bootstrap_version=3.2
 ARG image="vitess/bootstrap:${bootstrap_version}-mariadb103"
 
 FROM "${image}" AS builder

docker/lite/Dockerfile.mariadb

@@ -17,7 +17,7 @@
 #       ensure images contain the right binaries.
 
 # Use a temporary layer for the build stage.
-ARG bootstrap_version=3.1
+ARG bootstrap_version=3.2
 ARG image="vitess/bootstrap:${bootstrap_version}-mariadb"
 
 FROM "${image}" AS builder

docker/lite/Dockerfile.mariadb103

@@ -17,7 +17,7 @@
 #       ensure images contain the right binaries.
 
 # Use a temporary layer for the build stage.
-ARG bootstrap_version=3.1
+ARG bootstrap_version=3.2
 ARG image="vitess/bootstrap:${bootstrap_version}-mariadb103"
 
 FROM "${image}" AS builder

docker/lite/Dockerfile.mysql56

@@ -17,7 +17,7 @@
 #       ensure images contain the right binaries.
 
 # Use a temporary layer for the build stage.
-ARG bootstrap_version=3.1
+ARG bootstrap_version=3.2
 ARG image="vitess/bootstrap:${bootstrap_version}-mysql56"
 
 FROM "${image}" AS builder

docker/lite/Dockerfile.mysql57

@@ -17,7 +17,7 @@
 #       ensure images contain the right binaries.
 
 # Use a temporary layer for the build stage.
-ARG bootstrap_version=3.1
+ARG bootstrap_version=3.2
 ARG image="vitess/bootstrap:${bootstrap_version}-mysql57"
 
 FROM "${image}" AS builder

docker/lite/Dockerfile.mysql80

@@ -17,7 +17,7 @@
 #       ensure images contain the right binaries.
 
 # Use a temporary layer for the build stage.
-ARG bootstrap_version=3.1
+ARG bootstrap_version=3.2
 ARG image="vitess/bootstrap:${bootstrap_version}-mysql80"
 
 FROM "${image}" AS builder

docker/lite/Dockerfile.percona

@@ -17,7 +17,7 @@
 #       ensure images contain the right binaries.
 
 # Use a temporary layer for the build stage.
-ARG bootstrap_version=3.1
+ARG bootstrap_version=3.2
 ARG image="vitess/bootstrap:${bootstrap_version}-percona"
 
 FROM "${image}" AS builder

docker/lite/Dockerfile.percona57

@@ -17,7 +17,7 @@
 #       ensure images contain the right binaries.
 
 # Use a temporary layer for the build stage.
-ARG bootstrap_version=3.1
+ARG bootstrap_version=3.2
 ARG image="vitess/bootstrap:${bootstrap_version}-percona57"
 
 FROM "${image}" AS builder

docker/lite/Dockerfile.percona80

@@ -17,7 +17,7 @@
 #       ensure images contain the right binaries.
 
 # Use a temporary layer for the build stage.
-ARG bootstrap_version=3.1
+ARG bootstrap_version=3.2
 ARG image="vitess/bootstrap:${bootstrap_version}-percona80"
 
 FROM "${image}" AS builder

docker/lite/Dockerfile.testing

@@ -17,7 +17,7 @@
 #       ensure images contain the right binaries.
 
 # Use a temporary layer for the build stage.
-ARG bootstrap_version=3.1
+ARG bootstrap_version=3.2
 ARG image="vitess/bootstrap:${bootstrap_version}-mysql57"
 
 FROM "${image}" AS builder

docker/lite/Dockerfile.ubi7.mysql57

@@ -17,7 +17,7 @@
 #       ensure images contain the right binaries.
 
 # Use a temporary layer for the build stage.
-ARG bootstrap_version=3.1
+ARG bootstrap_version=3.2
 ARG image="vitess/bootstrap:${bootstrap_version}-mysql57"
 
 FROM "${image}" AS builder

docker/lite/Dockerfile.ubi7.mysql80

@@ -17,7 +17,7 @@
 #       ensure images contain the right binaries.
 
 # Use a temporary layer for the build stage.
-ARG bootstrap_version=3.1
+ARG bootstrap_version=3.2
 ARG image="vitess/bootstrap:${bootstrap_version}-mysql80"
 
 FROM "${image}" AS builder

docker/lite/Dockerfile.ubi7.percona57

@@ -17,7 +17,7 @@
 #       ensure images contain the right binaries.
 
 # Use a temporary layer for the build stage.
-ARG bootstrap_version=3.1
+ARG bootstrap_version=3.2
 ARG image="vitess/bootstrap:${bootstrap_version}-percona57"
 
 FROM "${image}" AS builder

docker/lite/Dockerfile.ubi7.percona80

@@ -17,7 +17,7 @@
 #       ensure images contain the right binaries.
 
 # Use a temporary layer for the build stage.
-ARG bootstrap_version=3.1
+ARG bootstrap_version=3.2
 ARG image="vitess/bootstrap:${bootstrap_version}-percona80"
 
 FROM "${image}" AS builder

docker/local/Dockerfile

@@ -1,4 +1,4 @@
-ARG bootstrap_version=3.1
+ARG bootstrap_version=3.2
 ARG image="vitess/bootstrap:${bootstrap_version}-common"
 
 FROM "${image}"

docker/vttestserver/Dockerfile.mysql57

@@ -17,7 +17,7 @@
 #       ensure images contain the right binaries.
 
 # Use a temporary layer for the build stage.
-ARG bootstrap_version=3.1
+ARG bootstrap_version=3.2
 ARG image="vitess/bootstrap:${bootstrap_version}-mysql57"
 
 FROM "${image}" AS builder

docker/vttestserver/Dockerfile.mysql80

@@ -17,7 +17,7 @@
 #       ensure images contain the right binaries.
 
 # Use a temporary layer for the build stage.
-ARG bootstrap_version=3.1
+ARG bootstrap_version=3.2
 ARG image="vitess/bootstrap:${bootstrap_version}-mysql80"
 
 FROM "${image}" AS builder

go/vt/servenv/buildinfo_test.go

@@ -33,17 +33,17 @@ func TestVersionString(t *testing.T) {
 		buildTimePretty: "time is now",
 		buildGitRev:     "d54b87c",
 		buildGitBranch:  "gitBranch",
-		goVersion:       "1.17.12",
+		goVersion:       "1.20.4",
 		goOS:            "amiga",
 		goArch:          "amd64",
 		version:         "v1.2.3-SNAPSHOT",
 	}
 
-	assert.Equal(t, "Version: v1.2.3-SNAPSHOT (Git revision d54b87c branch 'gitBranch') built on time is now by user@host using 1.17.12 amiga/amd64", v.String())
+	assert.Equal(t, "Version: v1.2.3-SNAPSHOT (Git revision d54b87c branch 'gitBranch') built on time is now by user@host using 1.20.4 amiga/amd64", v.String())
 
 	v.jenkinsBuildNumber = 422
 
-	assert.Equal(t, "Version: v1.2.3-SNAPSHOT (Jenkins build 422) (Git revision d54b87c branch 'gitBranch') built on time is now by user@host using 1.17.12 amiga/amd64", v.String())
+	assert.Equal(t, "Version: v1.2.3-SNAPSHOT (Jenkins build 422) (Git revision d54b87c branch 'gitBranch') built on time is now by user@host using 1.20.4 amiga/amd64", v.String())
 
 	assert.Equal(t, "5.7.9-vitess-v1.2.3-SNAPSHOT", v.MySQLVersion())
 }

go/vt/servenv/grpc_server.go

@@ -46,11 +46,12 @@ import (
 // Clients register servers, based on service map:
 //
 // servenv.RegisterGRPCFlags()
-// servenv.OnRun(func() {
-//   if servenv.GRPCCheckServiceMap("XXX") {
-//     pb.RegisterXXX(servenv.GRPCServer, XXX)
-//   }
-// }
+//
+//	servenv.OnRun(func() {
+//	  if servenv.GRPCCheckServiceMap("XXX") {
+//	    pb.RegisterXXX(servenv.GRPCServer, XXX)
+//	  }
+//	}
 //
 // Note servenv.GRPCServer can only be used in servenv.OnRun,
 // and not before, as it is initialized right before calling OnRun.

test.go

@@ -74,7 +74,7 @@ For example:
 // Flags
 var (
 	flavor           = flag.String("flavor", "mysql57", "comma-separated bootstrap flavor(s) to run against (when using Docker mode). Available flavors: all,"+flavors)
-	bootstrapVersion = flag.String("bootstrap-version", "3.1", "the version identifier to use for the docker images")
+	bootstrapVersion = flag.String("bootstrap-version", "3.2", "the version identifier to use for the docker images")
 	runCount         = flag.Int("runs", 1, "run each test this many times")
 	retryMax         = flag.Int("retry", 3, "max number of retries, to detect flaky tests")
 	logPass          = flag.Bool("log-pass", false, "log test output even if it passes")

test/templates/dockerfile.tpl

@@ -1,4 +1,4 @@
-ARG bootstrap_version=3.1
+ARG bootstrap_version=3.2
 ARG image="vitess/bootstrap:${bootstrap_version}-{{.Platform}}"
 
 FROM "${image}"

test/templates/unit_test.tpl

@@ -12,7 +12,7 @@ jobs:
     - name: Set up Go
       uses: actions/setup-go@v2
       with:
-        go-version: 1.17.12
+        go-version: 1.20.4
 
     - name: Tune the OS
       run: |