Merge pull request #752 from roycaihw/release-9.0

k8s-ci-robot · web-flow · commit 686d64cffbd3 · 2019-02-07T19:23:56.000-08:00
Manual cherrypick master branch changes to release-9.0
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -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)
diff --git a/OWNERS b/OWNERS
@@ -1,3 +1,5 @@
+# See the OWNERS docs at https://go.k8s.io/owners
+
 approvers:
   - mbohlool
   - caesarxuchao
diff --git a/examples/create_deployment.py b/examples/create_deployment.py
@@ -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")
diff --git a/kubernetes/base b/kubernetes/base
@@ -1 +1 @@
-Subproject commit 5c242ead602797ae870798882654f7a2a4edfe39
+Subproject commit 2d69e89dab7134186cbcdaf82381ab6295c6c394
diff --git a/kubernetes/e2e_test/test_extensions.py b/kubernetes/e2e_test/test_extensions.py
@@ -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)
diff --git a/requirements.txt b/requirements.txt
@@ -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
diff --git a/setup.py b/setup.py
@@ -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:

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+# See the OWNERS docs at https://go.k8s.io/owners`
	`2`	`+`
`1`	`3`	`approvers:`
`2`	`4`	`- mbohlool`
`3`	`5`	`- caesarxuchao`