Skip to content

Commit

Permalink
Merge branch 'master' of github.com:kubernetes-incubator/client-pytho…
Browse files Browse the repository at this point in the history
…n into release-3.0
  • Loading branch information
mbohlool committed Aug 11, 2017
2 parents 7243e93 + e2e422b commit ead44fe
Show file tree
Hide file tree
Showing 813 changed files with 2,124 additions and 2,082 deletions.
10 changes: 10 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
# 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
Expand Down
19 changes: 13 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:

Expand All @@ -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).
Expand Down
5 changes: 4 additions & 1 deletion devel/release.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
7 changes: 7 additions & 0 deletions examples/notebooks/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
```

2 changes: 1 addition & 1 deletion examples/notebooks/docker/jupyter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ spec:
targetPort: 8888
selector:
app: jupyter
type: NodePort
type: LoadBalancer
---
apiVersion: v1
kind: Pod
Expand Down
2 changes: 2 additions & 0 deletions kubernetes/.swagger-codegen/COMMIT
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Requested Commit: v2.2.2
Actual Commit: ff209ada223dcc7f6c6afc59bb02ec96b85c7e39
40 changes: 20 additions & 20 deletions kubernetes/README.md

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion kubernetes/base
2 changes: 1 addition & 1 deletion kubernetes/client/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
OpenAPI spec version: v1.7.1
OpenAPI spec version: v1.7.4
Generated by: https://github.com/swagger-api/swagger-codegen.git
"""
Expand Down
2 changes: 1 addition & 1 deletion kubernetes/client/apis/admissionregistration_api.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
OpenAPI spec version: v1.7.1
OpenAPI spec version: v1.7.4
Generated by: https://github.com/swagger-api/swagger-codegen.git
"""
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
OpenAPI spec version: v1.7.1
OpenAPI spec version: v1.7.4
Generated by: https://github.com/swagger-api/swagger-codegen.git
"""
Expand Down
2 changes: 1 addition & 1 deletion kubernetes/client/apis/apiregistration_api.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
OpenAPI spec version: v1.7.1
OpenAPI spec version: v1.7.4
Generated by: https://github.com/swagger-api/swagger-codegen.git
"""
Expand Down
2 changes: 1 addition & 1 deletion kubernetes/client/apis/apiregistration_v1beta1_api.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
OpenAPI spec version: v1.7.1
OpenAPI spec version: v1.7.4
Generated by: https://github.com/swagger-api/swagger-codegen.git
"""
Expand Down
2 changes: 1 addition & 1 deletion kubernetes/client/apis/apis_api.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
OpenAPI spec version: v1.7.1
OpenAPI spec version: v1.7.4
Generated by: https://github.com/swagger-api/swagger-codegen.git
"""
Expand Down
2 changes: 1 addition & 1 deletion kubernetes/client/apis/apps_api.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
OpenAPI spec version: v1.7.1
OpenAPI spec version: v1.7.4
Generated by: https://github.com/swagger-api/swagger-codegen.git
"""
Expand Down
Loading

0 comments on commit ead44fe

Please sign in to comment.