Merge pull request #887 from roycaihw/patch-10.0-cr-content-type

Fix custom object patch API content type in release-10.0 branch

Author: k8s-ci-robot

CHANGELOG.md

@@ -1,3 +1,7 @@
+# v10.0.1
+**Bug Fix:**
+- Fix content type regression in custom object patch API [kubernetes-client/python#866](https://github.com/kubernetes-client/python/issues/866)
+
 # v10.0.0
 **Bug Fix:**
 - Fix base64 padding for kube config [kubernetes-client/python-base#79](https://github.com/kubernetes-client/python-base/pull/79)

kubernetes/client/apis/custom_objects_api.py

@@ -1657,7 +1657,7 @@ def patch_cluster_custom_object_with_http_info(self, group, version, plural, nam
 
         # HTTP header `Content-Type`
         header_params['Content-Type'] = self.api_client.\
-            select_header_content_type(['application/json-patch+json', 'application/merge-patch+json'])
+            select_header_content_type(['application/merge-patch+json', 'application/json-patch+json'])
 
         # Authentication setting
         auth_settings = ['BearerToken']
@@ -1781,7 +1781,7 @@ def patch_cluster_custom_object_scale_with_http_info(self, group, version, plura
 
         # HTTP header `Content-Type`
         header_params['Content-Type'] = self.api_client.\
-            select_header_content_type(['application/json-patch+json', 'application/merge-patch+json'])
+            select_header_content_type(['application/merge-patch+json', 'application/json-patch+json'])
 
         # Authentication setting
         auth_settings = ['BearerToken']
@@ -1905,7 +1905,7 @@ def patch_cluster_custom_object_status_with_http_info(self, group, version, plur
 
         # HTTP header `Content-Type`
         header_params['Content-Type'] = self.api_client.\
-            select_header_content_type(['application/json-patch+json', 'application/merge-patch+json'])
+            select_header_content_type(['application/merge-patch+json', 'application/json-patch+json'])
 
         # Authentication setting
         auth_settings = ['BearerToken']
@@ -2036,7 +2036,7 @@ def patch_namespaced_custom_object_with_http_info(self, group, version, namespac
 
         # HTTP header `Content-Type`
         header_params['Content-Type'] = self.api_client.\
-            select_header_content_type(['application/json-patch+json', 'application/merge-patch+json'])
+            select_header_content_type(['application/merge-patch+json', 'application/json-patch+json'])
 
         # Authentication setting
         auth_settings = ['BearerToken']
@@ -2167,7 +2167,7 @@ def patch_namespaced_custom_object_scale_with_http_info(self, group, version, na
 
         # HTTP header `Content-Type`
         header_params['Content-Type'] = self.api_client.\
-            select_header_content_type(['application/json-patch+json', 'application/merge-patch+json'])
+            select_header_content_type(['application/merge-patch+json', 'application/json-patch+json'])
 
         # Authentication setting
         auth_settings = ['BearerToken']
@@ -2298,7 +2298,7 @@ def patch_namespaced_custom_object_status_with_http_info(self, group, version, n
 
         # HTTP header `Content-Type`
         header_params['Content-Type'] = self.api_client.\
-            select_header_content_type(['application/json-patch+json', 'application/merge-patch+json'])
+            select_header_content_type(['application/merge-patch+json', 'application/json-patch+json'])
 
         # Authentication setting
         auth_settings = ['BearerToken']