From ed052519da5498e0b37b39b32b8a9379e05f59ec Mon Sep 17 00:00:00 2001 From: Haowei Cai Date: Fri, 26 Jan 2018 15:41:55 -0800 Subject: [PATCH 1/4] Update org and repo name --- README.md | 12 ++++++------ devel/release.md | 4 ++-- devel/submodules.md | 2 +- examples/notebooks/docker/Dockerfile | 2 +- examples/notebooks/docker/jupyter.yml | 2 +- examples/notebooks/intro_notebook.ipynb | 2 +- kubernetes/README.md | 4 ++-- scripts/cherry_pick_pull.sh | 4 ++-- setup.py | 2 +- 9 files changed, 17 insertions(+), 17 deletions(-) diff --git a/README.md b/README.md index 88855a97f..f75de1b63 100644 --- a/README.md +++ b/README.md @@ -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) @@ -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 ``` @@ -117,14 +117,14 @@ between client-python versions. 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 diff --git a/devel/release.md b/devel/release.md index cb69de4b5..acfafa643 100644 --- a/devel/release.md +++ b/devel/release.md @@ -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. @@ -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. diff --git a/devel/submodules.md b/devel/submodules.md index 82cf7d720..f30b3f6b2 100644 --- a/devel/submodules.md +++ b/devel/submodules.md @@ -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: diff --git a/examples/notebooks/docker/Dockerfile b/examples/notebooks/docker/Dockerfile index 49fe5532f..80d72f113 100644 --- a/examples/notebooks/docker/Dockerfile +++ b/examples/notebooks/docker/Dockerfile @@ -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"] diff --git a/examples/notebooks/docker/jupyter.yml b/examples/notebooks/docker/jupyter.yml index ca1991d66..65e70ec05 100644 --- a/examples/notebooks/docker/jupyter.yml +++ b/examples/notebooks/docker/jupyter.yml @@ -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" diff --git a/examples/notebooks/intro_notebook.ipynb b/examples/notebooks/intro_notebook.ipynb index e91decb13..53bf63185 100644 --- a/examples/notebooks/intro_notebook.ipynb +++ b/examples/notebooks/intro_notebook.ipynb @@ -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" ] }, { diff --git a/kubernetes/README.md b/kubernetes/README.md index 722ea06bd..81b8c89b1 100644 --- a/kubernetes/README.md +++ b/kubernetes/README.md @@ -17,9 +17,9 @@ Python 2.7 and 3.4+ If the python package is hosted on Github, you can install directly from Github ```sh -pip install git+https://github.com/kubernetes-incubator/client-python.git +pip install git+https://github.com/kubernetes-client/python.git ``` -(you may need to run `pip` with root permission: `sudo pip install git+https://github.com/kubernetes-incubator/client-python.git`) +(you may need to run `pip` with root permission: `sudo pip install git+https://github.com/kubernetes-client/python.git`) Then import the package: ```python diff --git a/scripts/cherry_pick_pull.sh b/scripts/cherry_pick_pull.sh index 1d8024f0f..5327b1f02 100755 --- a/scripts/cherry_pick_pull.sh +++ b/scripts/cherry_pick_pull.sh @@ -31,8 +31,8 @@ declare -r REBASEMAGIC="${REPO_ROOT}/.git/rebase-apply" DRY_RUN=${DRY_RUN:-""} UPSTREAM_REMOTE=${UPSTREAM_REMOTE:-upstream} FORK_REMOTE=${FORK_REMOTE:-origin} -MAIN_REPO_NAME=${MAIN_REPO_NAME:-"client-python"} -MAIN_REPO_ORG=${MAIN_REPO_ORG:-"kubernetes-incubator"} +MAIN_REPO_NAME=${MAIN_REPO_NAME:-"python"} +MAIN_REPO_ORG=${MAIN_REPO_ORG:-"kubernetes-client"} if [[ -z ${GITHUB_USER:-} ]]; then echo "Please export GITHUB_USER= (or GH organization, if that's where your fork lives)" diff --git a/setup.py b/setup.py index b1167e5f5..204adc45f 100644 --- a/setup.py +++ b/setup.py @@ -40,7 +40,7 @@ setup( author_email="", author="Kubernetes", license="Apache License Version 2.0", - url="https://github.com/kubernetes-incubator/client-python", + url="https://github.com/kubernetes-client/python", keywords=["Swagger", "OpenAPI", "Kubernetes"], install_requires=REQUIRES, tests_require=TESTS_REQUIRES, From a949dde56f2200c5ac87e0a5f66cc38041e4dbfa Mon Sep 17 00:00:00 2001 From: "Haowei Cai (Roy)" Date: Fri, 26 Jan 2018 17:04:55 -0800 Subject: [PATCH 2/4] Update README.md --- README.md | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index f75de1b63..e98907ee6 100644 --- 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,7 @@ 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 | ✓ | Key: From 28ced970157bd1e57ee0658c1d1071521a0fc0d2 Mon Sep 17 00:00:00 2001 From: Haowei Cai Date: Mon, 12 Feb 2018 16:01:54 -0800 Subject: [PATCH 3/4] Update CHANGELOG and README for v5.0.0 --- CHANGELOG.md | 3 +++ README.md | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e074dd863..c670733df 100644 --- 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 index e98907ee6..9b423deaf 100644 --- a/README.md +++ b/README.md @@ -114,7 +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 Alpha/Beta | Kubernetes main repo, 1.9 branch | ✗ | +| 5.0 | Kubernetes main repo, 1.9 branch | ✓ | Key: From 9bcdc2bbb752a7b7f57c6a7cb269ec3148e34521 Mon Sep 17 00:00:00 2001 From: Haowei Cai Date: Mon, 12 Feb 2018 17:24:54 -0800 Subject: [PATCH 4/4] Update python-base submodule --- kubernetes/base | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kubernetes/base b/kubernetes/base index 6f02e73d8..9aed5add5 160000 --- a/kubernetes/base +++ b/kubernetes/base @@ -1 +1 @@ -Subproject commit 6f02e73d80a7b91e62f71a4ad81b4605e365b342 +Subproject commit 9aed5add59077787bbdd144246939a0ac610ca8d