Skip to content

Commit

Permalink
Merge branch 'master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
mbohlool authored Feb 26, 2018
2 parents 317aeee + 3f4d09d commit a3f6195
Show file tree
Hide file tree
Showing 1,245 changed files with 139,830 additions and 10,727 deletions.
13 changes: 13 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,16 @@
# 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
- The dynamic admission webhook is split into two kinds, mutating and validating. The kinds have changed completely and old code must be ported to admissionregistration.k8s.io/v1beta1 - MutatingWebhookConfiguration and ValidatingWebhookConfiguration kubernetes/kubernetes#55282
- DaemonSet, Deployment, ReplicaSet, and StatefulSet have been promoted to GA and are available in the apps/v1 group version kubernetes/kubernetes#53679
- Introduce new storage.k8s.io/v1alpha1 VolumeAttachment object kubernetes/kubernetes#54463
- Introduce core/v1 RBDPersistentVolumeSource kubernetes/kubernetes#54302
- StatefulSet status now has support for conditions kubernetes/kubernetes#55268
- DaemonSet status now has support for conditions kubernetes/kubernetes#55272

# v4.0.0
- api change V1PersistentVolumeSpec to V1ScaleIOPersistentVolumeSource #397.

Expand Down
29 changes: 16 additions & 13 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# Kubernetes Python Client

[![Build Status](https://travis-ci.org/kubernetes-incubator/client-python.svg?branch=master)](https://travis-ci.org/kubernetes-incubator/client-python)
[![Build Status](https://travis-ci.org/kubernetes-client/python.svg?branch=master)](https://travis-ci.org/kubernetes-client/python)
[![PyPI version](https://badge.fury.io/py/kubernetes.svg)](https://badge.fury.io/py/kubernetes)
[![codecov](https://codecov.io/gh/kubernetes-incubator/client-python/branch/master/graph/badge.svg)](https://codecov.io/gh/kubernetes-incubator/client-python "Non-generated packages only")
[![codecov](https://codecov.io/gh/kubernetes-client/python/branch/master/graph/badge.svg)](https://codecov.io/gh/kubernetes-client/python "Non-generated packages only")
[![pypi supported versions](https://img.shields.io/pypi/pyversions/kubernetes.svg)](https://pypi.python.org/pypi/kubernetes)
[![Client Capabilities](https://img.shields.io/badge/Kubernetes%20client-Silver-blue.svg?style=flat&colorB=C0C0C0&colorA=306CE8)](http://bit.ly/kubernetes-client-capabilities-badge)
[![Client Support Level](https://img.shields.io/badge/kubernetes%20client-beta-green.svg?style=flat&colorA=306CE8)](http://bit.ly/kubernetes-client-support-badge)
Expand All @@ -14,8 +14,8 @@ Python client for the [kubernetes](http://kubernetes.io/) API.
From source:

```
git clone --recursive https://github.com/kubernetes-incubator/client-python.git
cd client-python
git clone --recursive https://github.com/kubernetes-client/python.git
cd python
python setup.py install
```

Expand Down Expand Up @@ -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:

Expand All @@ -113,18 +114,20 @@ 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:

* `` 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.
* `` Changes in main Kubernetes repo are manually ([should be automated](https://github.com/kubernetes-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).
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-client/python/issues).

### Code of Conduct

Expand Down
4 changes: 2 additions & 2 deletions devel/release.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ branch, update release tags, create distribution packages and upload them to
pip.

## Change logs
Make sure changes logs are up to date [here](https://github.com/kubernetes-incubator/client-python/blob/master/CHANGELOG.md).
Make sure changes logs are up to date [here](https://github.com/kubernetes-client/python/blob/master/CHANGELOG.md).
If they are not, follow commits added after last release and update/commit
the change logs to master.

Expand Down Expand Up @@ -141,7 +141,7 @@ twine upload dist/*
## Create github release

Create a gihub release by starting from
[this page](https://github.com/kubernetes-incubator/client-python/releases).
[this page](https://github.com/kubernetes-client/python/releases).
Click Deaft new release button. Name the tag the same as CLIENT_VERSION. Change
the target branch to "release-x.y". If the release is a pre-release, check the
`This is a pre-release` option.
Expand Down
2 changes: 1 addition & 1 deletion devel/submodules.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ This document will provide basic steps to get submodules work.
To clone repo, you need to pass `recursive` parameter to make the clone also get submodules:

```bash
git clone --recursive https://github.com/kubernetes-incubator/client-python.git
git clone --recursive https://github.com/kubernetes-client/python.git
```

if you already clone repo with no `--recursive` option, you can run this command to get submodules:
Expand Down
2 changes: 1 addition & 1 deletion examples/notebooks/docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM nbgallery/jupyter-alpine:latest

RUN pip install git+https://github.com/kubernetes-incubator/client-python.git
RUN pip install git+https://github.com/kubernetes-client/python.git

ENTRYPOINT ["/sbin/tini", "--"]
CMD ["jupyter", "notebook", "--ip=0.0.0.0"]
Expand Down
2 changes: 1 addition & 1 deletion examples/notebooks/docker/jupyter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,4 @@ spec:
volumes:
- name: notebook-volume
gitRepo:
repository: "https://github.com/kubernetes-incubator/client-python.git"
repository: "https://github.com/kubernetes-client/python.git"
2 changes: 1 addition & 1 deletion examples/notebooks/intro_notebook.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"- **`delete_xxxx`** : delete a resource. This performs operations similar to **`kubectl delete`**.\n",
"\n",
"\n",
"For Futher information see the Documentation for API Endpoints section in https://github.com/kubernetes-incubator/client-python/blob/master/kubernetes/README.md"
"For Futher information see the Documentation for API Endpoints section in https://github.com/kubernetes-client/python/blob/master/kubernetes/README.md"
]
},
{
Expand Down
Loading

0 comments on commit a3f6195

Please sign in to comment.