Skip to content

Commit 9774afc

Browse files
authored
Merge pull request #75 from jonschoning/update-openapigenerator-and-regen
update openapigenerator and regen
2 parents 1820c33 + 425798b commit 9774afc

File tree

88 files changed

+3872
-5571
lines changed

Some content is hidden

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

88 files changed

+3872
-5571
lines changed

kubernetes-client/package.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ dependencies:
4949
- http-client >=0.5 && <0.7
5050
- http-client-tls >=0.3
5151
- jose-jwt >=0.8
52-
- kubernetes-client-core ==0.2.0.0
52+
- kubernetes-client-core ==0.3.0.0
5353
- microlens >=0.4 && <0.5
5454
- mtl >=2.2
5555
- oidc-client >=0.4

kubernetes/.openapi-generator/COMMIT

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
Requested Commit: a979fd8e13c86431831b0c769ba7b484e744afa5
2-
Actual Commit: a979fd8e13c86431831b0c769ba7b484e744afa5
1+
Requested Commit: 7bb8a8d9ff346823b7451f6ca57602be9dd9c938
2+
Actual Commit: 7bb8a8d9ff346823b7451f6ca57602be9dd9c938

kubernetes/.openapi-generator/FILES

Lines changed: 89 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,89 @@
1+
.gitignore
2+
.travis.yml
3+
Setup.hs
4+
git_push.sh
5+
kubernetes-client-core.cabal
6+
lib/Kubernetes/OpenAPI.hs
7+
lib/Kubernetes/OpenAPI/API/Admissionregistration.hs
8+
lib/Kubernetes/OpenAPI/API/AdmissionregistrationV1.hs
9+
lib/Kubernetes/OpenAPI/API/AdmissionregistrationV1beta1.hs
10+
lib/Kubernetes/OpenAPI/API/Apiextensions.hs
11+
lib/Kubernetes/OpenAPI/API/ApiextensionsV1.hs
12+
lib/Kubernetes/OpenAPI/API/ApiextensionsV1beta1.hs
13+
lib/Kubernetes/OpenAPI/API/Apiregistration.hs
14+
lib/Kubernetes/OpenAPI/API/ApiregistrationV1.hs
15+
lib/Kubernetes/OpenAPI/API/ApiregistrationV1beta1.hs
16+
lib/Kubernetes/OpenAPI/API/Apis.hs
17+
lib/Kubernetes/OpenAPI/API/Apps.hs
18+
lib/Kubernetes/OpenAPI/API/AppsV1.hs
19+
lib/Kubernetes/OpenAPI/API/AppsV1beta1.hs
20+
lib/Kubernetes/OpenAPI/API/AppsV1beta2.hs
21+
lib/Kubernetes/OpenAPI/API/Auditregistration.hs
22+
lib/Kubernetes/OpenAPI/API/AuditregistrationV1alpha1.hs
23+
lib/Kubernetes/OpenAPI/API/Authentication.hs
24+
lib/Kubernetes/OpenAPI/API/AuthenticationV1.hs
25+
lib/Kubernetes/OpenAPI/API/AuthenticationV1beta1.hs
26+
lib/Kubernetes/OpenAPI/API/Authorization.hs
27+
lib/Kubernetes/OpenAPI/API/AuthorizationV1.hs
28+
lib/Kubernetes/OpenAPI/API/AuthorizationV1beta1.hs
29+
lib/Kubernetes/OpenAPI/API/Autoscaling.hs
30+
lib/Kubernetes/OpenAPI/API/AutoscalingV1.hs
31+
lib/Kubernetes/OpenAPI/API/AutoscalingV2beta1.hs
32+
lib/Kubernetes/OpenAPI/API/AutoscalingV2beta2.hs
33+
lib/Kubernetes/OpenAPI/API/Batch.hs
34+
lib/Kubernetes/OpenAPI/API/BatchV1.hs
35+
lib/Kubernetes/OpenAPI/API/BatchV1beta1.hs
36+
lib/Kubernetes/OpenAPI/API/BatchV2alpha1.hs
37+
lib/Kubernetes/OpenAPI/API/Certificates.hs
38+
lib/Kubernetes/OpenAPI/API/CertificatesV1beta1.hs
39+
lib/Kubernetes/OpenAPI/API/Coordination.hs
40+
lib/Kubernetes/OpenAPI/API/CoordinationV1.hs
41+
lib/Kubernetes/OpenAPI/API/CoordinationV1beta1.hs
42+
lib/Kubernetes/OpenAPI/API/Core.hs
43+
lib/Kubernetes/OpenAPI/API/CoreV1.hs
44+
lib/Kubernetes/OpenAPI/API/CustomObjects.hs
45+
lib/Kubernetes/OpenAPI/API/Discovery.hs
46+
lib/Kubernetes/OpenAPI/API/DiscoveryV1alpha1.hs
47+
lib/Kubernetes/OpenAPI/API/Events.hs
48+
lib/Kubernetes/OpenAPI/API/EventsV1beta1.hs
49+
lib/Kubernetes/OpenAPI/API/Extensions.hs
50+
lib/Kubernetes/OpenAPI/API/ExtensionsV1beta1.hs
51+
lib/Kubernetes/OpenAPI/API/Logs.hs
52+
lib/Kubernetes/OpenAPI/API/Networking.hs
53+
lib/Kubernetes/OpenAPI/API/NetworkingV1.hs
54+
lib/Kubernetes/OpenAPI/API/NetworkingV1beta1.hs
55+
lib/Kubernetes/OpenAPI/API/Node.hs
56+
lib/Kubernetes/OpenAPI/API/NodeV1alpha1.hs
57+
lib/Kubernetes/OpenAPI/API/NodeV1beta1.hs
58+
lib/Kubernetes/OpenAPI/API/Policy.hs
59+
lib/Kubernetes/OpenAPI/API/PolicyV1beta1.hs
60+
lib/Kubernetes/OpenAPI/API/RbacAuthorization.hs
61+
lib/Kubernetes/OpenAPI/API/RbacAuthorizationV1.hs
62+
lib/Kubernetes/OpenAPI/API/RbacAuthorizationV1alpha1.hs
63+
lib/Kubernetes/OpenAPI/API/RbacAuthorizationV1beta1.hs
64+
lib/Kubernetes/OpenAPI/API/Scheduling.hs
65+
lib/Kubernetes/OpenAPI/API/SchedulingV1.hs
66+
lib/Kubernetes/OpenAPI/API/SchedulingV1alpha1.hs
67+
lib/Kubernetes/OpenAPI/API/SchedulingV1beta1.hs
68+
lib/Kubernetes/OpenAPI/API/Settings.hs
69+
lib/Kubernetes/OpenAPI/API/SettingsV1alpha1.hs
70+
lib/Kubernetes/OpenAPI/API/Storage.hs
71+
lib/Kubernetes/OpenAPI/API/StorageV1.hs
72+
lib/Kubernetes/OpenAPI/API/StorageV1alpha1.hs
73+
lib/Kubernetes/OpenAPI/API/StorageV1beta1.hs
74+
lib/Kubernetes/OpenAPI/API/Version.hs
75+
lib/Kubernetes/OpenAPI/Client.hs
76+
lib/Kubernetes/OpenAPI/Core.hs
77+
lib/Kubernetes/OpenAPI/ImportMappings.hs
78+
lib/Kubernetes/OpenAPI/Logging.hs
79+
lib/Kubernetes/OpenAPI/LoggingKatip.hs
80+
lib/Kubernetes/OpenAPI/LoggingMonadLogger.hs
81+
lib/Kubernetes/OpenAPI/MimeTypes.hs
82+
lib/Kubernetes/OpenAPI/Model.hs
83+
lib/Kubernetes/OpenAPI/ModelLens.hs
84+
openapi.yaml
85+
stack.yaml
86+
tests/ApproxEq.hs
87+
tests/Instances.hs
88+
tests/PropMime.hs
89+
tests/Test.hs

kubernetes/.openapi-generator/VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4.2.0-SNAPSHOT
1+
5.0.0-SNAPSHOT
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
7343a558c44ee5251d1465500e55fbc88db17c0462e5c29dc0cb7f64f5848a07
1+
5510757beffc3408a91c54ed0a18ba162f047ff7a7943b5aaa2f2012b4b00da3

kubernetes/kubernetes-client-core.cabal

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: kubernetes-client-core
2-
version: 0.2.0.0
2+
version: 0.3.0.0
33
synopsis: Auto-generated kubernetes-client-core API Client
44
description: .
55
Client library for calling the Kubernetes API based on http-client.
@@ -8,7 +8,7 @@ description: .
88
.
99
base path: http://localhost
1010
.
11-
Kubernetes API version: v1.16.2
11+
Kubernetes API version: release-1.16
1212
.
1313
OpenAPI version: 3.0.1
1414
.
@@ -51,11 +51,11 @@ library
5151
, iso8601-time >=0.1.3 && <0.2.0
5252
, microlens >= 0.4.3 && <0.5
5353
, mtl >=2.2.1
54-
, network >=2.6.2 && <2.9
54+
, network >=2.6.2 && <3.9
5555
, random >=1.1
5656
, safe-exceptions <0.2
5757
, text >=0.11 && <1.3
58-
, time >=1.5 && <1.10
58+
, time >=1.5
5959
, transformers >=0.4.0.0
6060
, unordered-containers
6161
, vector >=0.10.9 && <0.13

kubernetes/lib/Kubernetes/OpenAPI.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
55
66
OpenAPI Version: 3.0.1
7-
Kubernetes API version: v1.16.2
7+
Kubernetes API version: release-1.16
88
Generated by OpenAPI Generator (https://openapi-generator.tech)
99
-}
1010

kubernetes/lib/Kubernetes/OpenAPI/API/Admissionregistration.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
55
66
OpenAPI Version: 3.0.1
7-
Kubernetes API version: v1.16.2
7+
Kubernetes API version: release-1.16
88
Generated by OpenAPI Generator (https://openapi-generator.tech)
99
-}
1010

kubernetes/lib/Kubernetes/OpenAPI/API/AdmissionregistrationV1.hs

Lines changed: 1 addition & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
55
66
OpenAPI Version: 3.0.1
7-
Kubernetes API version: v1.16.2
7+
Kubernetes API version: release-1.16
88
Generated by OpenAPI Generator (https://openapi-generator.tech)
99
-}
1010

@@ -178,11 +178,6 @@ instance HasOptionalParam DeleteCollectionMutatingWebhookConfiguration Pretty wh
178178
applyOptionalParam req (Pretty xs) =
179179
req `setQuery` toQuery ("pretty", Just xs)
180180

181-
-- | /Optional Param/ "allowWatchBookmarks" - allowWatchBookmarks requests watch events with type \"BOOKMARK\". Servers that do not implement bookmarks may ignore this flag and bookmarks are sent at the server's discretion. Clients should not assume bookmarks are returned at any specific interval, nor may they assume the server will send any BOOKMARK event during a session. If this is not a watch, this field is ignored. If the feature gate WatchBookmarks is not enabled in apiserver, this field is ignored. This field is beta.
182-
instance HasOptionalParam DeleteCollectionMutatingWebhookConfiguration AllowWatchBookmarks where
183-
applyOptionalParam req (AllowWatchBookmarks xs) =
184-
req `setQuery` toQuery ("allowWatchBookmarks", Just xs)
185-
186181
-- | /Optional Param/ "continue" - The continue option should be set when retrieving more results from the server. Since this value is server defined, clients may only use the continue value from a previous query result with identical query parameters (except for the value of continue) and the server may reject a continue value it does not recognize. If the specified continue value is no longer valid whether due to expiration (generally five to fifteen minutes) or a configuration change on the server, the server will respond with a 410 ResourceExpired error together with a continue token. If the client needs a consistent list, it must restart their list without the continue field. Otherwise, the client may send another list request with the token received with the 410 error, the server will respond with a list starting from the next key, but from the latest snapshot, which is inconsistent from the previous list results - objects that are created, modified, or deleted after the first list request will be included in the response, as long as their keys are after the \"next key\". This field is not supported when watch is true. Clients may start a watch from the last resourceVersion value returned by the server and not miss any modifications.
187182
instance HasOptionalParam DeleteCollectionMutatingWebhookConfiguration Continue where
188183
applyOptionalParam req (Continue xs) =
@@ -232,11 +227,6 @@ instance HasOptionalParam DeleteCollectionMutatingWebhookConfiguration ResourceV
232227
instance HasOptionalParam DeleteCollectionMutatingWebhookConfiguration TimeoutSeconds where
233228
applyOptionalParam req (TimeoutSeconds xs) =
234229
req `setQuery` toQuery ("timeoutSeconds", Just xs)
235-
236-
-- | /Optional Param/ "watch" - Watch for changes to the described resources and return them as a stream of add, update, and remove notifications. Specify resourceVersion.
237-
instance HasOptionalParam DeleteCollectionMutatingWebhookConfiguration Watch where
238-
applyOptionalParam req (Watch xs) =
239-
req `setQuery` toQuery ("watch", Just xs)
240230

241231
-- | @*/*@
242232
instance MimeType mtype => Consumes DeleteCollectionMutatingWebhookConfiguration mtype
@@ -274,11 +264,6 @@ instance HasOptionalParam DeleteCollectionValidatingWebhookConfiguration Pretty
274264
applyOptionalParam req (Pretty xs) =
275265
req `setQuery` toQuery ("pretty", Just xs)
276266

277-
-- | /Optional Param/ "allowWatchBookmarks" - allowWatchBookmarks requests watch events with type \"BOOKMARK\". Servers that do not implement bookmarks may ignore this flag and bookmarks are sent at the server's discretion. Clients should not assume bookmarks are returned at any specific interval, nor may they assume the server will send any BOOKMARK event during a session. If this is not a watch, this field is ignored. If the feature gate WatchBookmarks is not enabled in apiserver, this field is ignored. This field is beta.
278-
instance HasOptionalParam DeleteCollectionValidatingWebhookConfiguration AllowWatchBookmarks where
279-
applyOptionalParam req (AllowWatchBookmarks xs) =
280-
req `setQuery` toQuery ("allowWatchBookmarks", Just xs)
281-
282267
-- | /Optional Param/ "continue" - The continue option should be set when retrieving more results from the server. Since this value is server defined, clients may only use the continue value from a previous query result with identical query parameters (except for the value of continue) and the server may reject a continue value it does not recognize. If the specified continue value is no longer valid whether due to expiration (generally five to fifteen minutes) or a configuration change on the server, the server will respond with a 410 ResourceExpired error together with a continue token. If the client needs a consistent list, it must restart their list without the continue field. Otherwise, the client may send another list request with the token received with the 410 error, the server will respond with a list starting from the next key, but from the latest snapshot, which is inconsistent from the previous list results - objects that are created, modified, or deleted after the first list request will be included in the response, as long as their keys are after the \"next key\". This field is not supported when watch is true. Clients may start a watch from the last resourceVersion value returned by the server and not miss any modifications.
283268
instance HasOptionalParam DeleteCollectionValidatingWebhookConfiguration Continue where
284269
applyOptionalParam req (Continue xs) =
@@ -328,11 +313,6 @@ instance HasOptionalParam DeleteCollectionValidatingWebhookConfiguration Resourc
328313
instance HasOptionalParam DeleteCollectionValidatingWebhookConfiguration TimeoutSeconds where
329314
applyOptionalParam req (TimeoutSeconds xs) =
330315
req `setQuery` toQuery ("timeoutSeconds", Just xs)
331-
332-
-- | /Optional Param/ "watch" - Watch for changes to the described resources and return them as a stream of add, update, and remove notifications. Specify resourceVersion.
333-
instance HasOptionalParam DeleteCollectionValidatingWebhookConfiguration Watch where
334-
applyOptionalParam req (Watch xs) =
335-
req `setQuery` toQuery ("watch", Just xs)
336316

337317
-- | @*/*@
338318
instance MimeType mtype => Consumes DeleteCollectionValidatingWebhookConfiguration mtype

kubernetes/lib/Kubernetes/OpenAPI/API/AdmissionregistrationV1beta1.hs

Lines changed: 1 addition & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
55
66
OpenAPI Version: 3.0.1
7-
Kubernetes API version: v1.16.2
7+
Kubernetes API version: release-1.16
88
Generated by OpenAPI Generator (https://openapi-generator.tech)
99
-}
1010

@@ -178,11 +178,6 @@ instance HasOptionalParam DeleteCollectionMutatingWebhookConfiguration Pretty wh
178178
applyOptionalParam req (Pretty xs) =
179179
req `setQuery` toQuery ("pretty", Just xs)
180180

181-
-- | /Optional Param/ "allowWatchBookmarks" - allowWatchBookmarks requests watch events with type \"BOOKMARK\". Servers that do not implement bookmarks may ignore this flag and bookmarks are sent at the server's discretion. Clients should not assume bookmarks are returned at any specific interval, nor may they assume the server will send any BOOKMARK event during a session. If this is not a watch, this field is ignored. If the feature gate WatchBookmarks is not enabled in apiserver, this field is ignored. This field is beta.
182-
instance HasOptionalParam DeleteCollectionMutatingWebhookConfiguration AllowWatchBookmarks where
183-
applyOptionalParam req (AllowWatchBookmarks xs) =
184-
req `setQuery` toQuery ("allowWatchBookmarks", Just xs)
185-
186181
-- | /Optional Param/ "continue" - The continue option should be set when retrieving more results from the server. Since this value is server defined, clients may only use the continue value from a previous query result with identical query parameters (except for the value of continue) and the server may reject a continue value it does not recognize. If the specified continue value is no longer valid whether due to expiration (generally five to fifteen minutes) or a configuration change on the server, the server will respond with a 410 ResourceExpired error together with a continue token. If the client needs a consistent list, it must restart their list without the continue field. Otherwise, the client may send another list request with the token received with the 410 error, the server will respond with a list starting from the next key, but from the latest snapshot, which is inconsistent from the previous list results - objects that are created, modified, or deleted after the first list request will be included in the response, as long as their keys are after the \"next key\". This field is not supported when watch is true. Clients may start a watch from the last resourceVersion value returned by the server and not miss any modifications.
187182
instance HasOptionalParam DeleteCollectionMutatingWebhookConfiguration Continue where
188183
applyOptionalParam req (Continue xs) =
@@ -232,11 +227,6 @@ instance HasOptionalParam DeleteCollectionMutatingWebhookConfiguration ResourceV
232227
instance HasOptionalParam DeleteCollectionMutatingWebhookConfiguration TimeoutSeconds where
233228
applyOptionalParam req (TimeoutSeconds xs) =
234229
req `setQuery` toQuery ("timeoutSeconds", Just xs)
235-
236-
-- | /Optional Param/ "watch" - Watch for changes to the described resources and return them as a stream of add, update, and remove notifications. Specify resourceVersion.
237-
instance HasOptionalParam DeleteCollectionMutatingWebhookConfiguration Watch where
238-
applyOptionalParam req (Watch xs) =
239-
req `setQuery` toQuery ("watch", Just xs)
240230

241231
-- | @*/*@
242232
instance MimeType mtype => Consumes DeleteCollectionMutatingWebhookConfiguration mtype
@@ -274,11 +264,6 @@ instance HasOptionalParam DeleteCollectionValidatingWebhookConfiguration Pretty
274264
applyOptionalParam req (Pretty xs) =
275265
req `setQuery` toQuery ("pretty", Just xs)
276266

277-
-- | /Optional Param/ "allowWatchBookmarks" - allowWatchBookmarks requests watch events with type \"BOOKMARK\". Servers that do not implement bookmarks may ignore this flag and bookmarks are sent at the server's discretion. Clients should not assume bookmarks are returned at any specific interval, nor may they assume the server will send any BOOKMARK event during a session. If this is not a watch, this field is ignored. If the feature gate WatchBookmarks is not enabled in apiserver, this field is ignored. This field is beta.
278-
instance HasOptionalParam DeleteCollectionValidatingWebhookConfiguration AllowWatchBookmarks where
279-
applyOptionalParam req (AllowWatchBookmarks xs) =
280-
req `setQuery` toQuery ("allowWatchBookmarks", Just xs)
281-
282267
-- | /Optional Param/ "continue" - The continue option should be set when retrieving more results from the server. Since this value is server defined, clients may only use the continue value from a previous query result with identical query parameters (except for the value of continue) and the server may reject a continue value it does not recognize. If the specified continue value is no longer valid whether due to expiration (generally five to fifteen minutes) or a configuration change on the server, the server will respond with a 410 ResourceExpired error together with a continue token. If the client needs a consistent list, it must restart their list without the continue field. Otherwise, the client may send another list request with the token received with the 410 error, the server will respond with a list starting from the next key, but from the latest snapshot, which is inconsistent from the previous list results - objects that are created, modified, or deleted after the first list request will be included in the response, as long as their keys are after the \"next key\". This field is not supported when watch is true. Clients may start a watch from the last resourceVersion value returned by the server and not miss any modifications.
283268
instance HasOptionalParam DeleteCollectionValidatingWebhookConfiguration Continue where
284269
applyOptionalParam req (Continue xs) =
@@ -328,11 +313,6 @@ instance HasOptionalParam DeleteCollectionValidatingWebhookConfiguration Resourc
328313
instance HasOptionalParam DeleteCollectionValidatingWebhookConfiguration TimeoutSeconds where
329314
applyOptionalParam req (TimeoutSeconds xs) =
330315
req `setQuery` toQuery ("timeoutSeconds", Just xs)
331-
332-
-- | /Optional Param/ "watch" - Watch for changes to the described resources and return them as a stream of add, update, and remove notifications. Specify resourceVersion.
333-
instance HasOptionalParam DeleteCollectionValidatingWebhookConfiguration Watch where
334-
applyOptionalParam req (Watch xs) =
335-
req `setQuery` toQuery ("watch", Just xs)
336316

337317
-- | @*/*@
338318
instance MimeType mtype => Consumes DeleteCollectionValidatingWebhookConfiguration mtype

0 commit comments

Comments
 (0)