Merge pull request kubernetes-client#84 from jonschoning/83_json_mime_types

re-include mimetypes for json patch

Author: k8s-ci-robot

kubernetes-client/kubernetes-client.cabal

@@ -7,7 +7,7 @@ cabal-version: 1.12
 -- hash: 114671d4f1b4c78c3a32487c9b8589f61d433f2a32488b3ed9e4372614f3972b
 
 name:           kubernetes-client
-version:        0.3.2.0
+version:        0.3.2.1
 synopsis:       Client library for Kubernetes
 description:    Client library for interacting with a Kubernetes cluster.
                 .
@@ -62,7 +62,7 @@ library
     , http-client-tls >=0.3
     , jose-jwt >=0.8
     , jsonpath >=0.1 && <0.3
-    , kubernetes-client-core ==0.3.1.0
+    , kubernetes-client-core ==0.3.2.1
     , microlens >=0.4 && <0.5
     , mtl >=2.2
     , oidc-client >=0.4
@@ -107,7 +107,7 @@ test-suite example
     , jose-jwt >=0.8
     , jsonpath >=0.1 && <0.3
     , kubernetes-client
-    , kubernetes-client-core ==0.3.1.0
+    , kubernetes-client-core ==0.3.2.1
     , microlens >=0.4 && <0.5
     , mtl >=2.2
     , oidc-client >=0.4
@@ -160,7 +160,7 @@ test-suite spec
     , jose-jwt >=0.8
     , jsonpath >=0.1 && <0.3
     , kubernetes-client
-    , kubernetes-client-core ==0.3.1.0
+    , kubernetes-client-core ==0.3.2.1
     , microlens >=0.4 && <0.5
     , mtl >=2.2
     , oidc-client >=0.4

kubernetes/.openapi-generator/COMMIT

@@ -1,2 +1,2 @@
-Requested Commit: 44f5f2bdd8ef56430c4b5d562226e4e6ba87881f
-Actual Commit: 44f5f2bdd8ef56430c4b5d562226e4e6ba87881f
+Requested Commit: 4526ca2610e4c3812521ea226f421664435c9053
+Actual Commit: 4526ca2610e4c3812521ea226f421664435c9053

kubernetes/.openapi-generator/VERSION

@@ -1 +1 @@
-5.0.0-SNAPSHOT
+5.0.1-SNAPSHOT

kubernetes/kubernetes-client-core.cabal

@@ -1,5 +1,5 @@
 name:           kubernetes-client-core
-version:        0.3.1.0
+version:        0.3.2.1
 synopsis:       Auto-generated kubernetes-client-core API Client
 description:    .
                 Client library for calling the Kubernetes API based on http-client.

kubernetes/lib/Kubernetes/OpenAPI/MimeTypes.hs

@@ -220,6 +220,8 @@ data MimeJsonPatchjson = MimeJsonPatchjson deriving (P.Typeable)
 -- | @application/json-patch+json@
 instance MimeType MimeJsonPatchjson where
   mimeType _ = Just $ P.fromString "application/json-patch+json"
+instance A.ToJSON a => MimeRender MimeJsonPatchjson a where mimeRender _ = A.encode
+instance A.FromJSON a => MimeUnrender MimeJsonPatchjson a where mimeUnrender _ = A.eitherDecode
 -- instance MimeRender MimeJsonPatchjson T.Text where mimeRender _ = undefined
 -- instance MimeUnrender MimeJsonPatchjson T.Text where mimeUnrender _ = undefined
 
@@ -242,6 +244,8 @@ data MimeMergePatchjson = MimeMergePatchjson deriving (P.Typeable)
 -- | @application/merge-patch+json@
 instance MimeType MimeMergePatchjson where
   mimeType _ = Just $ P.fromString "application/merge-patch+json"
+instance A.ToJSON a => MimeRender MimeMergePatchjson a where mimeRender _ = A.encode
+instance A.FromJSON a => MimeUnrender MimeMergePatchjson a where mimeUnrender _ = A.eitherDecode
 -- instance MimeRender MimeMergePatchjson T.Text where mimeRender _ = undefined
 -- instance MimeUnrender MimeMergePatchjson T.Text where mimeUnrender _ = undefined
 
@@ -252,6 +256,8 @@ data MimeStrategicMergePatchjson = MimeStrategicMergePatchjson deriving (P.Typea
 -- | @application/strategic-merge-patch+json@
 instance MimeType MimeStrategicMergePatchjson where
   mimeType _ = Just $ P.fromString "application/strategic-merge-patch+json"
+instance A.ToJSON a => MimeRender MimeStrategicMergePatchjson a where mimeRender _ = A.encode
+instance A.FromJSON a => MimeUnrender MimeStrategicMergePatchjson a where mimeUnrender _ = A.eitherDecode
 -- instance MimeRender MimeStrategicMergePatchjson T.Text where mimeRender _ = undefined
 -- instance MimeUnrender MimeStrategicMergePatchjson T.Text where mimeUnrender _ = undefined
 

kubernetes/openapi.yaml

@@ -324402,3 +324402,4 @@ components:
       in: header
       name: authorization
       type: apiKey
+x-original-swagger-version: "2.0"

settings

@@ -26,4 +26,4 @@ export PACKAGE_NAME="kubernetes"
 
 export USERNAME="kubernetes"
 
-OPENAPI_GENERATOR_COMMIT=44f5f2bdd8ef56430c4b5d562226e4e6ba87881f
+OPENAPI_GENERATOR_COMMIT=4526ca2610e4c3812521ea226f421664435c9053