hotfix kubernetes-client#866: switch the order of content-type so JSO…

…N merge patch is used by default
roycaihw · Jul 19, 2019 · fd9dac3 · fd9dac3
1 parent ba8b9fa
commit fd9dac3
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/kubernetes/client/apis/custom_objects_api.py b/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']