Merge pull request #461 from planetscale/new-release-2.10.2

New release 2.10.2
planetscale · Aug 24, 2023 · 9b8bb5d · 9b8bb5d
2 parents 657e314 + 5738fbf
commit 9b8bb5d
Show file tree

Hide file tree

Showing 17 changed files with 61 additions and 61 deletions.
diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
@@ -1,5 +1,5 @@
 agents:
-  queue: "public"
+  queue: "public-v5"
 
 # 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.

diff --git a/go.mod b/go.mod
@@ -21,7 +21,7 @@ require (
 	sigs.k8s.io/controller-runtime v0.14.3
 	sigs.k8s.io/controller-tools v0.11.3
 	sigs.k8s.io/kustomize v2.0.3+incompatible
-	vitess.io/vitess v0.17.1
+	vitess.io/vitess v0.17.2
 )
 
 require (

diff --git a/go.sum b/go.sum
@@ -1143,5 +1143,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.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo=
 sigs.k8s.io/yaml v1.3.0/go.mod h1:GeOyir5tyXNByN85N/dRIT9es5UQNerPYEKK56eTBm8=
-vitess.io/vitess v0.17.1 h1:f7T2wBh4eJizvuTtMbRgveDr1wHOrHVzRx82iA9CrIc=
-vitess.io/vitess v0.17.1/go.mod h1:/QmiqbpoP/cAYOg6csIJVyUrJcdhzrsIRqC+j6GKNno=
+vitess.io/vitess v0.17.2 h1:xGVl0jCdP45EnTdmii1THlprJqPVr0GgBjVG9XP7YAw=
+vitess.io/vitess v0.17.2/go.mod h1:/QmiqbpoP/cAYOg6csIJVyUrJcdhzrsIRqC+j6GKNno=
diff --git a/pkg/apis/planetscale/v2/defaults.go b/pkg/apis/planetscale/v2/defaults.go
@@ -102,7 +102,7 @@ const (
 	// DefaultMysqlPortName is the name for the MySQL port.
 	DefaultMysqlPortName = "mysql"
 
-	defaultVitessLiteImage = "vitess/lite:v17.0.1"
+	defaultVitessLiteImage = "vitess/lite:v17.0.2"
 
 	DefaultInitCPURequestMillis   = 100
 	DefaultInitMemoryRequestBytes = 32 * (1 << 20) // 32 MiB

diff --git a/test/endtoend/backup_restore_test.sh b/test/endtoend/backup_restore_test.sh
@@ -103,7 +103,7 @@ killall kubectl
 setupKubectlAccessForCI
 
 get_started "operator-latest.yaml" "101_initial_cluster_backup.yaml"
-verifyVtGateVersion "17.0.1"
+verifyVtGateVersion "17.0.2"
 checkSemiSyncSetup
 takeBackup "commerce/-"
 verifyListBackupsOutput

diff --git a/test/endtoend/operator/101_initial_cluster.yaml b/test/endtoend/operator/101_initial_cluster.yaml
@@ -8,13 +8,13 @@ metadata:
   name: example
 spec:
   images:
-    vtctld: vitess/lite:v16.0.3
-    vtgate: vitess/lite:v16.0.3
-    vttablet: vitess/lite:v16.0.3
-    vtorc: vitess/lite:v16.0.3
-    vtbackup: vitess/lite:v16.0.3
+    vtctld: vitess/lite:v16.0.4
+    vtgate: vitess/lite:v16.0.4
+    vttablet: vitess/lite:v16.0.4
+    vtorc: vitess/lite:v16.0.4
+    vtbackup: vitess/lite:v16.0.4
     mysqld:
-      mysql80Compatible: vitess/lite:v16.0.3
+      mysql80Compatible: vitess/lite:v16.0.4
     mysqldExporter: prom/mysqld-exporter:v0.11.0
   cells:
   - name: zone1

diff --git a/test/endtoend/operator/101_initial_cluster_backup.yaml b/test/endtoend/operator/101_initial_cluster_backup.yaml
@@ -15,13 +15,13 @@ spec:
           path: /backup
           type: Directory
   images:
-    vtctld: vitess/lite:v17.0.1-mysql57
-    vtgate: vitess/lite:v17.0.1-mysql57
-    vttablet: vitess/lite:v17.0.1-mysql57
-    vtorc: vitess/lite:v17.0.1-mysql57
-    vtbackup: vitess/lite:v17.0.1-mysql57
+    vtctld: vitess/lite:v17.0.2-mysql57
+    vtgate: vitess/lite:v17.0.2-mysql57
+    vttablet: vitess/lite:v17.0.2-mysql57
+    vtorc: vitess/lite:v17.0.2-mysql57
+    vtbackup: vitess/lite:v17.0.2-mysql57
     mysqld:
-      mysql56Compatible: vitess/lite:v17.0.1-mysql57
+      mysql56Compatible: vitess/lite:v17.0.2-mysql57
     mysqldExporter: prom/mysqld-exporter:v0.11.0
   cells:
   - name: zone1

diff --git a/test/endtoend/operator/101_initial_cluster_vtorc_vtadmin.yaml b/test/endtoend/operator/101_initial_cluster_vtorc_vtadmin.yaml
@@ -8,14 +8,14 @@ metadata:
   name: example
 spec:
   images:
-    vtctld: vitess/lite:v17.0.1
-    vtadmin: vitess/vtadmin:v17.0.1
-    vtgate: vitess/lite:v17.0.1
-    vttablet: vitess/lite:v17.0.1
-    vtbackup: vitess/lite:v17.0.1
-    vtorc: vitess/lite:v17.0.1
+    vtctld: vitess/lite:v17.0.2
+    vtadmin: vitess/vtadmin:v17.0.2
+    vtgate: vitess/lite:v17.0.2
+    vttablet: vitess/lite:v17.0.2
+    vtbackup: vitess/lite:v17.0.2
+    vtorc: vitess/lite:v17.0.2
     mysqld:
-      mysql80Compatible: vitess/lite:v17.0.1
+      mysql80Compatible: vitess/lite:v17.0.2
     mysqldExporter: prom/mysqld-exporter:v0.11.0
   cells:
   - name: zone1

diff --git a/test/endtoend/operator/102_keyspace_teardown.yaml b/test/endtoend/operator/102_keyspace_teardown.yaml
@@ -15,13 +15,13 @@ spec:
           path: /backup
           type: Directory
   images:
-    vtctld: vitess/lite:v17.0.1
-    vtgate: vitess/lite:v17.0.1
-    vttablet: vitess/lite:v17.0.1
-    vtorc: vitess/lite:v17.0.1
-    vtbackup: vitess/lite:v17.0.1
+    vtctld: vitess/lite:v17.0.2
+    vtgate: vitess/lite:v17.0.2
+    vttablet: vitess/lite:v17.0.2
+    vtorc: vitess/lite:v17.0.2
+    vtbackup: vitess/lite:v17.0.2
     mysqld:
-      mysql56Compatible: vitess/lite:v17.0.1
+      mysql56Compatible: vitess/lite:v17.0.2
     mysqldExporter: prom/mysqld-exporter:v0.11.0
   cells:
   - name: zone1

diff --git a/test/endtoend/operator/201_customer_tablets.yaml b/test/endtoend/operator/201_customer_tablets.yaml
@@ -4,13 +4,13 @@ metadata:
   name: example
 spec:
   images:
-    vtctld: vitess/lite:v17.0.1
-    vtgate: vitess/lite:v17.0.1
-    vttablet: vitess/lite:v17.0.1
-    vtorc: vitess/lite:v17.0.1
-    vtbackup: vitess/lite:v17.0.1
+    vtctld: vitess/lite:v17.0.2
+    vtgate: vitess/lite:v17.0.2
+    vttablet: vitess/lite:v17.0.2
+    vtorc: vitess/lite:v17.0.2
+    vtbackup: vitess/lite:v17.0.2
     mysqld:
-      mysql80Compatible: vitess/lite:v17.0.1
+      mysql80Compatible: vitess/lite:v17.0.2
     mysqldExporter: prom/mysqld-exporter:v0.11.0
   cells:
   - name: zone1

diff --git a/test/endtoend/operator/302_new_shards.yaml b/test/endtoend/operator/302_new_shards.yaml
@@ -4,13 +4,13 @@ metadata:
   name: example
 spec:
   images:
-    vtctld: vitess/lite:v17.0.1
-    vtgate: vitess/lite:v17.0.1
-    vttablet: vitess/lite:v17.0.1
-    vtorc: vitess/lite:v17.0.1
-    vtbackup: vitess/lite:v17.0.1
+    vtctld: vitess/lite:v17.0.2
+    vtgate: vitess/lite:v17.0.2
+    vttablet: vitess/lite:v17.0.2
+    vtorc: vitess/lite:v17.0.2
+    vtbackup: vitess/lite:v17.0.2
     mysqld:
-      mysql80Compatible: vitess/lite:v17.0.1
+      mysql80Compatible: vitess/lite:v17.0.2
     mysqldExporter: prom/mysqld-exporter:v0.11.0
   cells:
   - name: zone1

diff --git a/test/endtoend/operator/306_down_shard_0.yaml b/test/endtoend/operator/306_down_shard_0.yaml
@@ -4,13 +4,13 @@ metadata:
   name: example
 spec:
   images:
-    vtctld: vitess/lite:v17.0.1
-    vtgate: vitess/lite:v17.0.1
-    vttablet: vitess/lite:v17.0.1
-    vtorc: vitess/lite:v17.0.1
-    vtbackup: vitess/lite:v17.0.1
+    vtctld: vitess/lite:v17.0.2
+    vtgate: vitess/lite:v17.0.2
+    vttablet: vitess/lite:v17.0.2
+    vtorc: vitess/lite:v17.0.2
+    vtbackup: vitess/lite:v17.0.2
     mysqld:
-      mysql80Compatible: vitess/lite:v17.0.1
+      mysql80Compatible: vitess/lite:v17.0.2
     mysqldExporter: prom/mysqld-exporter:v0.11.0
   cells:
   - name: zone1

diff --git a/test/endtoend/operator/cluster_upgrade.yaml b/test/endtoend/operator/cluster_upgrade.yaml
@@ -8,13 +8,13 @@ metadata:
   name: example
 spec:
   images:
-    vtctld: vitess/lite:v17.0.1
-    vtgate: vitess/lite:v17.0.1
-    vttablet: vitess/lite:v17.0.1
-    vtorc: vitess/lite:v17.0.1
-    vtbackup: vitess/lite:v17.0.1
+    vtctld: vitess/lite:v17.0.2
+    vtgate: vitess/lite:v17.0.2
+    vttablet: vitess/lite:v17.0.2
+    vtorc: vitess/lite:v17.0.2
+    vtbackup: vitess/lite:v17.0.2
     mysqld:
-      mysql80Compatible: vitess/lite:v17.0.1
+      mysql80Compatible: vitess/lite:v17.0.2
     mysqldExporter: prom/mysqld-exporter:v0.11.0
   cells:
   - name: zone1

diff --git a/test/endtoend/upgrade_test.sh b/test/endtoend/upgrade_test.sh
@@ -245,12 +245,12 @@ killall kubectl
 setupKubectlAccessForCI
 
 get_started "operator.yaml" "101_initial_cluster.yaml"
-verifyVtGateVersion "16.0.3"
+verifyVtGateVersion "16.0.4"
 checkSemiSyncSetup
 # Initially too durability policy should be specified
 verifyDurabilityPolicy "commerce" "semi_sync"
 upgradeToLatest
-verifyVtGateVersion "17.0.1"
+verifyVtGateVersion "17.0.2"
 checkSemiSyncSetup
 # After upgrading, we verify that the durability policy is still semi_sync
 verifyDurabilityPolicy "commerce" "semi_sync"

diff --git a/test/endtoend/utils.sh b/test/endtoend/utils.sh
@@ -220,8 +220,8 @@ function waitForKeyspaceToBeServing() {
   nb_of_replica=$3
   for i in {1..600} ; do
     out=$(mysql --table --execute="show vitess_tablets")
-    echo "$out" | grep -E "$ks(.*)$shard(.*)PRIMARY(.*)SERVING|$ks(.*)$shard(.*)REPLICA(.*)SERVING" | wc -l | grep "$((nb_of_replica+1))"
-    if [ $? -eq 0 ]; then
+    numtablets=$(echo "$out" | grep -E "$ks(.*)$shard(.*)PRIMARY(.*)SERVING|$ks(.*)$shard(.*)REPLICA(.*)SERVING" | wc -l)
+    if [[ $numtablets -ge $((nb_of_replica+1)) ]]; then
       echo "Shard $ks/$shard is serving"
       return
     fi

diff --git a/test/endtoend/vtorc_vtadmin_test.sh b/test/endtoend/vtorc_vtadmin_test.sh
@@ -242,7 +242,7 @@ killall kubectl
 setupKubectlAccessForCI
 
 get_started_vtorc_vtadmin
-verifyVtGateVersion "17.0.1"
+verifyVtGateVersion "17.0.2"
 checkSemiSyncSetup
 
 # Check Vtadmin is setup

diff --git a/version/version.go b/version/version.go
@@ -17,5 +17,5 @@ limitations under the License.
 package version
 
 var (
-	Version = "2.10.2"
+	Version = "2.10.3"
 )