Skip to content

Commit d66255f

Browse files
mbohloolmbohlool
authored
Merge pull request #11 from guoshimin/fix-mime
Regenerate the haskell client
2 parents b74dede + fd9374f commit d66255f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+148773
-145804
lines changed

‎kubernetes/.swagger-codegen/COMMIT

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
Requested Commit: 5b76151a874009605f5ac5d4e6dc1aaa389339ed
2-
Actual Commit: 5b76151a874009605f5ac5d4e6dc1aaa389339ed
1+
Requested Commit: 3930b5b0a109327b94baad0b8d1eaf25f11ee035
2+
Actual Commit: 3930b5b0a109327b94baad0b8d1eaf25f11ee035

‎kubernetes/.swagger-codegen/VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.3.0-SNAPSHOT
1+
2.4.0-SNAPSHOT

‎kubernetes/README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ These options allow some customization of the code generation process.
5858

5959
| OPTION | DESCRIPTION | DEFAULT | ACTUAL |
6060
| ------------------------------- | ----------------------------------------------------------------------------------------------------------------------------- | -------- | ------------------------------------- |
61+
| allowNonUniqueOperationIds | allow *different* API modules to contain the same operationId. Each API must be imported qualified | false | true |
6162
| allowFromJsonNulls | allow JSON Null during model decoding from JSON | true | true |
6263
| allowToJsonNulls | allow emitting JSON Null during model encoding to JSON | false | false |
6364
| dateFormat | format string used to parse/render a date | %Y-%m-%d | %Y-%m-%d |

‎kubernetes/kubernetes.cabal

Lines changed: 78 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ description: .
88
.
99
base path: https://localhost
1010
.
11-
Kubernetes API version: v1.9.1
11+
Kubernetes API version: v1.9.2
1212
.
1313
OpenAPI spec version: 2.0
1414
.
@@ -32,34 +32,85 @@ library
3232
lib
3333
ghc-options: -Wall -funbox-strict-fields
3434
build-depends:
35-
base >=4.7 && <5.0
36-
, transformers >=0.4.0.0
37-
, mtl >=2.2.1
38-
, unordered-containers
39-
, aeson >=1.0 && <2.0
40-
, bytestring >=0.10.0 && <0.11
35+
aeson >=1.0 && <2.0
36+
, base >=4.7 && <5.0
4137
, base64-bytestring >1.0 && <2.0
38+
, bytestring >=0.10.0 && <0.11
39+
, case-insensitive
4240
, containers >=0.5.0.0 && <0.6
43-
, http-types >=0.8 && <0.11
41+
, deepseq >= 1.4 && <1.6
42+
, exceptions >= 0.4
43+
, http-api-data >= 0.3.4 && <0.4
4444
, http-client >=0.5 && <0.6
4545
, http-client-tls
46-
, http-api-data >= 0.3.4 && <0.4
4746
, http-media >= 0.4 && < 0.8
48-
, text >=0.11 && <1.3
49-
, time >=1.5 && <1.9
47+
, http-types >=0.8 && <0.12
5048
, iso8601-time >=0.1.3 && <0.2.0
51-
, vector >=0.10.9 && <0.13
49+
, microlens >= 0.4.3 && <0.5
50+
, mtl >=2.2.1
5251
, network >=2.6.2 && <2.7
5352
, random >=1.1
54-
, exceptions >= 0.4
55-
, katip >=0.4 && < 0.6
5653
, safe-exceptions <0.2
57-
, case-insensitive
58-
, microlens >= 0.4.3 && <0.5
59-
, deepseq >= 1.4 && <1.6
54+
, text >=0.11 && <1.3
55+
, time >=1.5 && <1.9
56+
, transformers >=0.4.0.0
57+
, unordered-containers
58+
, vector >=0.10.9 && <0.13
59+
, katip >=0.4 && < 0.6
6060
exposed-modules:
6161
Kubernetes
62-
Kubernetes.API
62+
Kubernetes.API.Admissionregistration
63+
Kubernetes.API.AdmissionregistrationV1alpha1
64+
Kubernetes.API.AdmissionregistrationV1beta1
65+
Kubernetes.API.Apiextensions
66+
Kubernetes.API.ApiextensionsV1beta1
67+
Kubernetes.API.Apiregistration
68+
Kubernetes.API.ApiregistrationV1beta1
69+
Kubernetes.API.Apis
70+
Kubernetes.API.Apps
71+
Kubernetes.API.AppsV1
72+
Kubernetes.API.AppsV1beta1
73+
Kubernetes.API.AppsV1beta2
74+
Kubernetes.API.Authentication
75+
Kubernetes.API.AuthenticationV1
76+
Kubernetes.API.AuthenticationV1beta1
77+
Kubernetes.API.Authorization
78+
Kubernetes.API.AuthorizationV1
79+
Kubernetes.API.AuthorizationV1beta1
80+
Kubernetes.API.Autoscaling
81+
Kubernetes.API.AutoscalingV1
82+
Kubernetes.API.AutoscalingV2beta1
83+
Kubernetes.API.Batch
84+
Kubernetes.API.BatchV1
85+
Kubernetes.API.BatchV1beta1
86+
Kubernetes.API.BatchV2alpha1
87+
Kubernetes.API.Certificates
88+
Kubernetes.API.CertificatesV1beta1
89+
Kubernetes.API.Core
90+
Kubernetes.API.CoreV1
91+
Kubernetes.API.CustomObjects
92+
Kubernetes.API.Events
93+
Kubernetes.API.EventsV1beta1
94+
Kubernetes.API.Extensions
95+
Kubernetes.API.ExtensionsV1beta1
96+
Kubernetes.API.Logs
97+
Kubernetes.API.Networking
98+
Kubernetes.API.NetworkingV1
99+
Kubernetes.API.Policy
100+
Kubernetes.API.PolicyV1beta1
101+
Kubernetes.API.RbacAuthorization
102+
Kubernetes.API.RbacAuthorizationV1
103+
Kubernetes.API.RbacAuthorizationV1alpha1
104+
Kubernetes.API.RbacAuthorizationV1beta1
105+
Kubernetes.API.Scheduling
106+
Kubernetes.API.SchedulingV1alpha1
107+
Kubernetes.API.Settings
108+
Kubernetes.API.SettingsV1alpha1
109+
Kubernetes.API.Storage
110+
Kubernetes.API.StorageV1
111+
Kubernetes.API.StorageV1alpha1
112+
Kubernetes.API.StorageV1beta1
113+
Kubernetes.API.Version
63114
Kubernetes.Client
64115
Kubernetes.Core
65116
Kubernetes.Logging
@@ -77,21 +128,21 @@ test-suite tests
77128
tests
78129
ghc-options: -Wall -fno-warn-orphans
79130
build-depends:
80-
base >=4.7 && <5.0
81-
, transformers >=0.4.0.0
82-
, mtl >=2.2.1
83-
, unordered-containers
84-
, kubernetes
131+
kubernetes
132+
, QuickCheck
133+
, aeson
134+
, base >=4.7 && <5.0
85135
, bytestring >=0.10.0 && <0.11
86136
, containers
87137
, hspec >=1.8
138+
, iso8601-time
139+
, mtl >=2.2.1
140+
, semigroups
88141
, text
89142
, time
90-
, iso8601-time
91-
, aeson
143+
, transformers >=0.4.0.0
144+
, unordered-containers
92145
, vector
93-
, semigroups
94-
, QuickCheck
95146
other-modules:
96147
ApproxEq
97148
Instances

‎kubernetes/lib/Kubernetes.hs

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
55
66
OpenAPI spec version: 2.0
7-
Kubernetes API version: v1.9.1
7+
Kubernetes API version: v1.9.2
88
Generated by Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git)
99
-}
1010

@@ -13,19 +13,18 @@ Module : Kubernetes
1313
-}
1414

1515
module Kubernetes
16-
( module Kubernetes.API
17-
, module Kubernetes.Client
16+
( module Kubernetes.Client
1817
, module Kubernetes.Core
1918
, module Kubernetes.Logging
2019
, module Kubernetes.MimeTypes
2120
, module Kubernetes.Model
2221
, module Kubernetes.ModelLens
2322
) where
2423

25-
import Kubernetes.API
24+
2625
import Kubernetes.Client
2726
import Kubernetes.Core
2827
import Kubernetes.Logging
2928
import Kubernetes.MimeTypes
3029
import Kubernetes.Model
31-
import Kubernetes.ModelLens
30+
import Kubernetes.ModelLens

0 commit comments

Comments
 (0)