Skip to content

Commit f6c4925

Browse files
LEDfanLEDfan
committed
Bump CRD to v1 and use apiextensions.k8s.io for CRD
1 parent 261acbb commit f6c4925

10 files changed

Lines changed: 790 additions & 342 deletions

File tree

‎docs/deployment/bases/clustered/operator/crd.yaml‎

Lines changed: 260 additions & 108 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
apiVersion: apiextensions.k8s.io/v1beta1
2+
apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
name: "shinyproxies.openanalytics.eu"
@@ -9,131 +9,283 @@ spec:
99
kind: "ShinyProxy"
1010
plural: "shinyproxies"
1111
scope: "Namespaced"
12-
version: "v1alpha1"
13-
subresources:
14-
status: { }
15-
validation:
16-
openAPIV3Schema:
17-
description: ShinyProxy
18-
type: object
19-
properties:
20-
apiVersion:
21-
description: 'APIVersion defines the versioned schema of this representation
22-
of an object. Servers should convert recognized schemas to the latest
23-
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#resources'
24-
type: string
25-
kind:
26-
description: 'Kind is a string value representing the REST resource this
27-
object represents. Servers may infer this from the endpoint the client
28-
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#types-kinds'
29-
type: string
30-
metadata:
12+
versions:
13+
- name: v1
14+
served: true
15+
storage: true
16+
schema:
17+
openAPIV3Schema:
18+
description: ShinyProxy
3119
type: object
3220
properties:
33-
name:
21+
apiVersion:
22+
description: 'APIVersion defines the versioned schema of this representation
23+
of an object. Servers should convert recognized schemas to the latest
24+
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#resources'
3425
type: string
35-
required:
36-
- name
37-
spec:
38-
description: Specification of the ShinyProxy (i.e. application.yml)
39-
type: object
40-
properties:
41-
proxy:
26+
kind:
27+
description: 'Kind is a string value representing the REST resource this
28+
object represents. Servers may infer this from the endpoint the client
29+
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#types-kinds'
30+
type: string
31+
spec:
32+
description: Specification of the ShinyProxy (i.e. application.yml)
4233
type: object
34+
x-kubernetes-preserve-unknown-fields: true
4335
properties:
44-
title:
45-
type: string
46-
logoUrl:
36+
proxy:
37+
type: object
38+
x-kubernetes-preserve-unknown-fields: true
39+
properties:
40+
title:
41+
type: string
42+
logoUrl:
43+
type: string
44+
landingPage:
45+
type: string
46+
heartbeatRate:
47+
type: integer
48+
heartbeatTimeout:
49+
type: integer
50+
port:
51+
type: integer
52+
bindAddress:
53+
type: string
54+
templatePath:
55+
type: string
56+
adminGroups:
57+
type: array
58+
items:
59+
type: string
60+
authentication:
61+
type: string
62+
enum:
63+
- ldap
64+
- kerberos
65+
- keycloak
66+
- openid
67+
- saml
68+
- social
69+
- simple
70+
- none
71+
containerWaitTime:
72+
type: integer
73+
hideNavbar:
74+
type: boolean
75+
specs:
76+
type: array
77+
items:
78+
type: object
79+
x-kubernetes-preserve-unknown-fields: true
80+
properties:
81+
id:
82+
type: string
83+
displayName:
84+
type: string
85+
containerCmd:
86+
type: array
87+
items:
88+
type: string
89+
containerImage:
90+
type: string
91+
containerPrivileged:
92+
type: boolean
93+
containerMemoryRequest:
94+
type: string
95+
containerMemoryLimit:
96+
type: string
97+
containerCpuRequest:
98+
type: string
99+
containerCpuLimit:
100+
type: string
101+
accessGroups:
102+
type: array
103+
items:
104+
type: string
105+
containerDns:
106+
type: string
107+
containerEnv:
108+
type: object
109+
x-kubernetes-preserve-unknown-fields: true
110+
containerMemory:
111+
type: string
112+
containerNetwork:
113+
type: string
114+
containerVolumes:
115+
type: array
116+
items:
117+
type: string
118+
kubernetesPodPatches:
119+
type: string
120+
required:
121+
- id
122+
kubernetesPodTemplateSpecPatches:
47123
type: string
48-
landingPage:
124+
image:
49125
type: string
50-
heartbeatRate:
51-
type: integer
52-
heartbeatTimeout:
53-
type: integer
54-
port:
55-
type: integer
56-
bindAddress:
126+
imagePullPolicy:
57127
type: string
58-
templatePath:
128+
fqdn:
59129
type: string
60-
adminGroups:
130+
appNamespaces:
61131
type: array
62-
authentication:
63-
type: string
64-
enum:
65-
- ldap
66-
- kerberos
67-
- keycloak
68-
- openid
69-
- saml
70-
- social
71-
- simple
72-
- none
73-
containerWaitTime:
74-
type: integer
75-
hideNavbar:
76-
type: boolean
77-
specs:
132+
items:
133+
type: string
134+
required:
135+
- proxy
136+
- fqdn
137+
status:
138+
description: ShinyProxyStatus defines the observed state of ShinyProxy
139+
type: object
140+
properties:
141+
instances:
78142
type: array
143+
items:
144+
type: object
145+
properties:
146+
hashOfSpec:
147+
type: string
148+
isLatestInstance:
149+
type: boolean
150+
subresources:
151+
status: {}
152+
- name: v1alpha1
153+
served: true
154+
storage: false
155+
schema:
156+
openAPIV3Schema:
157+
description: ShinyProxy
158+
type: object
159+
properties:
160+
apiVersion:
161+
description: 'APIVersion defines the versioned schema of this representation
162+
of an object. Servers should convert recognized schemas to the latest
163+
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#resources'
164+
type: string
165+
kind:
166+
description: 'Kind is a string value representing the REST resource this
167+
object represents. Servers may infer this from the endpoint the client
168+
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#types-kinds'
169+
type: string
170+
spec:
171+
description: Specification of the ShinyProxy (i.e. application.yml)
172+
type: object
173+
x-kubernetes-preserve-unknown-fields: true
174+
properties:
175+
proxy:
176+
type: object
177+
x-kubernetes-preserve-unknown-fields: true
79178
properties:
80-
id:
81-
type: string
82-
displayName:
83-
type: string
84-
containerCmd:
85-
type: array
86-
containerImage:
179+
title:
87180
type: string
88-
containerPrivileged:
89-
type: boolean
90-
containerMemoryRequest:
181+
logoUrl:
91182
type: string
92-
containerMemoryLimit:
183+
landingPage:
93184
type: string
94-
containerCpuRequest:
185+
heartbeatRate:
186+
type: integer
187+
heartbeatTimeout:
188+
type: integer
189+
port:
190+
type: integer
191+
bindAddress:
95192
type: string
96-
containerCpuLimit:
193+
templatePath:
97194
type: string
98-
accessGroups:
195+
adminGroups:
99196
type: array
100-
containerDns:
101-
type: string
102-
containerEnv:
103-
type: object
104-
containerMemory:
197+
items:
198+
type: string
199+
authentication:
105200
type: string
106-
containerNetwork:
107-
type: string
108-
containerVolumes:
201+
enum:
202+
- ldap
203+
- kerberos
204+
- keycloak
205+
- openid
206+
- saml
207+
- social
208+
- simple
209+
- none
210+
containerWaitTime:
211+
type: integer
212+
hideNavbar:
213+
type: boolean
214+
specs:
109215
type: array
110-
kubernetesPodPatches:
111-
type: string
112-
required:
113-
- id
114-
kubernetesPodTemplateSpecPatches:
115-
type: string
116-
image:
117-
type: string
118-
imagePullPolicy:
119-
type: string
120-
fqdn:
121-
type: string
122-
appNamespaces:
123-
type: array
124-
required:
125-
- proxy
126-
- fqdn
127-
status:
128-
description: ShinyProxyStatus defines the observed state of ShinyProxy
129-
type: object
130-
properties:
131-
instances:
132-
type: array
133-
items:
134-
type: object
135-
properties:
136-
hashOfSpec:
216+
items:
217+
type: object
218+
x-kubernetes-preserve-unknown-fields: true
219+
properties:
220+
id:
221+
type: string
222+
displayName:
223+
type: string
224+
containerCmd:
225+
type: array
226+
items:
227+
type: string
228+
containerImage:
229+
type: string
230+
containerPrivileged:
231+
type: boolean
232+
containerMemoryRequest:
233+
type: string
234+
containerMemoryLimit:
235+
type: string
236+
containerCpuRequest:
237+
type: string
238+
containerCpuLimit:
239+
type: string
240+
accessGroups:
241+
type: array
242+
items:
243+
type: string
244+
containerDns:
245+
type: string
246+
containerEnv:
247+
type: object
248+
x-kubernetes-preserve-unknown-fields: true
249+
containerMemory:
250+
type: string
251+
containerNetwork:
252+
type: string
253+
containerVolumes:
254+
type: array
255+
items:
256+
type: string
257+
kubernetesPodPatches:
258+
type: string
259+
required:
260+
- id
261+
kubernetesPodTemplateSpecPatches:
262+
type: string
263+
image:
264+
type: string
265+
imagePullPolicy:
266+
type: string
267+
fqdn:
268+
type: string
269+
appNamespaces:
270+
type: array
271+
items:
137272
type: string
138-
isLatestInstance:
139-
type: boolean
273+
required:
274+
- proxy
275+
- fqdn
276+
status:
277+
description: ShinyProxyStatus defines the observed state of ShinyProxy
278+
type: object
279+
properties:
280+
instances:
281+
type: array
282+
items:
283+
type: object
284+
properties:
285+
hashOfSpec:
286+
type: string
287+
isLatestInstance:
288+
type: boolean
289+
subresources:
290+
status: {}
291+

0 commit comments

Comments
 (0)