Merge remote-tracking branch 'origin/release-2.8' into final-release

rsajwani · rsajwani · commit c477a639895c · 2022-10-25T09:38:32.000-07:00
Signed-off-by: Rameez Sajwani &lt;rameezwazirali@hotmail.com&gt;
diff --git a/README.md b/README.md
@@ -24,7 +24,8 @@ Vitess Operator Version | Recommended Vitess Versions | Recommended Kubernetes V
 `v2.5.*` | `v12.0.*`                   | `v1.17.*`, `v1.18.*`, or `v1.19.*`
 `v2.6.*` | `v12.0.*`, or `v13.0.*`     | `v1.20.*`, `v1.21.*`, or `v1.22.*`
 `v2.7.*` | `v14.0.*`                   | `v1.20.*`, `v1.21.*`, or `v1.22.*`
-`latest` | `latest`                    | `v1.20.*`, `v1.21.*`, or `v1.22.*`
+`v2.8.*` | `v15.0.*`                   | `v1.22.*`, `v1.23.*`, or `v1.24.*`
+`latest` | `latest`                    | `v1.22.*`, `v1.23.*`, or `v1.24.*`
 
 If for some reason you must attempt to use versions outside the recommend
 window, we still welcome bug reports since a workaround might be possible.
diff --git a/docs/release-process.md b/docs/release-process.md
@@ -67,7 +67,13 @@ that's in use.
 ## Cut Release
 
 After the PR from the prepare phase is merged, make sure your local git dir is
-up-to-date with HEAD, that you're standing on your release branch, and then create and push a new tag. For example:
+up-to-date with HEAD, and then create a temporary release branch on top of the long-term release branch, for instance:
+
+```
+git checkout -b new-release-2.7.5 origin/release-2.7
+```
+
+And then, create the tag using the following command, note that you will need to replace the placeholder strings:
 
 ```
 OLD_VITESS_VERSION="13.0.0" NEW_VITESS_VERSION="14.0.3" NEW_OPERATOR_VERSION="2.7.4" NEXT_OPERATOR_VERSION="2.7.5" ./tools/release/do_release.sh 
@@ -81,4 +87,4 @@ hould automatically detect the new tag and begin building a new image.
 Create a [new release](https://github.com/planetscale/vitess-operator/releases/new)
 in GitHub to describe the updates users should expect.
 
-Create a new Pull Request with the two commits that the `do_release.sh` script created. Merge it onto the release branch.
+Follow the instructions prompted by the `do_release.sh` script. You will need to push the tag and push the temporary branch to finally create a Pull Request. The Pull Request should be merged onto the release branch.
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:v14.0.0"
+	defaultVitessLiteImage = "vitess/lite:v15.0.0-rc1"
 )
 
 // DefaultImages are a set of images to use when the CRD doesn't specify.
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:latest
-    vtgate: vitess/lite:latest
-    vttablet: vitess/lite:latest
-    vtbackup: vitess/lite:latest
+    vtctld: vitess/lite:v15.0.0-rc1
+    vtgate: vitess/lite:v15.0.0-rc1
+    vttablet: vitess/lite:v15.0.0-rc1
+    vtbackup: vitess/lite:v15.0.0-rc1
     mysqld:
-      mysql56Compatible: vitess/lite:latest
+      mysql56Compatible: vitess/lite:v15.0.0-rc1
     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:latest
-    vtadmin: vitess/vtadmin:latest
-    vtgate: vitess/lite:latest
-    vttablet: vitess/lite:latest
-    vtbackup: vitess/lite:latest
-    vtorc: vitess/lite:latest
+    vtctld: vitess/lite:v15.0.0-rc1
+    vtadmin: vitess/vtadmin:v15.0.0-rc1
+    vtgate: vitess/lite:v15.0.0-rc1
+    vttablet: vitess/lite:v15.0.0-rc1
+    vtbackup: vitess/lite:v15.0.0-rc1
+    vtorc: vitess/lite:v15.0.0-rc1
     mysqld:
-      mysql56Compatible: vitess/lite:latest
+      mysql56Compatible: vitess/lite:v15.0.0-rc1
     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:latest
-    vtgate: vitess/lite:latest
-    vttablet: vitess/lite:latest
-    vtbackup: vitess/lite:latest
+    vtctld: vitess/lite:v15.0.0-rc1
+    vtgate: vitess/lite:v15.0.0-rc1
+    vttablet: vitess/lite:v15.0.0-rc1
+    vtbackup: vitess/lite:v15.0.0-rc1
     mysqld:
-      mysql56Compatible: vitess/lite:latest
+      mysql56Compatible: vitess/lite:v15.0.0-rc1
     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:latest
-    vtgate: vitess/lite:latest
-    vttablet: vitess/lite:latest
-    vtbackup: vitess/lite:latest
+    vtctld: vitess/lite:v15.0.0-rc1
+    vtgate: vitess/lite:v15.0.0-rc1
+    vttablet: vitess/lite:v15.0.0-rc1
+    vtbackup: vitess/lite:v15.0.0-rc1
     mysqld:
-      mysql56Compatible: vitess/lite:latest
+      mysql56Compatible: vitess/lite:v15.0.0-rc1
     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:latest
-    vtgate: vitess/lite:latest
-    vttablet: vitess/lite:latest
-    vtbackup: vitess/lite:latest
+    vtctld: vitess/lite:v15.0.0-rc1
+    vtgate: vitess/lite:v15.0.0-rc1
+    vttablet: vitess/lite:v15.0.0-rc1
+    vtbackup: vitess/lite:v15.0.0-rc1
     mysqld:
-      mysql56Compatible: vitess/lite:latest
+      mysql56Compatible: vitess/lite:v15.0.0-rc1
     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:latest
-    vtgate: vitess/lite:latest
-    vttablet: vitess/lite:latest
-    vtbackup: vitess/lite:latest
+    vtctld: vitess/lite:v15.0.0-rc1
+    vtgate: vitess/lite:v15.0.0-rc1
+    vttablet: vitess/lite:v15.0.0-rc1
+    vtbackup: vitess/lite:v15.0.0-rc1
     mysqld:
-      mysql56Compatible: vitess/lite:latest
+      mysql56Compatible: vitess/lite:v15.0.0-rc1
     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:latest
-    vtgate: vitess/lite:latest
-    vttablet: vitess/lite:latest
-    vtbackup: vitess/lite:latest
+    vtctld: vitess/lite:v15.0.0-rc1
+    vtgate: vitess/lite:v15.0.0-rc1
+    vttablet: vitess/lite:v15.0.0-rc1
+    vtbackup: vitess/lite:v15.0.0-rc1
     mysqld:
-      mysql56Compatible: vitess/lite:latest
+      mysql56Compatible: vitess/lite:v15.0.0-rc1
     mysqldExporter: prom/mysqld-exporter:v0.11.0
   cells:
   - name: zone1
diff --git a/test/endtoend/operator/operator-latest.yaml b/test/endtoend/operator/operator-latest.yaml
@@ -5620,7 +5620,7 @@ spec:
           name: vitess-operator
           resources:
             limits:
-              memory: 128Mi
+              memory: 512Mi
             requests:
               cpu: 100m
               memory: 128Mi
diff --git a/test/endtoend/operator/operator.yaml b/test/endtoend/operator/operator.yaml
@@ -5432,11 +5432,11 @@ spec:
                   fieldPath: metadata.name
             - name: OPERATOR_NAME
               value: vitess-operator
-          image: planetscale/vitess-operator:v2.7.1
+          image: planetscale/vitess-operator:v2.8.0-rc1
           name: vitess-operator
           resources:
             limits:
-              memory: 128Mi
+              memory: 512Mi
             requests:
               cpu: 100m
               memory: 128Mi
diff --git a/tools/release/do_release.sh b/tools/release/do_release.sh
@@ -64,4 +64,15 @@ git tag -m Version\ $NEW_OPERATOR_VERSION v$NEW_OPERATOR_VERSION
 updateVersion $NEXT_OPERATOR_VERSION
 
 git add --all
-git commit -n -s -m "Back to dev mode"
+git commit -n -s -m "Back to dev mode"
+
+echo ""
+echo "-----------------------"
+echo ""
+echo "\tPlease push the new git tag:"
+echo ""
+echo "\t\tgit push origin v$NEW_OPERATOR_VERSION"
+echo ""
+echo "\tAnd push your current branch in order to open a Pull Request against the release branch."
+echo ""
+echo ""

Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,7 @@ const (`
`102`	`102`	`// DefaultMysqlPortName is the name for the MySQL port.`
`103`	`103`	`DefaultMysqlPortName = "mysql"`
`104`	`104`
`105`		`- defaultVitessLiteImage = "vitess/lite:v14.0.0"`
	`105`	`+ defaultVitessLiteImage = "vitess/lite:v15.0.0-rc1"`
`106`	`106`	`)`
`107`	`107`
`108`	`108`	`// DefaultImages are a set of images to use when the CRD doesn't specify.`