Merge branch 'master' of github.com:kubernetes-client/python into release-5.0

roycaihw · roycaihw · commit ba446b4618c4 · 2018-02-13T12:57:41.000-08:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,6 @@
+# v5.0.0
+- No changes. The same as `v5.0.0b1`.
+
 # v5.0.0b1
 - Update to Kubernetes 1.9 cluster
 - Label selector for pods is now required and must match the pod template's labels for v1beta2 StatefulSetSpec, ReplicaSetSpec, DaemonSetSpec and DeploymentSpec kubernetes/kubernetes#55357
diff --git a/README.md b/README.md
@@ -83,13 +83,14 @@ supported versions of Kubernetes clusters.
 
 #### Compatibility matrix
 
-|                    | Kubernetes 1.4 | Kubernetes 1.5 | Kubernetes 1.6 | Kubernetes 1.7 | Kubernetes 1.8 |
-|--------------------|----------------|----------------|----------------|----------------|----------------|
-| client-python 1.0  | +              | ✓              | -              | -              |-               |
-| client-python 2.0  | +              | +              | ✓              | -              |-               |
-| client-python 3.0  | +              | +              | +              | ✓              |-               |
-| client-python 4.0  | +              | +              | +              | +              |✓               |
-| client-python HEAD | +              | +              | +              | +              |✓               |
+|                    | Kubernetes 1.4 | Kubernetes 1.5 | Kubernetes 1.6 | Kubernetes 1.7 | Kubernetes 1.8 | Kubernetes 1.9 |
+|--------------------|----------------|----------------|----------------|----------------|----------------|----------------|
+| client-python 1.0  | +              | ✓              | -              | -              |-               |-               |
+| client-python 2.0  | +              | +              | ✓              | -              |-               |-               |
+| client-python 3.0  | +              | +              | +              | ✓              |-               |-               |
+| client-python 4.0  | +              | +              | +              | +              |✓               |-               |
+| client-python 5.0  | +              | +              | +              | +              |+               |✓               |
+| client-python HEAD | +              | +              | +              | +              |+               |✓               |
 
 Key:
 
@@ -113,6 +114,8 @@ between client-python versions.
 | 3.0            | Kubernetes main repo, 1.7 branch     | ✓                             |
 | 4.0 Alpha/Beta | Kubernetes main repo, 1.8 branch     | ✗                             |
 | 4.0            | Kubernetes main repo, 1.8 branch     | ✓                             |
+| 5.0 Alpha/Beta | Kubernetes main repo, 1.9 branch     | ✗                             |
+| 5.0            | Kubernetes main repo, 1.9 branch     | ✓                             |
 
 
 Key:
diff --git a/kubernetes/base b/kubernetes/base
@@ -1 +1 @@
-Subproject commit 6f02e73d80a7b91e62f71a4ad81b4605e365b342
+Subproject commit 9aed5add59077787bbdd144246939a0ac610ca8d
