From d0bf324caa8f2200366ec4530dec2e9c25b94663 Mon Sep 17 00:00:00 2001 From: Nick Young Date: Mon, 27 Apr 2020 10:34:23 +1000 Subject: [PATCH] Update Kube support matrix and remove Zoom link from community page Signed-off-by: Nick Young --- site/_resources/kubernetes.md | 17 ++++++++++------- site/community.md | 3 +-- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/site/_resources/kubernetes.md b/site/_resources/kubernetes.md index 7ebe734100f..6d6e2c967e7 100644 --- a/site/_resources/kubernetes.md +++ b/site/_resources/kubernetes.md @@ -11,13 +11,16 @@ The `client-go` package includes a [compatibility matrix][2] as to what Kubernet ## Supported Kubernetes versions -| Kubernetes version | Contour v1.0.0 | Contour v1.0.1 | Contour v1.1.0 | Contour v1.2.0 | Contour v1.2.1 | -| ------------ | :-----------: | :-----------: | :----------: | :--------: | -| 1.13.x | Supported | Supported | Supported | Not Supported1 | Not Supported1 | -| 1.14.x | Supported | Supported | Supported | Not Supported1 | Not Supported1 | -| 1.15.x | Supported | Supported | Supported | Supported | Supported | -| 1.16.x | Not Supported1 | Not Supported1 | Not Supported1 | Supported | Supported | -| 1.17.x | Not Supported1 | Not Supported1 | Not Supported1 | Supported | Supported | +| Contour Version | Kubernetes Version | +| --------------- | :------------------- | +| 1.4.0 | 1.17.x, 1.16.x, 1.15.x | +| 1.3.0 | 1.17.x, 1.16.x, 1.15.x | +| 1.2.1 | 1.17.x, 1.16.x, 1.15.x | +| 1.2.0 | 1.17.x, 1.16.x, 1.15.x | +| 1.1.0 | 1.15.x, 1.14.x, 1.13.x | +| 1.0.1 | 1.15.x, 1.14.x, 1.13.x | +| 1.0.0 | 1.15.x, 1.14.x, 1.13.x | + ### Notes diff --git a/site/community.md b/site/community.md index c85c6d76630..9c1a3e23356 100644 --- a/site/community.md +++ b/site/community.md @@ -14,7 +14,7 @@ If you’re a newcomer, check out the “[Good first issue][1]” and “[Help w * Join the [Project Contour Announce][8] mailing list for release notifications and other important news. -* Join the [Contour Community Meetings][5] on Zoom +* Join the Contour Community Meetings on Zoom * For Australia time zones: * Every first and third Tuesday at 6:30 PM Eastern Time / 3:30 PM Pacific Time / Wednesday at 9:30 AM Australian Eastern Time. * For Americas time zones: @@ -27,7 +27,6 @@ If you’re a newcomer, check out the “[Good first issue][1]” and “[Help w [2]: {{site.github.repository_url}}/issues?utf8=%E2%9C%93&q=is%3Aopen+is%3Aissue+label%3A%22Help+wanted%22+ [3]: {{site.footer_social_links.Twitter.url}} [4]: {{site.footer_social_links.Slack.url}} -[5]: https://vmware.zoom.us/j/347232187 [6]: https://hackmd.io/84Xbl4WBTpm7OBhaOAsSiw [7]: https://www.youtube.com/playlist?list=PL7bmigfV0EqTBsPrnCkzhu0R4SAWnBjLj [8]: https://groups.google.com/forum/#!forum/projectcontour-announce