Skip to content

Commit e084d0c

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request kubernetes-client#31 from guoshimin/newpackagename
new package name and module base for generated code
2 parents ed21529 + 1f4868f commit e084d0c

Some content is hidden

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

75 files changed

+4167
-1558
lines changed

‎kubernetes-client-helper/package.yaml

+1-4
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ library:
44
source-dirs: src
55
dependencies:
66
- base >=4.7 && <5.0
7-
- kubernetes == 0.1.0.0
7+
- kubernetes-openapi-client-gen == 0.1.0.0
88
- pem
99
- x509
1010
- tls
@@ -19,6 +19,3 @@ dependencies:
1919
- bytestring >=0.10.0 && <0.11
2020
- text >=0.11 && <1.3
2121
- safe-exceptions <0.2
22-
23-
24-

‎kubernetes-client-helper/src/Kubernetes/ClientHelper.hs

+10-10
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
module Kubernetes.ClientHelper where
44

5-
import qualified Kubernetes.Core as K
6-
import qualified Kubernetes.Model as K
5+
import qualified Kubernetes.OpenAPI.Core as K
6+
import qualified Kubernetes.OpenAPI.Model as K
77

88
import Control.Exception.Safe (Exception, MonadThrow, throwM)
99
import Control.Monad.IO.Class (MonadIO, liftIO)
@@ -32,23 +32,23 @@ import qualified Network.TLS.Extra as TLS
3232
import System.Environment (getEnv)
3333
import System.X509 (getSystemCertificateStore)
3434

35-
-- |Sets the master URI in the 'K.KubernetesConfig'.
35+
-- |Sets the master URI in the 'K.KubernetesClientConfig'.
3636
setMasterURI
3737
:: T.Text -- ^ Master URI
38-
-> K.KubernetesConfig
39-
-> K.KubernetesConfig
38+
-> K.KubernetesClientConfig
39+
-> K.KubernetesClientConfig
4040
setMasterURI server kcfg =
4141
kcfg { K.configHost = (LazyB.fromStrict . T.encodeUtf8) server }
4242

4343
-- |Disables the client-side auth methods validation. This is necessary if you are using client cert authentication.
44-
disableValidateAuthMethods :: K.KubernetesConfig -> K.KubernetesConfig
44+
disableValidateAuthMethods :: K.KubernetesClientConfig -> K.KubernetesClientConfig
4545
disableValidateAuthMethods kcfg = kcfg { K.configValidateAuthMethods = False }
4646

47-
-- |Configures the 'K.KubernetesConfig' to use token authentication.
47+
-- |Configures the 'K.KubernetesClientConfig' to use token authentication.
4848
setTokenAuth
4949
:: T.Text -- ^Authentication token
50-
-> K.KubernetesConfig
51-
-> K.KubernetesConfig
50+
-> K.KubernetesClientConfig
51+
-> K.KubernetesClientConfig
5252
setTokenAuth token kcfg = kcfg
5353
{ K.configAuthMethods = [K.AnyAuthMethod (K.AuthApiKeyBearerToken $ "Bearer " <> token)]
5454
}
@@ -124,7 +124,7 @@ loadPEMCerts p = do
124124
serviceAccountDir :: FilePath
125125
serviceAccountDir = "/var/run/secrets/kubernetes.io/serviceaccount"
126126

127-
cluster :: (MonadIO m, MonadThrow m) => m (NH.Manager, K.KubernetesConfig)
127+
cluster :: (MonadIO m, MonadThrow m) => m (NH.Manager, K.KubernetesClientConfig)
128128
cluster = do
129129
caStore <- loadPEMCerts $ serviceAccountDir ++ "/ca.crt"
130130
defTlsParams <- liftIO defaultTLSClientParams

‎kubernetes-watch/package.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@ dependencies:
1010
- mtl >=2.2.1
1111
- streaming-bytestring >= 0.1.5 && < 0.2.0
1212
- text >=0.11 && <1.3
13-
- kubernetes == 0.1.0.0
13+
- kubernetes-openapi-client-gen == 0.1.0.0
1414

1515

‎kubernetes-watch/src/Kubernetes/Watch/Client.hs

+5-5
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ import Data.Aeson
1313
import qualified Data.ByteString as B
1414
import qualified Data.ByteString.Streaming.Char8 as Q
1515
import qualified Data.Text as T
16-
import Kubernetes.Core
17-
import Kubernetes.Client
18-
import Kubernetes.MimeTypes
19-
import Kubernetes.Model (Watch(..))
16+
import Kubernetes.OpenAPI.Core
17+
import Kubernetes.OpenAPI.Client
18+
import Kubernetes.OpenAPI.MimeTypes
19+
import Kubernetes.OpenAPI.Model (Watch(..))
2020
import Network.HTTP.Client
2121

2222
data WatchEvent a = WatchEvent
@@ -66,7 +66,7 @@ Launching 'dispatchWatch' with the above we get a stream of endpoints data:
6666
dispatchWatch ::
6767
(HasOptionalParam req Watch, MimeType accept, MimeType contentType) =>
6868
Manager
69-
-> KubernetesConfig
69+
-> KubernetesClientConfig
7070
-> KubernetesRequest req contentType resp accept
7171
-> (Q.ByteString IO () -> IO a)
7272
-> IO a

‎kubernetes/.swagger-codegen/COMMIT

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
Requested Commit: 3930b5b0a109327b94baad0b8d1eaf25f11ee035
2-
Actual Commit: 3930b5b0a109327b94baad0b8d1eaf25f11ee035
1+
Requested Commit: d0e2d7684dd3258233c3e4d838dcd7bf44055869
2+
Actual Commit: d0e2d7684dd3258233c3e4d838dcd7bf44055869

‎kubernetes/kubernetes-openapi-client-gen.cabal

+149
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,149 @@
1+
name: kubernetes-openapi-client-gen
2+
version: 0.1.0.0
3+
synopsis: Auto-generated kubernetes-openapi-client-gen API Client
4+
description: .
5+
Client library for calling the Kubernetes API based on http-client.
6+
.
7+
host:
8+
.
9+
base path: https://localhost
10+
.
11+
Kubernetes API version: v1.9.12
12+
.
13+
OpenAPI spec version: 2.0
14+
.
15+
OpenAPI-Specification: https://github.com/OAI/OpenAPI-Specification/blob/master/versions/2.0.md
16+
.
17+
category: Web
18+
homepage: https://github.com/kubernetes-client/haskell
19+
author: Auto Generated
20+
maintainer: Shimin Guo <[email protected]>
21+
license: Apache-2.0
22+
build-type: Simple
23+
cabal-version: >= 1.10
24+
25+
extra-source-files:
26+
README.md
27+
swagger.yaml
28+
29+
library
30+
hs-source-dirs:
31+
lib
32+
ghc-options: -Wall -funbox-strict-fields
33+
build-depends:
34+
aeson >=1.0 && <2.0
35+
, base >=4.7 && <5.0
36+
, base64-bytestring >1.0 && <2.0
37+
, bytestring >=0.10.0 && <0.11
38+
, case-insensitive
39+
, containers >=0.5.0.0 && <0.6
40+
, deepseq >= 1.4 && <1.6
41+
, exceptions >= 0.4
42+
, http-api-data >= 0.3.4 && <0.4
43+
, http-client >=0.5 && <0.6
44+
, http-client-tls
45+
, http-media >= 0.4 && < 0.8
46+
, http-types >=0.8 && <0.13
47+
, iso8601-time >=0.1.3 && <0.2.0
48+
, microlens >= 0.4.3 && <0.5
49+
, mtl >=2.2.1
50+
, network >=2.6.2 && <2.7
51+
, random >=1.1
52+
, safe-exceptions <0.2
53+
, text >=0.11 && <1.3
54+
, time >=1.5 && <1.10
55+
, transformers >=0.4.0.0
56+
, unordered-containers
57+
, vector >=0.10.9 && <0.13
58+
, katip >=0.4 && < 0.6
59+
other-modules:
60+
Paths_kubernetes_openapi_client_gen
61+
exposed-modules:
62+
Kubernetes.OpenAPI
63+
Kubernetes.OpenAPI.API.Admissionregistration
64+
Kubernetes.OpenAPI.API.AdmissionregistrationV1alpha1
65+
Kubernetes.OpenAPI.API.AdmissionregistrationV1beta1
66+
Kubernetes.OpenAPI.API.Apiextensions
67+
Kubernetes.OpenAPI.API.ApiextensionsV1beta1
68+
Kubernetes.OpenAPI.API.Apiregistration
69+
Kubernetes.OpenAPI.API.ApiregistrationV1beta1
70+
Kubernetes.OpenAPI.API.Apis
71+
Kubernetes.OpenAPI.API.Apps
72+
Kubernetes.OpenAPI.API.AppsV1
73+
Kubernetes.OpenAPI.API.AppsV1beta1
74+
Kubernetes.OpenAPI.API.AppsV1beta2
75+
Kubernetes.OpenAPI.API.Authentication
76+
Kubernetes.OpenAPI.API.AuthenticationV1
77+
Kubernetes.OpenAPI.API.AuthenticationV1beta1
78+
Kubernetes.OpenAPI.API.Authorization
79+
Kubernetes.OpenAPI.API.AuthorizationV1
80+
Kubernetes.OpenAPI.API.AuthorizationV1beta1
81+
Kubernetes.OpenAPI.API.Autoscaling
82+
Kubernetes.OpenAPI.API.AutoscalingV1
83+
Kubernetes.OpenAPI.API.AutoscalingV2beta1
84+
Kubernetes.OpenAPI.API.Batch
85+
Kubernetes.OpenAPI.API.BatchV1
86+
Kubernetes.OpenAPI.API.BatchV1beta1
87+
Kubernetes.OpenAPI.API.BatchV2alpha1
88+
Kubernetes.OpenAPI.API.Certificates
89+
Kubernetes.OpenAPI.API.CertificatesV1beta1
90+
Kubernetes.OpenAPI.API.Core
91+
Kubernetes.OpenAPI.API.CoreV1
92+
Kubernetes.OpenAPI.API.CustomObjects
93+
Kubernetes.OpenAPI.API.Events
94+
Kubernetes.OpenAPI.API.EventsV1beta1
95+
Kubernetes.OpenAPI.API.Extensions
96+
Kubernetes.OpenAPI.API.ExtensionsV1beta1
97+
Kubernetes.OpenAPI.API.Logs
98+
Kubernetes.OpenAPI.API.Networking
99+
Kubernetes.OpenAPI.API.NetworkingV1
100+
Kubernetes.OpenAPI.API.Policy
101+
Kubernetes.OpenAPI.API.PolicyV1beta1
102+
Kubernetes.OpenAPI.API.RbacAuthorization
103+
Kubernetes.OpenAPI.API.RbacAuthorizationV1
104+
Kubernetes.OpenAPI.API.RbacAuthorizationV1alpha1
105+
Kubernetes.OpenAPI.API.RbacAuthorizationV1beta1
106+
Kubernetes.OpenAPI.API.Scheduling
107+
Kubernetes.OpenAPI.API.SchedulingV1alpha1
108+
Kubernetes.OpenAPI.API.Settings
109+
Kubernetes.OpenAPI.API.SettingsV1alpha1
110+
Kubernetes.OpenAPI.API.Storage
111+
Kubernetes.OpenAPI.API.StorageV1
112+
Kubernetes.OpenAPI.API.StorageV1alpha1
113+
Kubernetes.OpenAPI.API.StorageV1beta1
114+
Kubernetes.OpenAPI.API.Version
115+
Kubernetes.OpenAPI.Client
116+
Kubernetes.OpenAPI.Core
117+
Kubernetes.OpenAPI.Logging
118+
Kubernetes.OpenAPI.MimeTypes
119+
Kubernetes.OpenAPI.Model
120+
Kubernetes.OpenAPI.ModelLens
121+
default-language: Haskell2010
122+
123+
test-suite tests
124+
type: exitcode-stdio-1.0
125+
main-is: Test.hs
126+
hs-source-dirs:
127+
tests
128+
ghc-options: -Wall -fno-warn-orphans
129+
build-depends:
130+
kubernetes-openapi-client-gen
131+
, QuickCheck
132+
, aeson
133+
, base >=4.7 && <5.0
134+
, bytestring >=0.10.0 && <0.11
135+
, containers
136+
, hspec >=1.8
137+
, iso8601-time
138+
, mtl >=2.2.1
139+
, semigroups
140+
, text
141+
, time
142+
, transformers >=0.4.0.0
143+
, unordered-containers
144+
, vector
145+
other-modules:
146+
ApproxEq
147+
Instances
148+
PropMime
149+
default-language: Haskell2010

0 commit comments

Comments
 (0)