8000 Graduate TransportServer and GlobalConfiguration to v1 (#4574) · nginx/kubernetes-ingress@14673e9 · GitHub
[go: up one dir, main page]
Skip to content

Commit 14673e9

Browse files
shaun-nxshaun-nx
authored
Graduate TransportServer and GlobalConfiguration to v1 (#4574)
1 parent af4b47d commit 14673e9

File tree

89 files changed

+2438
-595
lines changed

Some content is hidden

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

89 files changed

+2438
-595
lines changed

‎config/crd/bases/k8s.nginx.org_globalconfigurations.yaml‎

Lines changed: 40 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ spec:
1616
singular: globalconfiguration
1717
scope: Namespaced
1818
versions:
19-
- name: v1alpha1
19+
- name: v1
2020
schema:
2121
openAPIV3Schema:
2222
description: GlobalConfiguration defines the GlobalConfiguration resource.
@@ -55,3 +55,42 @@ spec:
5555
type: object
5656
served: true
5757
storage: true
58+
- name: v1alpha1
59+
schema:
60+
openAPIV3Schema:
61+
description: GlobalConfiguration defines the GlobalConfiguration resource.
62+
properties:
63+
apiVersion:
64+
description: 'APIVersion defines the versioned schema of this representation
65+
of an object. Servers should convert recognized schemas to the latest
66+
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
67+
type: string
68+
kind:
69+
description: 'Kind is a string value representing the REST resource this
70+
B92 object represents. Servers may infer this from the endpoint the client
71+
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
72+
type: string
73+
metadata:
74+
type: object
75+
spec:
76+
description: GlobalConfigurationSpec is the spec of the GlobalConfiguration
77+
resource.
78+
properties:
79+
listeners:
80+
items:
81+
description: Listener defines a listener.
82+
properties:
83+
name:
84+
type: string
85+
port:
86+
type: integer
87+
protocol:
88+
type: string
89+
ssl:
90+
type: boolean
91+
type: object
92+
type: array
93+
type: object
94+
type: object
95+
served: true
96+
storage: false

‎config/crd/bases/k8s.nginx.org_transportservers.yaml‎

Lines changed: 157 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ spec:
2828
- jsonPath: .metadata.creationTimestamp
2929
name: Age
3030
type: date
31-
name: v1alpha1
31+
name: v1
3232
schema:
3333
openAPIV3Schema:
3434
description: TransportServer defines the TransportServer resource.
@@ -49,7 +49,7 @@ spec:
4949
description: TransportServerSpec is the spec of the TransportServer resource.
5050
properties:
5151
action:
52-
description: Action defines an action.
52+
description: TransportServerAction defines an action.
5353
properties:
5454
pass:
5555
type: string
@@ -77,7 +77,8 @@ spec:
7777
streamSnippets:
7878
type: string
7979
tls:
80-
description: TLS defines TLS configuration for a TransportServer.
80+
description: TransportServerTLS defines TransportServerTLS configuration
81+
for a TransportServer.
8182
properties:
8283
secret:
8384
type: string
@@ -100,13 +101,13 @@ spec:
100101
type: object
101102
upstreams:
102103
items:
103-
description: Upstream defines an upstream.
104+
description: TransportServerUpstream defines an upstream.
104105
properties:
105106
failTimeout:
106107
type: string
107108
healthCheck:
108-
description: HealthCheck defines the parameters for active Upstream
109-
HealthChecks.
109+
description: TransportServerHealthCheck defines the parameters
110+
for active Upstream HealthChecks.
110111
properties:
111112
enable:
112113
type: boolean
@@ -117,8 +118,8 @@ spec:
117118
jitter:
118119
type: string
119120
match:
120-
description: Match defines the parameters of a custom health
121-
check.
121+
description: TransportServerMatch defines the parameters
122+
of a custom health check.
122123
properties:
123124
expect:
124125
type: string
@@ -163,3 +164,151 @@ spec:
163164
storage: true
164165
subresources:
165166
status: {}
167+
- additionalPrinterColumns:
168+
- description: Current state of the TransportServer. If the resource has a valid
169+
status, it means it has been validated and accepted by the Ingress Controller.
170+
jsonPath: .status.state
171+
name: State
172+
type: string
173+
- jsonPath: .status.reason
174+
name: Reason
175+
type: string
176+
- jsonPath: .metadata.creationTimestamp
177+
name: Age
178+
type: date
179+
name: v1alpha1
180+
schema:
181+
openAPIV3Schema:
182+
description: TransportServer defines the TransportServer resource.
183+
properties:
184+
apiVersion:
185+
description: 'APIVersion defines the versioned schema of this representation
186+
of an object. Servers should convert recognized schemas to the latest
187+
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
188+
type: string
189+
kind:
190+
description: 'Kind is a string value representing the REST resource this
191+
object represents. Servers may infer this from the endpoint the client
192+
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
193+
type: string
194+
metadata:
195+
type: object
196+
spec:
197+
description: TransportServerSpec is the spec of the TransportServer resource.
198+
properties:
199+
action:
200+
description: TransportServerAction defines an action.
201+
properties:
202+
pass:
203+
type: string
204+
type: object
205+
host:
206+
type: string
207+
ingressClassName:
208+
type: string
209+
listener:
210+
description: TransportServerListener defines a listener for a TransportServer.
211+
properties:
212+
name:
213+
type: string
214+
protocol:
215+
type: string
216+
type: object
217+
serverSnippets:
218+
type: string
219+
sessionParameters:
220+
description: SessionParameters defines session parameters.
221+
properties:
222+
timeout:
223+
type: string
224+
type: object
225+
streamSnippets:
226+
type: string
227+
tls:
228+
description: TransportServerTLS defines TransportServerTLS configuration
229+
for a TransportServer.
230+
properties:
231+
secret:
232+
type: string
233+
type: object
234+
upstreamParameters:
235+
description: UpstreamParameters defines parameters for an upstream.
236+
properties:
237+
connectTimeout:
238+
type: string
239+
nextUpstream:
240+
type: boolean
241+
nextUpstreamTimeout:
242+
type: string
243+
nextUpstreamTries:
244+
type: integer
245+
udpRequests:
246+
type: integer
247+
udpResponses:
248+
type: integer
249+
type: object
250+
upstreams:
251+
items:
252+
description: TransportServerUpstream defines an upstream.
253+
properties:
254+
failTimeout:
255+
type: string
256+
healthCheck:
257+
description: TransportServerHealthCheck defines the parameters
258+
for active Upstream HealthChecks.
259+
properties:
260+
enable:
261+
type: boolean
262+
fails:
263+
type: integer
264+
interval:
265+
type: string
266+
jitter:
267+
type: string
268+
match:
269+
description: TransportServerMatch defines the parameters
270+
of a custom health check.
271+
properties:
272+
expect:
273+
type: string
274+
send:
275+
type: string
276+
type: object
277+
passes:
278+
type: integer
279+
port:
280+
type: integer
281+
timeout:
282+
type: string
283+
type: object
284+
loadBalancingMethod:
285+
type: string
286+
maxConns:
287+
type: integer
288+
maxFails:
289+
type: integer
290+
name:
291+
type: string
292+
port:
293+
type: integer
294+
service:
295+
type: string
296+
type: object
297+
type: array
298+
type: object
299+
status:
300+
description: TransportServerStatus defines the status for the TransportServer
301+
resource.
302+
properties:
303+
message:
304+
type: string
305+
reason:
306+
type: string
307+
state:
308+
type: string
309+
type: object
310+
type: object
311+
served: true
312+
storage: false
313+
subresources:
314+
status: {}

‎config/crd/bases/k8s.nginx.org_virtualservers.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,8 +105,8 @@ spec:
105105
routing.
106106
type: boolean
107107
listener:
108-
description: Listener references a custom http and/or https listener
109-
defined in GlobalConfiguration.
108+
description: VirtualServerListener references a custom http and/or
109+
https listener defined in GlobalConfiguration.
110110
properties:
111111
http:
112112
type: string

0 commit comments

Comments
 (0)
0