Merge branch 'serenafang-master-patch-05047' into 'master'

Update EKS versions See merge request gitlab-org/gitlab!42271

Merge branch 'serenafang-master-patch-05047' into 'master'
Update EKS versions See merge request gitlab-org/gitlab!42271
a61824cb · Amy Qualls (currently half-days after surgery) · 785ad5c4 · 7eb598cb · a61824cb
Commit a61824cb authored Sep 14, 2020 by Amy Qualls (currently half-days after surgery)
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

doc/user/project/clusters/index.md doc/user/project/clusters/index.md +1 -1

No files found.
--- a/doc/user/project/clusters/index.md
+++ b/doc/user/project/clusters/index.md
@@ -46,11 +46,11 @@ version. The range of supported versions is based on the evaluation of:

 Currently, GitLab supports the following Kubernetes versions:

+- 1.17
 - 1.16
 - 1.15
 - 1.14
 - 1.13 (deprecated, support ends on November 22, 2020)
- 1.12 (deprecated, support ends on September 22, 2020)

 NOTE: **Note:**
 Some GitLab features may support versions outside the range provided here.