Merge pull request kubernetes-client#211 from mbohlool/automated-cherry-pick-of-#205-upstream-master

mbohlool · web-flow · commit 05d60fc4caa1 · 2017-05-03T17:25:22.000-07:00
Automated cherry pick of kubernetes-client#205
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,9 @@
 # v2.0.0
 - No changes. The same as `v2.0.0b1`.
 
+# v2.0.0b2
+- Bugfix: support RFC6902 'json-patch' operations #187
+
 # v1.0.1
 - Bugfix: urllib3 1.21 fails tests, Excluding version 1.21 from dependencies #197
 
diff --git a/kubernetes/client/rest.py b/kubernetes/client/rest.py
@@ -154,8 +154,8 @@ def request(self, method, url, query_params=None, headers=None,
                 if query_params:
                     url += '?' + urlencode(query_params)
                 if headers['Content-Type'] == 'application/json-patch+json':
-                    headers[
-                        'Content-Type'] = 'application/strategic-merge-patch+json'
+                    if not isinstance(body, list):
+                        headers['Content-Type'] = 'application/strategic-merge-patch+json'
                     request_body = None
                     if body:
                         request_body = json.dumps(body)
