Merge pull request #456 from planetscale/new-release-2.8.5

planetscale · Jul 30, 2023 · b05a72f · b05a72f
2 parents a7f76bf + 70e064f
commit b05a72f
Show file tree

Hide file tree

Showing 15 changed files with 47 additions and 47 deletions.
diff --git a/go.mod b/go.mod
@@ -4,6 +4,7 @@ go 1.18
 
 require (
 	github.com/ahmetb/gen-crd-api-reference-docs v0.1.5-0.20190629210212-52e137b8d003
+	github.com/google/uuid v1.3.0
 	github.com/planetscale/operator-sdk-libs v0.0.0-20220216002626-1af183733234
 	github.com/prometheus/client_golang v1.11.0
 	github.com/sirupsen/logrus v1.8.1
@@ -20,7 +21,7 @@ require (
 	sigs.k8s.io/controller-runtime v0.9.7
 	sigs.k8s.io/controller-tools v0.6.2
 	sigs.k8s.io/kustomize v2.0.3+incompatible
-	vitess.io/vitess v0.15.3
+	vitess.io/vitess v0.15.4
 )
 
 require (
@@ -68,7 +69,6 @@ require (
 	github.com/google/go-cmp v0.5.9 // indirect
 	github.com/google/gofuzz v1.1.0 // indirect
 	github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
-	github.com/google/uuid v1.3.0 // indirect
 	github.com/googleapis/gax-go/v2 v2.0.5 // indirect
 	github.com/googleapis/gnostic v0.5.5 // indirect
 	github.com/gopherjs/gopherjs v0.0.0-20191106031601-ce3c9ade29de // indirect

diff --git a/go.sum b/go.sum
@@ -1478,5 +1478,5 @@ sigs.k8s.io/structured-merge-diff/v4 v4.2.1/go.mod h1:j/nl6xW8vLS49O8YvXW1ocPhZa
 sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o=
 sigs.k8s.io/yaml v1.2.0 h1:kr/MCeFWJWTwyaHoR9c8EjH9OumOmoF9YGiZd7lFm/Q=
 sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc=
-vitess.io/vitess v0.15.3 h1:oUKxu7duyz2kYokQSH80psvWU1J3jhJbOYdSF7MMrRc=
-vitess.io/vitess v0.15.3/go.mod h1:s1C7K4tuiCFz3L+GnLFHx/2hrFY1Gyk57lXS5VAEr04=
+vitess.io/vitess v0.15.4 h1:8xAlZdENrKToxXR2VwqSjLfV7jg8GonlNY8dU4cBu9U=
+vitess.io/vitess v0.15.4/go.mod h1:s1C7K4tuiCFz3L+GnLFHx/2hrFY1Gyk57lXS5VAEr04=
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:v15.0.3"
+	defaultVitessLiteImage = "vitess/lite:v15.0.4"
 )
 
 // DefaultImages are a set of images to use when the CRD doesn't specify.

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 "15.0.3"
+verifyVtGateVersion "15.0.4"
 checkSemiSyncSetup
 takeBackup "commerce/-"
 takedownShard

diff --git a/test/endtoend/operator/101_initial_cluster_backup.yaml b/test/endtoend/operator/101_initial_cluster_backup.yaml
@@ -15,12 +15,12 @@ spec:
           path: /backup
           type: Directory
   images:
-    vtctld: vitess/lite:v15.0.3
-    vtgate: vitess/lite:v15.0.3
-    vttablet: vitess/lite:v15.0.3
-    vtbackup: vitess/lite:v15.0.3
+    vtctld: vitess/lite:v15.0.4
+    vtgate: vitess/lite:v15.0.4
+    vttablet: vitess/lite:v15.0.4
+    vtbackup: vitess/lite:v15.0.4
     mysqld:
-      mysql56Compatible: vitess/lite:v15.0.3
+      mysql56Compatible: vitess/lite:v15.0.4
     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:v15.0.3
-    vtadmin: vitess/vtadmin:v15.0.3
-    vtgate: vitess/lite:v15.0.3
-    vttablet: vitess/lite:v15.0.3
-    vtbackup: vitess/lite:v15.0.3
-    vtorc: vitess/lite:v15.0.3
+    vtctld: vitess/lite:v15.0.4
+    vtadmin: vitess/vtadmin:v15.0.4
+    vtgate: vitess/lite:v15.0.4
+    vttablet: vitess/lite:v15.0.4
+    vtbackup: vitess/lite:v15.0.4
+    vtorc: vitess/lite:v15.0.4
     mysqld:
-      mysql56Compatible: vitess/lite:v15.0.3
+      mysql56Compatible: vitess/lite:v15.0.4
     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,12 +15,12 @@ spec:
           path: /backup
           type: Directory
   images:
-    vtctld: vitess/lite:v15.0.3
-    vtgate: vitess/lite:v15.0.3
-    vttablet: vitess/lite:v15.0.3
-    vtbackup: vitess/lite:v15.0.3
+    vtctld: vitess/lite:v15.0.4
+    vtgate: vitess/lite:v15.0.4
+    vttablet: vitess/lite:v15.0.4
+    vtbackup: vitess/lite:v15.0.4
     mysqld:
-      mysql56Compatible: vitess/lite:v15.0.3
+      mysql56Compatible: vitess/lite:v15.0.4
     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,12 +4,12 @@ metadata:
   name: example
 spec:
   images:
-    vtctld: vitess/lite:v15.0.3
-    vtgate: vitess/lite:v15.0.3
-    vttablet: vitess/lite:v15.0.3
-    vtbackup: vitess/lite:v15.0.3
+    vtctld: vitess/lite:v15.0.4
+    vtgate: vitess/lite:v15.0.4
+    vttablet: vitess/lite:v15.0.4
+    vtbackup: vitess/lite:v15.0.4
     mysqld:
-      mysql56Compatible: vitess/lite:v15.0.3
+      mysql56Compatible: vitess/lite:v15.0.4
     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,12 +4,12 @@ metadata:
   name: example
 spec:
   images:
-    vtctld: vitess/lite:v15.0.3
-    vtgate: vitess/lite:v15.0.3
-    vttablet: vitess/lite:v15.0.3
-    vtbackup: vitess/lite:v15.0.3
+    vtctld: vitess/lite:v15.0.4
+    vtgate: vitess/lite:v15.0.4
+    vttablet: vitess/lite:v15.0.4
+    vtbackup: vitess/lite:v15.0.4
     mysqld:
-      mysql56Compatible: vitess/lite:v15.0.3
+      mysql56Compatible: vitess/lite:v15.0.4
     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,12 +4,12 @@ metadata:
   name: example
 spec:
   images:
-    vtctld: vitess/lite:v15.0.3
-    vtgate: vitess/lite:v15.0.3
-    vttablet: vitess/lite:v15.0.3
-    vtbackup: vitess/lite:v15.0.3
+    vtctld: vitess/lite:v15.0.4
+    vtgate: vitess/lite:v15.0.4
+    vttablet: vitess/lite:v15.0.4
+    vtbackup: vitess/lite:v15.0.4
     mysqld:
-      mysql56Compatible: vitess/lite:v15.0.3
+      mysql56Compatible: vitess/lite:v15.0.4
     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,12 +8,12 @@ metadata:
   name: example
 spec:
   images:
-    vtctld: vitess/lite:v15.0.3
-    vtgate: vitess/lite:v15.0.3
-    vttablet: vitess/lite:v15.0.3
-    vtbackup: vitess/lite:v15.0.3
+    vtctld: vitess/lite:v15.0.4
+    vtgate: vitess/lite:v15.0.4
+    vttablet: vitess/lite:v15.0.4
+    vtbackup: vitess/lite:v15.0.4
     mysqld:
-      mysql56Compatible: vitess/lite:v15.0.3
+      mysql56Compatible: vitess/lite:v15.0.4
     mysqldExporter: prom/mysqld-exporter:v0.11.0
   cells:
   - name: zone1

diff --git a/test/endtoend/operator/operator.yaml b/test/endtoend/operator/operator.yaml
@@ -5432,7 +5432,7 @@ spec:
                   fieldPath: metadata.name
             - name: OPERATOR_NAME
               value: vitess-operator
-          image: planetscale/vitess-operator:v2.8.4
+          image: planetscale/vitess-operator:v2.8.5
           name: vitess-operator
           resources:
             limits:

diff --git a/test/endtoend/upgrade_test.sh b/test/endtoend/upgrade_test.sh
@@ -236,7 +236,7 @@ checkSemiSyncSetup
 # Initially no durability policy is specified
 verifyDurabilityPolicy "commerce" ""
 upgradeToLatest
-verifyVtGateVersion "15.0.3"
+verifyVtGateVersion "15.0.4"
 checkSemiSyncSetup
 # After upgrading, we set the durability policy to semi_sync
 verifyDurabilityPolicy "commerce" "semi_sync"

diff --git a/test/endtoend/vtorc_vtadmin_test.sh b/test/endtoend/vtorc_vtadmin_test.sh
@@ -231,7 +231,7 @@ killall kubectl
 setupKubectlAccessForCI
 
 get_started_vtorc_vtadmin
-verifyVtGateVersion "15.0.3"
+verifyVtGateVersion "15.0.4"
 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.8.5"
+	Version = "2.8.6"
 )