Merge pull request #751 from tnozicka/v1.4-docs

Promote v1.4 documentation and update release info
scylladb · Aug 10, 2021 · e50912d · e50912d
2 parents cd3b019 + 512c937
commit e50912d
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 10 deletions.
diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -161,7 +161,7 @@ def setup(sphinx):
 smv_branch_whitelist = multiversion_regex_builder(BRANCHES)
 # Defines which version is considered to be the latest stable version.
 # Must be listed in smv_tag_whitelist or smv_branch_whitelist.
-smv_latest_version = 'v1.3'
+smv_latest_version = 'v1.4'
 smv_rename_latest_version = 'stable'
 # Whitelist pattern for remotes (set to None to use local branches only)
 smv_remote_whitelist = r"^origin$"

diff --git a/docs/source/releases.md b/docs/source/releases.md
@@ -5,15 +5,16 @@ We are aiming to ship a new release approximately every 6 weeks. The following r
 
 | Release | Code freeze | General availability |
 | :-----: | :---------: | :------------------: |
-| 1.4     | 2021-07-01  | 2021-07-29           |
+| 1.5     | 2021-09-01  | 2021-09-22           |
 
 ## Supported releases
 We support the latest 2 releases of the operator to give everyone time to upgrade.
 
 | Release | General availability      | Support ends   |
 | :-----: | :-----------------------: | :------------: |
+| 1.4     | 2021-08-10                | Release of 1.6 |
 | 1.3     | 2021-06-17                | Release of 1.5 |
-| 1.2     | 2021-05-06                | Release of 1.4 |
+| 1.2     | 2021-05-06                | 2021-08-10     |
 | 1.1     | 2021-03-22                | 2021-06-17     |
 | 1.0     | 2021-01-21                | 2021-05-06     |
 
@@ -42,10 +43,10 @@ GA images aren't build from scratch but rather promoted from an existing release
 
 Support matrix table shows the version requirements for a particular **scylla-operator** version. Be sure to match these requirements, otherwise some functionality will not work.
 
-|                    | v1.4        | v1.3        | v1.2        | v1.1        | v1.0       |
-| :----------------: | :---------: | :---------: | :---------: | :---------: | :--------: |
-| Kubernetes         | `>=1.19.10` | `>=1.19`    | `>=1.19`    | `>=1.11`    | `>=1.11`   |
-| Scylla OS          | `>=4.3`     | `>=4.2`     | `>=4.2`     | `>=4.0`     | `>=4.0`    |
-| Scylla Enterprise  | `>=2021.1`  | `>=2020.1`  | `>=2020.1`  | `>=2020.1`  | `>=2020.1` |
-| Scylla Manager     | `>=2.2`     | `>=2.2`     | `>=2.2`     | `>=2.2`     | `>=2.2`    |
-| Scylla Monitoring  | `>=1.0`     | `>=1.0`     | `>=1.0`     | `>=1.0`     | `>=1.0`    |
+|                    | v1.5        | v1.4        | v1.3        | v1.2        | v1.1        | v1.0       |
+| :----------------: | :---------: | :---------: | :---------: | :---------: | :---------: | :--------: |
+| Kubernetes         | `>=1.19.10` | `>=1.19.10` | `>=1.19`    | `>=1.19`    | `>=1.11`    | `>=1.11`   |
+| Scylla OS          | `>=4.3`     | `>=4.3`     | `>=4.2`     | `>=4.2`     | `>=4.0`     | `>=4.0`    |
+| Scylla Enterprise  | `>=2021.1`  | `>=2021.1`  | `>=2020.1`  | `>=2020.1`  | `>=2020.1`  | `>=2020.1` |
+| Scylla Manager     | `>=2.2`     | `>=2.2`     | `>=2.2`     | `>=2.2`     | `>=2.2`     | `>=2.2`    |
+| Scylla Monitoring  | `>=1.0`     | `>=1.0`     | `>=1.0`     | `>=1.0`     | `>=1.0`     | `>=1.0`    |