Skip to content

Manual cherrypick master branch changes to release-9.0 #752

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.

Sign up for GitHub

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

Merged
merged 5 commits into from
Feb 8, 2019
Merged

Manual cherrypick master branch changes to release-9.0 #752

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
273e0b5
Use yaml.safe_load
ramnes Jan 8, 2019
bd5b6a2
Update python-base ref to include yaml security fix
xvello Jan 9, 2019
21775dc
Updated OWNERS file to include link to docs
rlenferink Feb 4, 2019
128e015
update base submodule
roycaihw Feb 8, 2019
ce0dd71
Make dependancy adal optional
iamneha Feb 7, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,16 @@
# v9.0.0b1
**Breaking Change:**
- Move dependancy adal under extra require [kubernetes-client/python-base#108](https://github.com/kubernetes-client/python-base/pull/108)

**Bug Fix:**
- Honor the specified resource version in stream request when watch restarts [kubernetes-client/python-base#109](https://github.com/kubernetes-client/python-base/pull/109)

**API Change:**
- Add timeoutSeconds parameter to CustomObjectsApi list/watch calls [kubernetes-client/gen#94](https://github.com/kubernetes-client/gen/pull/94)

**New Feature:**
- Avoid creating unused ThreadPools [kubernetes-client/gen#91](https://github.com/kubernetes-client/gen/pull/91)

# v9.0.0a1
**New Feature:**
- Avoid creating unused ThreadPools [kubernetes-client/gen#91](https://github.com/kubernetes-client/gen/pull/91)
Expand Down
2 changes: 2 additions & 0 deletions OWNERS
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# See the OWNERS docs at https://go.k8s.io/owners

approvers:
- mbohlool
- caesarxuchao
Expand Down
2 changes: 1 addition & 1 deletion examples/create_deployment.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ def main():
config.load_kube_config()

with open(path.join(path.dirname(__file__), "nginx-deployment.yaml")) as f:
dep = yaml.load(f)
dep = yaml.safe_load(f)
k8s_beta = client.ExtensionsV1beta1Api()
resp = k8s_beta.create_namespaced_deployment(
body=dep, namespace="default")
Expand Down
2 changes: 1 addition & 1 deletion kubernetes/base
Open in desktop
Submodule base updated 23 files
+1 −0 .travis.yml
+2 −0 config/__init__.py
+2 −0 config/config_exception.py
+2 −0 config/dateutil.py
+2 −0 config/dateutil_test.py
+2 −0 config/exec_provider.py
+2 −0 config/exec_provider_test.py
+2 −0 config/incluster_config.py
+2 −0 config/incluster_config_test.py
+11 −2 config/kube_config.py
+8 −3 config/kube_config_test.py
+197 −0 hack/boilerplate/boilerplate.py
+15 −0 hack/boilerplate/boilerplate.py.txt
+13 −0 hack/boilerplate/boilerplate.sh.txt
+35 −0 hack/verify-boilerplate.sh
+1 −2 run_tox.sh
+2 −0 stream/__init__.py
+12 −8 stream/stream.py
+12 −8 stream/ws_client.py
+3 −1 stream/ws_client_test.py
+2 −0 watch/__init__.py
+4 −0 watch/watch.py
+74 −1 watch/watch_test.py
2 changes: 1 addition & 1 deletion kubernetes/e2e_test/test_extensions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ def test_create_deployment(self):
- containerPort: 80
'''
resp = api.create_namespaced_deployment(
body=yaml.load(deployment % name),
body=yaml.safe_load(deployment % name),
namespace="default")
resp = api.read_namespaced_deployment(name, 'default')
self.assertIsNotNone(resp)
Expand Down
1 change: 0 additions & 1 deletion requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,3 @@ ipaddress>=1.0.17;python_version=="2.7" # PSF
websocket-client>=0.32.0,!=0.40.0,!=0.41.*,!=0.42.* # LGPLv2+
requests # Apache-2.0
requests-oauthlib # ISC
adal>=1.0.2 # MIT
4 changes: 3 additions & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,9 @@
# prerequisite: setuptools
# http://pypi.python.org/pypi/setuptools

EXTRAS = {}
EXTRAS = {
'adal': ['adal>=1.0.2']
}
REQUIRES = []
with open('requirements.txt') as f:
for line in f:
Expand Down