Merge pull request kubernetes-client#205 from bsherman/2.0patch-fix

mbohlool · web-flow · commit ccc98096bfa3 · 2017-05-01T11:04:59.000-07:00
fix for kubernetes-client#187 failure when using RFC 6902 json-patch operation
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,6 @@
+# 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)
