Merge pull request kubernetes-client#1499 from roycaihw/update-master-readme

k8s-ci-robot · web-flow · commit a1fbb7083e7c · 2021-06-21T15:16:50.000-07:00
Cherrypick README and CHANGLOG of v18.20.0b1 to master branch
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,11 @@
+# v18.20.0b1
+
+Kubernetes API Version: 1.18.20
+
+**Important Information:**
+
+- Python 2 had reached [End of Life](https://www.python.org/doc/sunset-python-2/) on January 1, 2020. The Kubernetes Python Client has dropped support for Python 2 from this release (v18.20.0b1) and will no longer provide support to older clients as per the [Kubernetes support policy](https://kubernetes.io/docs/setup/release/version-skew-policy/#supported-versions).
+
 # v18.17.0a1
 
 Kubernetes API Version: 1.18.17
diff --git a/README.md b/README.md
@@ -86,8 +86,8 @@ supported versions of Kubernetes clusters.
 - [client 10.y.z](https://pypi.org/project/kubernetes/10.1.0/): Kubernetes 1.13 or below (+-), Kubernetes 1.14 (✓), Kubernetes 1.14 or above (+-)
 - [client 11.y.z](https://pypi.org/project/kubernetes/11.0.0/): Kubernetes 1.14 or below (+-), Kubernetes 1.15 (✓), Kubernetes 1.16 or above (+-)
 - [client 12.y.z](https://pypi.org/project/kubernetes/12.0.1/): Kubernetes 1.15 or below (+-), Kubernetes 1.16 (✓), Kubernetes 1.17 or above (+-)
-- [client 17.y.z](https://pypi.org/project/kubernetes/17.14.0a1/): Kubernetes 1.16 or below (+-), Kubernetes 1.17 (✓), Kubernetes 1.18 or above (+-)
-- [client 18.y.z](https://pypi.org/project/kubernetes/18.17.0a1/): Kubernetes 1.17 or below (+-), Kubernetes 1.18 (✓), Kubernetes 1.19 or above (+-)
+- [client 17.y.z](https://pypi.org/project/kubernetes/17.17.0/): Kubernetes 1.16 or below (+-), Kubernetes 1.17 (✓), Kubernetes 1.18 or above (+-)
+- [client 18.y.z](https://pypi.org/project/kubernetes/18.20.0b1/): Kubernetes 1.17 or below (+-), Kubernetes 1.18 (✓), Kubernetes 1.19 or above (+-)
 
 > See [here](#homogenizing-the-kubernetes-python-client-versions) for an explaination of why there is no v13-v16 release.
 
@@ -119,12 +119,13 @@ between client-python versions.
 | 9.0 Alpha/Beta  | Kubernetes main repo, 1.13 branch    | ✗                             |
 | 9.0             | Kubernetes main repo, 1.13 branch    | ✗                             |
 | 10.0 Alpha/Beta | Kubernetes main repo, 1.14 branch    | ✗                             |
-| 10.0            | Kubernetes main repo, 1.14 branch    | ✓                             |
+| 10.0            | Kubernetes main repo, 1.14 branch    | ✗                             |
 | 11.0 Alpha/Beta | Kubernetes main repo, 1.15 branch    | ✗                             |
 | 11.0            | Kubernetes main repo, 1.15 branch    | ✓                             |
 | 12.0 Alpha/Beta | Kubernetes main repo, 1.16 branch    | ✗                             |
 | 12.0            | Kubernetes main repo, 1.16 branch    | ✓                             |
-| 17.0 Alpha/Beta | Kubernetes main repo, 1.17 branch    | ✓                             |
+| 17.0 Alpha/Beta | Kubernetes main repo, 1.17 branch    | ✗                             |
+| 17.0            | Kubernetes main repo, 1.17 branch    | ✓                             |
 | 18.0 Alpha/Beta | Kubernetes main repo, 1.18 branch    | ✓                             |
 
 > See [here](#homogenizing-the-kubernetes-python-client-versions) for an explaination of why there is no v13-v16 release.
