diff --git a/deploy/operator.yaml b/deploy/operator.yaml index 67e133d3..2f6c1d23 100644 --- a/deploy/operator.yaml +++ b/deploy/operator.yaml @@ -16,7 +16,7 @@ spec: serviceAccountName: vitess-operator containers: - name: vitess-operator - image: planetscale/vitess-operator:v2.9.4 + image: planetscale/vitess-operator:v2.9.5 command: - vitess-operator args: diff --git a/go.mod b/go.mod index 99999b44..1de3c6ce 100644 --- 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.16.4 + vitess.io/vitess v0.16.5 ) require ( diff --git a/go.sum b/go.sum index 3b73ac77..303c906d 100644 --- a/go.sum +++ b/go.sum @@ -832,5 +832,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.16.4 h1:NYte/lCk1TcnAlsDUO1y7cxJgIPZiIzLUtatwf8g7kg= -vitess.io/vitess v0.16.4/go.mod h1:Ennjgg9bMpYbSKqh7TSQJFZdFKtUUUXO0QW8qcjxkBQ= +vitess.io/vitess v0.16.5 h1:4zzlUc9Y4QkGl1+tuNPQ7inwD1DPRG2Mxm1d16+Ox68= +vitess.io/vitess v0.16.5/go.mod h1:Ennjgg9bMpYbSKqh7TSQJFZdFKtUUUXO0QW8qcjxkBQ= diff --git a/pkg/apis/planetscale/v2/defaults.go b/pkg/apis/planetscale/v2/defaults.go index 9962be62..40103f1f 100644 --- 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:v16.0.4" + defaultVitessLiteImage = "vitess/lite:v16.0.5" DefaultInitCPURequestMillis = 100 DefaultInitMemoryRequestBytes = 32 * (1 << 20) // 32 MiB diff --git a/test/endtoend/backup_restore_test.sh b/test/endtoend/backup_restore_test.sh index dc1b102b..119104c0 100755 --- 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 "16.0.4" +verifyVtGateVersion "16.0.5" checkSemiSyncSetup takeBackup "commerce/-" verifyListBackupsOutput diff --git a/test/endtoend/operator/101_initial_cluster.yaml b/test/endtoend/operator/101_initial_cluster.yaml index 05654990..e00c2168 100644 --- 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:v15.0.4-mysql80 - vtgate: vitess/lite:v15.0.4-mysql80 - vttablet: vitess/lite:v15.0.4-mysql80 - vtorc: vitess/lite:v15.0.4-mysql80 - vtbackup: vitess/lite:v15.0.4-mysql80 + vtctld: vitess/lite:v15.0.5-mysql80 + vtgate: vitess/lite:v15.0.5-mysql80 + vttablet: vitess/lite:v15.0.5-mysql80 + vtorc: vitess/lite:v15.0.5-mysql80 + vtbackup: vitess/lite:v15.0.5-mysql80 mysqld: - mysql80Compatible: vitess/lite:v15.0.4-mysql80 + mysql80Compatible: vitess/lite:v15.0.5-mysql80 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 index 7b798479..22559bc8 100644 --- 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:v16.0.4-mysql57 - vtgate: vitess/lite:v16.0.4-mysql57 - vttablet: vitess/lite:v16.0.4-mysql57 - vtorc: vitess/lite:v16.0.4-mysql57 - vtbackup: vitess/lite:v16.0.4-mysql57 + vtctld: vitess/lite:v16.0.5-mysql57 + vtgate: vitess/lite:v16.0.5-mysql57 + vttablet: vitess/lite:v16.0.5-mysql57 + vtorc: vitess/lite:v16.0.5-mysql57 + vtbackup: vitess/lite:v16.0.5-mysql57 mysqld: - mysql56Compatible: vitess/lite:v16.0.4-mysql57 + mysql56Compatible: vitess/lite:v16.0.5-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 index 27117740..b4befd3c 100644 --- 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:v16.0.4 - vtadmin: vitess/vtadmin:v16.0.4 - vtgate: vitess/lite:v16.0.4 - vttablet: vitess/lite:v16.0.4 - vtbackup: vitess/lite:v16.0.4 - vtorc: vitess/lite:v16.0.4 + vtctld: vitess/lite:v16.0.5 + vtadmin: vitess/vtadmin:v16.0.5 + vtgate: vitess/lite:v16.0.5 + vttablet: vitess/lite:v16.0.5 + vtbackup: vitess/lite:v16.0.5 + vtorc: vitess/lite:v16.0.5 mysqld: - mysql80Compatible: vitess/lite:v16.0.4 + mysql80Compatible: vitess/lite:v16.0.5 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 index ab96a52a..f8494e6c 100644 --- 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:v16.0.4-mysql57 - vtgate: vitess/lite:v16.0.4-mysql57 - vttablet: vitess/lite:v16.0.4-mysql57 - vtorc: vitess/lite:v16.0.4-mysql57 - vtbackup: vitess/lite:v16.0.4-mysql57 + vtctld: vitess/lite:v16.0.5-mysql57 + vtgate: vitess/lite:v16.0.5-mysql57 + vttablet: vitess/lite:v16.0.5-mysql57 + vtorc: vitess/lite:v16.0.5-mysql57 + vtbackup: vitess/lite:v16.0.5-mysql57 mysqld: - mysql56Compatible: vitess/lite:v16.0.4-mysql57 + mysql56Compatible: vitess/lite:v16.0.5-mysql57 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 index ea188424..d92c87ad 100644 --- 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: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 + vtctld: vitess/lite:v16.0.5 + vtgate: vitess/lite:v16.0.5 + vttablet: vitess/lite:v16.0.5 + vtorc: vitess/lite:v16.0.5 + vtbackup: vitess/lite:v16.0.5 mysqld: - mysql80Compatible: vitess/lite:v16.0.4 + mysql80Compatible: vitess/lite:v16.0.5 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 index 471a7448..cbd518ba 100644 --- 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: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 + vtctld: vitess/lite:v16.0.5 + vtgate: vitess/lite:v16.0.5 + vttablet: vitess/lite:v16.0.5 + vtorc: vitess/lite:v16.0.5 + vtbackup: vitess/lite:v16.0.5 mysqld: - mysql80Compatible: vitess/lite:v16.0.4 + mysql80Compatible: vitess/lite:v16.0.5 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 index 7e6b50aa..661d8b50 100644 --- 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: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 + vtctld: vitess/lite:v16.0.5 + vtgate: vitess/lite:v16.0.5 + vttablet: vitess/lite:v16.0.5 + vtorc: vitess/lite:v16.0.5 + vtbackup: vitess/lite:v16.0.5 mysqld: - mysql80Compatible: vitess/lite:v16.0.4 + mysql80Compatible: vitess/lite:v16.0.5 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 index ba593765..e19b879f 100644 --- 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: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 + vtctld: vitess/lite:v16.0.5 + vtgate: vitess/lite:v16.0.5 + vttablet: vitess/lite:v16.0.5 + vtorc: vitess/lite:v16.0.5 + vtbackup: vitess/lite:v16.0.5 mysqld: - mysql80Compatible: vitess/lite:v16.0.4 + mysql80Compatible: vitess/lite:v16.0.5 mysqldExporter: prom/mysqld-exporter:v0.11.0 cells: - name: zone1 diff --git a/test/endtoend/operator/operator.yaml b/test/endtoend/operator/operator.yaml index 04f0bbd9..01a5aa76 100644 --- a/test/endtoend/operator/operator.yaml +++ b/test/endtoend/operator/operator.yaml @@ -5615,7 +5615,7 @@ spec: fieldPath: metadata.name - name: OPERATOR_NAME value: vitess-operator - image: planetscale/vitess-operator:v2.9.4 + image: planetscale/vitess-operator:v2.9.5 name: vitess-operator resources: limits: diff --git a/test/endtoend/upgrade_test.sh b/test/endtoend/upgrade_test.sh index 028636e5..f60689cd 100755 --- a/test/endtoend/upgrade_test.sh +++ b/test/endtoend/upgrade_test.sh @@ -256,12 +256,12 @@ killall kubectl setupKubectlAccessForCI get_started "operator.yaml" "101_initial_cluster.yaml" -verifyVtGateVersion "15.0.4" +verifyVtGateVersion "15.0.5" checkSemiSyncSetup # Initially too durability policy should be specified verifyDurabilityPolicy "commerce" "semi_sync" upgradeToLatest -verifyVtGateVersion "16.0.4" +verifyVtGateVersion "16.0.5" checkSemiSyncSetup # After upgrading, we verify that the durability policy is still semi_sync verifyDurabilityPolicy "commerce" "semi_sync" diff --git a/test/endtoend/vtorc_vtadmin_test.sh b/test/endtoend/vtorc_vtadmin_test.sh index cda29a0a..51d29743 100755 --- 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 "16.0.4" +verifyVtGateVersion "16.0.5" checkSemiSyncSetup # Check Vtadmin is setup diff --git a/version/version.go b/version/version.go index 4abbbe45..076a6491 100644 --- a/version/version.go +++ b/version/version.go @@ -17,5 +17,5 @@ limitations under the License. package version var ( - Version = "2.9.5" + Version = "2.9.6" )