Merge pull request #223976 from qpetraroia/master

change end of life dates to focus on months instead of k8s versions

Author: prmerger-automator[bot]

articles/aks/supported-kubernetes-versions.md

@@ -14,9 +14,6 @@ The Kubernetes community releases minor versions roughly every three months. Rec
 
 Minor version releases include new features and improvements. Patch releases are more frequent (sometimes weekly) and are intended for critical bug fixes within a minor version. Patch releases include fixes for security vulnerabilities or major bugs.
 
->[!WARNING]
-> Due to an issue with Calico and AKS. It is highly reccomended that customers using Calico do not upgrade or create new clusters on v1.25.
-
 ## Kubernetes versions
 
 Kubernetes uses the standard [Semantic Versioning](https://semver.org/) versioning scheme for each version:
@@ -188,21 +185,19 @@ Get-AzAksVersion -Location eastus
 
 ## AKS Kubernetes release calendar
 
-For the past release history, see [Kubernetes](https://en.wikipedia.org/wiki/Kubernetes#History).
-
 > [!NOTE]
-> The asterisk (*) states that a date has not been finalized; because of this, the timeline below is subject to change. Please continue to check the release calendar for updates.
+> AKS follows 12 months of support for a GA Kubernetes version. To read more about our support policy for Kubernetes versioning, please read our [FAQ](https://learn.microsoft.com/azure/aks/supported-kubernetes-versions?tabs=azure-cli#faq).
+
+For the past release history, see [Kubernetes](https://en.wikipedia.org/wiki/Kubernetes#History).
 
 |  K8s version | Upstream release  | AKS preview  | AKS GA  | End of life |
 |--------------|-------------------|--------------|---------|-------------|
-| 1.21  | Apr-08-21 | May 2021   | Jul 2021  | 1.24 GA |
-| 1.22  | Aug-04-21 | Sept 2021   | Dec 2021  | 1.25 GA |
-| 1.23  | Dec 2021 | Jan 2022   | Apr 2022  | 1.26 GA |
-| 1.24 | Apr-22-22 | May 2022 | Jul 2022 | 1.27 GA
-| 1.25 | Aug 2022 | Oct 2022 | Dec 2022 | 1.28 GA
-| 1.26 | Dec 2022 | Jan 2023 | Feb 2023 | 1.29 GA
-| 1.27 | Apr 2023 | May 2023 | Jun 2023 | 1.30 GA 
-| 1.28 | * | * | * | 1.31 GA
+| 1.22  | Aug-04-21 | Sept 2021   | Dec 2021  | Dec 2022 |
+| 1.23  | Dec 2021 | Jan 2022   | Apr 2022  | Apr 2023 |
+| 1.24 | Apr-22-22 | May 2022 | Jul 2022 | Jul 2023
+| 1.25 | Aug 2022 | Oct 2022 | Dec 2022 | Dec 2023
+| 1.26 | Dec 2022 | Jan 2023 | Feb 2023 | Feb 2024
+| 1.27 | Apr 2023 | May 2023 | Jun 2023 | Jun 2024
 
 > [!NOTE]
 > To see real-time updates of region release status and version release notes, visit the [AKS release status webpage][aks-release]. To learn more about the release status webpage, see [AKS release tracker][aks-tracker].