Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Pull master into release-17.0 #1447

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Conversation

roycaihw
Copy link
Member

What type of PR is this?

/kind cleanup

What this PR does / why we need it:

Talked offline with @scottilee, I'm doing the first step of the release process Create or update release branch for the upcoming v17.17.0b1 release, so that it will be easier and cleaner for Scott to do the remaining release steps.

  • The goal: pull master into release-17.0 and resolve conflicts
  • What I did:
$ git fetch upstream
$ git checkout upstream/release-17.0
$ git checkout -b pull-master-into-release-17.0

# Pull master into release-17.0. For merge conflicts in generated code, it's okay to accept either,
# they will be updated when we do the remaining release steps. 
# This creates the first 62 commits in this PR. I will paste the git output below
$ git pull -X theirs upstream master 

Does this PR introduce a user-facing change?

NONE

/cc @yliaog
@scottilee

gliptak and others added 30 commits November 9, 2020 19:28
Signed-off-by: Gábor Lipták <[email protected]>
Releases are being fast tracked until we sync with the upstream
releases. The older releases will continue to be maintained for that
transition period or related upstream version deprecation whichever is
later.

Signed-off-by: Nabarun Pal <[email protected]>
…mpat-and-support-clauses

Update support and compatibitility sections of documentation
Implement back end raw port test container using python.
Adding Power support(ppc64le) with ci and testing to the project for architecture independent
…/labels

e2e: use labels for configmap api; wait for default service account creation
…ed 'kubernetes.leaderelection' error

To reproduce: Make sure to create a file outside of checked out python repo directory.
$ cat hello_k8s.py
import kubernetes

kubernetes.config.load_kube_config()

k8s = kubernetes.client.CoreV1Api()
print("Listing pods with their IPs:")
ret = k8s.list_pod_for_all_namespaces(watch=False)
for i in ret.items:
    print("%s\t%s\t%s" % (i.status.pod_ip, i.metadata.namespace, i.metadata.name))

python hello_k8s.py
Traceback (most recent call last):
  File "hello_k8s.py", line 1, in <module>
    import kubernetes
  File "<frozen zipimport>", line 259, in load_module
  File "anaconda3/lib/python3.8/site-packages/kubernetes-17.0.0_snapshot-py3.8.egg/kubernetes/__init__.py", line 25, in <module>
ModuleNotFoundError: No module named 'kubernetes.leaderelection'
Added kubernetes.leaderelection in packages list to fix import error
- move regex compilation to the top of the module to enable caching.
Use get_default_copy() API with configuration.
Priyankasaggu11929 and others added 17 commits April 28, 2021 22:09
…ggu-enhance_node_labels_example

simplify & enhance the node_labels.py example
…ggu_add_cluster_scoped_custom_object_example

Add example to demonstrate usage of `patch_cluster_custom_object` method
Detect OS X sed and fail client generation script
…upstream-commits

Apply-hotfixes: use commits from upstream repo instead of a forked repo
…om-patch1

Removed custom_object.py and created a new file namespaced_custom_object.py which is more specific to usage of namespaced custom resource
examples: comment improvement in remote_cluster.py and deployment_cre…
@k8s-ci-robot k8s-ci-robot requested a review from yliaog April 30, 2021 18:17
@k8s-ci-robot k8s-ci-robot added release-note-none Denotes a PR that doesn't merit a release note. kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. labels Apr 30, 2021
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: roycaihw

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot added approved Indicates a PR has been approved by an approver from all required OWNERS files. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Apr 30, 2021
@roycaihw
Copy link
Member Author

git output for the actual pull:

$ git pull -X theirs upstream master
From github.com:kubernetes-client/python
 * branch                master     -> FETCH_HEAD
hint: Pulling without specifying how to reconcile divergent branches is
hint: discouraged. You can squelch this message by running one of the following
hint: commands sometime before your next pull:
hint:
hint:   git config pull.rebase false  # merge (the default strategy)
hint:   git config pull.rebase true   # rebase
hint:   git config pull.ff only       # fast-forward only
hint:
hint: You can replace "git config" with "git config --global" to set a default
hint: preference for all repositories. You can also pass --rebase, --no-rebase,
hint: or --ff-only on the command line to override the configured default per
hint: invocation.
Auto-merging setup.py
Auto-merging kubernetes/__init__.py
Merge made by the 'recursive' strategy.
 .github/PULL_REQUEST_TEMPLATE.md                           |  72 +++++++++++++++++++++++++++++++++++++++++++++++++++
 .github/workflows/test.yaml                                |   4 +--
 .travis.yml                                                |  54 +++++++++++++++++++++++++++++++++++++-
 devel/submodules.md                                        |   4 +--
 examples/cluster_scoped_custom_object.py                   | 150 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 examples/deployment_create.py                              |   4 +++
 examples/{custom_object.py => namespaced_custom_object.py} |  32 ++++++++++++++++++++++-
 examples/node_labels.py                                    |  20 ++++++++++-----
 examples/pod_exec.py                                       |   7 +++--
 examples/remote_cluster.py                                 |  10 +++++---
 kubernetes/__init__.py                                     |   1 +
 kubernetes/base                                            |   2 +-
 kubernetes/e2e_test/port_server.py                         |  41 +++++++++++++++++++++++++++++
 kubernetes/e2e_test/test_client.py                         | 124 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------
 kubernetes/e2e_test/test_watch.py                          |   8 +++---
 kubernetes/leaderelection                                  |   1 +
 kubernetes/utils/create_from_yaml.py                       |   7 +++--
 scripts/apply-hotfixes.sh                                  |   4 +--
 scripts/update-client.sh                                   |  19 ++++++++++++++
 scripts/update-submodule.sh                                |  65 ++++++++++++++++++++++++++++++++++++++++++++++
 scripts/util/changelog.sh                                  | 109 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 setup.py                                                   |   3 ++-
 tox.ini                                                    |   4 +--
 23 files changed, 703 insertions(+), 42 deletions(-)
 create mode 100644 .github/PULL_REQUEST_TEMPLATE.md
 create mode 100644 examples/cluster_scoped_custom_object.py
 rename examples/{custom_object.py => namespaced_custom_object.py} (72%)
 create mode 100644 kubernetes/e2e_test/port_server.py
 create mode 120000 kubernetes/leaderelection
 create mode 100755 scripts/update-submodule.sh
 create mode 100755 scripts/util/changelog.sh

@yliaog
Copy link
Contributor

yliaog commented Apr 30, 2021

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Apr 30, 2021
@k8s-ci-robot k8s-ci-robot merged commit be200e2 into kubernetes-client:release-17.0 Apr 30, 2021
@roycaihw roycaihw deleted the pull-master-into-release-17.0 branch April 30, 2021 20:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. lgtm "Looks good to me", indicates that a PR is ready to be merged. release-note-none Denotes a PR that doesn't merit a release note. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.