From 16402050dc6b866c57b6092bd5dd0275a4fd149d Mon Sep 17 00:00:00 2001 From: James Strong Date: Tue, 8 Jun 2021 12:21:34 -0400 Subject: [PATCH] update docs with supported version of k8s, alpine and nginx (#7214) --- README.md | 16 ++++++++++------ RELEASE.md | 1 + 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 6a5d7605b..9add5beba 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,3 @@ -## Help us to improve the NGINX Ingress controller [completing the survey](https://docs.google.com/forms/d/15ULTOvYDsV920V0GWrspew4yyjEmTAi740Wr34UgKwA/viewform) - ---- - # NGINX Ingress Controller [![Go Report Card](https://goreportcard.com/badge/github.com/kubernetes/ingress-nginx)](https://goreportcard.com/report/github.com/kubernetes/ingress-nginx) @@ -31,7 +27,7 @@ Thanks for taking the time to join our community and start contributing! - This project adheres to the [Kubernetes Community Code of Conduct](https://git.k8s.io/community/code-of-conduct.md). By participating in this project, you agree to abide by its terms. - See [CONTRIBUTING.md](CONTRIBUTING.md) for information about setting up your environment, the workflow that we expect, and instructions on the developer certificate of origin that we require. - Check out the [open issues](https://github.com/kubernetes/ingress-nginx). -- Join our Kubernetes Slack channel: [#ingress-nginx](https://kubernetes.slack.com/messages/CANQGM8BA/). +- Join our Kubernetes Slack channel for developer discussion : [#ingress-nginx-dev](https://kubernetes.slack.com/archives/C021E147ZA4). ## Changelog @@ -39,12 +35,20 @@ See [the list of releases](https://github.com/kubernetes/ingress-nginx/releases) For detailed changes for each release; please check the [Changelog.md](Changelog.md) file. For detailed changes on the `ingress-nginx` helm chart, please check the following [CHANGELOG.md](charts/ingress-nginx/CHANGELOG.md) file. +### Support Versions table + +| Ingress-nginx version | k8s supported version | Alpine Version | Nginx Version | +|-----------------------|------------- |----------------|---------------| +| v0.47.0 | 1.21, 1.20, 1.19 | 3.13.5 | 1.20.1 | +| v0.46.0 | 1.21, 1.20, 1.19 | 3.13.2 | 1.19.6 | +| v0.45.0 | 1.21, 1.20, 1.19 | 3.13.2 | 1.19.6 | + # Get Involved - **Contributing**: Pull requests are welcome! - Read [`CONTRIBUTING.md`](CONTRIBUTING.md) and check out [help-wanted](https://github.com/kubernetes/ingress-nginx/labels/help%20wanted) issues. - Submit github issues for any feature enhancements, bugs or documentation problems. -- **Support**: Join to [Kubernetes Slack](http://slack.kubernetes.io/) in the [#ingress-nginx](https://kubernetes.slack.com/messages/CANQGM8BA/) channel to ask questions to get support from the maintainers and other users. +- **Support**: Join to [Kubernetes Slack](http://slack.kubernetes.io/) in the [#ingress-nginx-users](https://kubernetes.slack.com/messages/CANQGM8BA/) channel to ask questions to get support from the maintainers and other users. - The [github issues](https://github.com/kubernetes/ingress-nginx/issues) in the repository are **exclusively** for bug reports and feature requests. - **Discuss**: Tweet using the `#IngressNginx` hashtag. diff --git a/RELEASE.md b/RELEASE.md index 7ec0c9ac7..50324bf71 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -72,6 +72,7 @@ The sha is available in output from [cloud build](https://console.cloud.google.c * Update Changelog and Documentation: * Open pull request updating [Changelog.md](https://github.com/kubernetes/ingress-nginx/blob/master/Changelog.md) * Update the version in [docs/deploy/index.md](docs/deploy/index.md) + * Update Supported versions in the Support Versions table in the README.md * Merge 7. Github release \ No newline at end of file