Merge branch 'master' into watch

kubernetes-client · Aug 18, 2017 · 12fe5eb · 12fe5eb
2 parents 8fc2770 + 01f6875
commit 12fe5eb
Show file tree

Hide file tree

Showing 827 changed files with 5,709 additions and 3,452 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,19 @@
+# v3.0.0
+- Fix Operation names for subresources kubernetes/kubernetes#49357
+
+# v3.0.0b1
+- Add proper GCP config loader and refresher kubernetes-client/python-base#22
+- Add ws_streaming_protocol and use v4 by default kubernetes-client/python-base#20
+- Respect the KUBECONFIG environment variable if set kubernetes-client/python-base#19
+- Allow setting maxsize for PoolManager kubernetes-client/python-base#18
+- Restricting the websocket-client to <=0.40 #299
+
+# v3.0.0a1
+- Update client to kubernetes 1.7 
+- Support ThirdPartyResources (TPR) and CustomResourceDefinitions (CRD). Note that TPR is deprecated in kubernetes #251 #201
+- Better dependency management #136
+- Add support for python3.6 #244
+
 # v1.0.2
 - Bugfix: support RFC6902 'json-patch' operations #187
 

diff --git a/README.md b/README.md
@@ -83,11 +83,12 @@ supported versions of Kubernetes clusters.
 
 #### Compatibility matrix
 
-|                         | Kubernetes 1.3 | Kubernetes 1.4 | Kubernetes 1.5 | Kubernetes 1.6 |
-|-------------------------|----------------|----------------|----------------|----------------|
-| client-python 1.0       | +              | +              | ✓              | -              |
-| client-python 2.0 alpha | +              | +              | +              | ✓              |
-| client-python HEAD      | +              | +              | +              | +              |
+|                    | Kubernetes 1.3 | Kubernetes 1.4 | Kubernetes 1.5 | Kubernetes 1.6 | Kubernetes 1.7 |
+|--------------------|----------------|----------------|----------------|----------------|----------------|
+| client-python 1.0  | +              | +              | ✓              | -              | -              |
+| client-python 2.0  | +              | +              | +              | ✓              | -              |
+| client-python 3.0  | +              | +              | +              | +              | ✓              |
+| client-python HEAD | +              | +              | +              | +              | +              |
 
 Key:
 
@@ -105,13 +106,19 @@ between client-python versions.
 |----------------|--------------------------------------|-------------------------------|
 | 1.0 Alpha/Beta | Kubernetes main repo, 1.5 branch     | ✗                             |
 | 1.0.x          | Kubernetes main repo, 1.5 branch     | ✓                             |
-| 2.0 alpha      | Kubernetes main repo, 1.6 branch     | ✓                             |
+| 2.0 Alpha/Beta | Kubernetes main repo, 1.6 branch     | ✗                             |
+| 2.0.x          | Kubernetes main repo, 1.6 branch     | ✓                             |
+| 3.0 Alpha/Beta | Kubernetes main repo, 1.7 branch     | ✗                             |
+| 3.0            | Kubernetes main repo, 1.7 branch     | ✓                             |
+
 
 Key:
 
 * `✓` Changes in main Kubernetes repo are manually ([should be automated](https://github.com/kubernetes-incubator/client-python/issues/177)) published to client-python when they are available.
 * `✗` No longer maintained; please upgrade.
 
+Note: There would be no maintenance for alpha/beta releases except the latest one.
+
 ## Community, Support, Discussion
 
 You can reach the maintainers of this project at [SIG API Machinery](https://github.com/kubernetes/community/tree/master/sig-api-machinery). If you have any problem with the package or any suggestions, please file an [issue](https://github.com/kubernetes-incubator/client-python/issues).

diff --git a/devel/release.md b/devel/release.md
@@ -99,7 +99,7 @@ on a clean machine:
 
 ```bash
 git clean -xdf
-pyenv install 2.7.12
+pyenv install -s 2.7.12
 pyenv global 2.7.12
 virtualenv .release
 source .release/bin/activate
@@ -147,6 +147,9 @@ the target branch to "release-x.y". If the release is a pre-release, check the
 `This is a pre-release` option.
 
 
+## Announcement
+Send an announcement email to [email protected] with the subject [ANNOUNCE] kubernetes python-client $VERSION is released
+
 ## Cleanup
 
 ```bash

diff --git a/examples/notebooks/README.md b/examples/notebooks/README.md
@@ -10,3 +10,10 @@ kubectl create -f docker/jupyter.yml
 ```
 
 Open your browser on the jupyter service and go through the notebooks.
+
+If you are using minikube, you can run this command to see jupyter service in your browser:
+
+```
+minikube service jupyter
+```
+