Merge branch 'master' of https://github.com/kubernetes-incubator/client-python

Author: DjangoPeng

Diff for: CHANGELOG.md

@@ -1,5 +1,8 @@
 # Master
 - Adding stream package to support calls like exec. The old way of calling them is deprecated. See [Troubleshooting](README.md#why-execattach-calls-doesnt-work)).
+- config.http_proxy_url is deprecated. use configuration.proxy instead.
+- Configuration is not a singleton object anymore. Please use Configuraion.set_default to change default configuration.
+- Configuration class does not support `ws_streaming_protocol` anymore. In ApiClient.set_default_header set `sec-websocket-protocol` to the preferred websocket protocol.
 
 # v3.0.0
 - Fix Operation names for subresources kubernetes/kubernetes#49357

Diff for: code-of-conduct.md

@@ -0,0 +1,5 @@
+## Kubernetes Community Code of Conduct
+
+Kubernetes follows the [CNCF Code of Conduct](https://github.com/cncf/foundation/blob/master/code-of-conduct.md).
+
+[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/code-of-conduct.md?pixel)]()

Diff for: examples/exec.py

@@ -1,13 +1,15 @@
 import time
 
 from kubernetes import config
-from kubernetes.client import configuration
+from kubernetes.client import Configuration
 from kubernetes.client.apis import core_v1_api
 from kubernetes.client.rest import ApiException
 from kubernetes.stream import stream
 
 config.load_kube_config()
-configuration.assert_hostname = False
+c = Configuration()
+c.assert_hostname = False
+Configuration.set_default(c)
 api = core_v1_api.CoreV1Api()
 name = 'busybox-test'
 

Diff for: kubernetes/.swagger-codegen-ignore

@@ -5,6 +5,3 @@ test-requirements.txt
 setup.py
 .travis.yml
 tox.ini
-client/api_client.py
-client/configuration.py
-client/rest.py

Diff for: kubernetes/.swagger-codegen/COMMIT

@@ -1,2 +1,2 @@
-Requested Commit: v2.2.2
-Actual Commit: ff209ada223dcc7f6c6afc59bb02ec96b85c7e39
+Requested Commit: d2b91073e1fc499fea67141ff4c17740d25f8e83
+Actual Commit: d2b91073e1fc499fea67141ff4c17740d25f8e83

Diff for: kubernetes/.swagger-codegen/VERSION

@@ -0,0 +1 @@
+2.3.0-SNAPSHOT

Diff for: kubernetes/README.md

@@ -14,7 +14,7 @@
 
 __project__ = 'kubernetes'
 # The version is auto-updated. Please do not edit.
-__version__ = "3.0.0-snapshot"
+__version__ = "4.0.0-snapshot"
 
 import kubernetes.client
 import kubernetes.config