Skip to content

Commit 7d784e9

Browse files
stuartwdouglasstuartwdouglas
committed
Update controller-gen
1 parent 9acd938 commit 7d784e9

Some content is hidden

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

48 files changed

+830
-460
lines changed

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ endif
99

1010
# options for generating crds with controller-gen
1111
CONTROLLER_GEN=${GOBIN}/controller-gen
12-
CRD_OPTIONS ?= crd:trivialVersions=true,preserveUnknownFields=false
12+
CRD_OPTIONS ?= crd
1313

1414
.EXPORT_ALL_VARIABLES:
1515

‎deploy/crds/base/jvmbuildservice.io_artifactbuilds.yaml‎

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
1-
21
---
32
apiVersion: apiextensions.k8s.io/v1
43
kind: CustomResourceDefinition
54
metadata:
65
annotations:
7-
controller-gen.kubebuilder.io/version: v0.6.2
8-
creationTimestamp: null
6+
controller-gen.kubebuilder.io/version: v0.15.0
97
name: artifactbuilds.jvmbuildservice.io
108
spec:
119
group: jvmbuildservice.io
@@ -29,14 +27,19 @@ spec:
2927
description: ArtifactBuild TODO provide godoc description
3028
properties:
3129
apiVersion:
32-
description: 'APIVersion defines the versioned schema of this representation
33-
of an object. Servers should convert recognized schemas to the latest
34-
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
30+
description: |-
31+
APIVersion defines the versioned schema of this representation of an object.
32+
Servers should convert recognized schemas to the latest internal value, and
33+
may reject unrecognized values.
34+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
3535
type: string
3636
kind:
37-
description: 'Kind is a string value representing the REST resource this
38-
object represents. Servers may infer this from the endpoint the client
39-
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
37+
description: |-
38+
Kind is a string value representing the REST resource this object represents.
39+
Servers may infer this from the endpoint the client submits requests to.
40+
Cannot be updated.
41+
In CamelCase.
42+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
4043
type: string
4144
metadata:
4245
type: object
@@ -76,9 +79,3 @@ spec:
7679
storage: true
7780
subresources:
7881
status: {}
79-
status:
80-
acceptedNames:
81-
kind: ""
82-
plural: ""
83-
conditions: []
84-
storedVersions: []

‎deploy/crds/base/jvmbuildservice.io_dependencybuilds.yaml‎

Lines changed: 46 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
1-
21
---
32
apiVersion: apiextensions.k8s.io/v1
43
kind: CustomResourceDefinition
54
metadata:
65
annotations:
7-
controller-gen.kubebuilder.io/version: v0.6.2
8-
creationTimestamp: null
6+
controller-gen.kubebuilder.io/version: v0.15.0
97
name: dependencybuilds.jvmbuildservice.io
108
spec:
119
group: jvmbuildservice.io
@@ -35,14 +33,19 @@ spec:
3533
description: DependencyBuild TODO provide godoc description
3634
properties:
3735
apiVersion:
38-
description: 'APIVersion defines the versioned schema of this representation
39-
of an object. Servers should convert recognized schemas to the latest
40-
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
36+
description: |-
37+
APIVersion defines the versioned schema of this representation of an object.
38+
Servers should convert recognized schemas to the latest internal value, and
39+
may reject unrecognized values.
40+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
4141
type: string
4242
kind:
43-
description: 'Kind is a string value representing the REST resource this
44-
object represents. Servers may infer this from the endpoint the client
45-
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
43+
description: |-
44+
Kind is a string value representing the REST resource this object represents.
45+
Servers may infer this from the endpoint the client submits requests to.
46+
Cannot be updated.
47+
In CamelCase.
48+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
4649
type: string
4750
metadata:
4851
type: object
@@ -243,50 +246,48 @@ spec:
243246
format: int64
244247
type: integer
245248
conditions:
246-
description: 'Conditions for capturing generic status NOTE: inspecting
247-
the fabric8 Status class, it looked analogous to k8s Condition,
248-
and then I took the liberty of making it an array, given best practices
249-
in the k8s/ocp ecosystems'
249+
description: |-
250+
Conditions for capturing generic status
251+
NOTE: inspecting the fabric8 Status class, it looked analogous to k8s Condition,
252+
and then I took the liberty of making it an array, given best practices in the k8s/ocp ecosystems
250253
items:
251254
description: "Condition contains details for one aspect of the current
252-
state of this API Resource. --- This struct is intended for direct
253-
use as an array at the field path .status.conditions. For example,
254-
\n \ttype FooStatus struct{ \t // Represents the observations
255-
of a foo's current state. \t // Known .status.conditions.type
256-
are: \"Available\", \"Progressing\", and \"Degraded\" \t //
257-
+patchMergeKey=type \t // +patchStrategy=merge \t // +listType=map
258-
\t // +listMapKey=type \t Conditions []metav1.Condition
259-
`json:\"conditions,omitempty\" patchStrategy:\"merge\" patchMergeKey:\"type\"
260-
protobuf:\"bytes,1,rep,name=conditions\"` \n \t // other fields
261-
\t}"
255+
state of this API Resource.\n---\nThis struct is intended for
256+
direct use as an array at the field path .status.conditions. For
257+
example,\n\n\n\ttype FooStatus struct{\n\t // Represents the
258+
observations of a foo's current state.\n\t // Known .status.conditions.type
259+
are: \"Available\", \"Progressing\", and \"Degraded\"\n\t //
260+
+patchMergeKey=type\n\t // +patchStrategy=merge\n\t // +listType=map\n\t
261+
\ // +listMapKey=type\n\t Conditions []metav1.Condition `json:\"conditions,omitempty\"
262+
patchStrategy:\"merge\" patchMergeKey:\"type\" protobuf:\"bytes,1,rep,name=conditions\"`\n\n\n\t
263+
\ // other fields\n\t}"
262264
properties:
263265
lastTransitionTime:
264-
description: lastTransitionTime is the last time the condition
265-
transitioned from one status to another. This should be when
266-
the underlying condition changed. If that is not known, then
267-
using the time when the API field changed is acceptable.
266+
description: |-
267+
lastTransitionTime is the last time the condition transitioned from one status to another.
268+
This should be when the underlying condition changed. If that is not known, then using the time when the API field changed is acceptable.
268269
format: date-time
269270
type: string
270271
message:
271-
description: message is a human readable message indicating
272-
details about the transition. This may be an empty string.
272+
description: |-
273+
message is a human readable message indicating details about the transition.
274+
This may be an empty string.
273275
maxLength: 32768
274276
type: string
275277
observedGeneration:
276-
description: observedGeneration represents the .metadata.generation
277-
that the condition was set based upon. For instance, if .metadata.generation
278-
is currently 12, but the .status.conditions[x].observedGeneration
279-
is 9, the condition is out of date with respect to the current
280-
state of the instance.
278+
description: |-
279+
observedGeneration represents the .metadata.generation that the condition was set based upon.
280+
For instance, if .metadata.generation is currently 12, but the .status.conditions[x].observedGeneration is 9, the condition is out of date
281+
with respect to the current state of the instance.
281282
format: int64
282283
minimum: 0
283284
type: integer
284285
reason:
285-
description: reason contains a programmatic identifier indicating
286-
the reason for the condition's last transition. Producers
287-
of specific condition types may define expected values and
288-
meanings for this field, and whether the values are considered
289-
a guaranteed API. The value should be a CamelCase string.
286+
description: |-
287+
reason contains a programmatic identifier indicating the reason for the condition's last transition.
288+
Producers of specific condition types may define expected values and meanings for this field,
289+
and whether the values are considered a guaranteed API.
290+
The value should be a CamelCase string.
290291
This field may not be empty.
291292
maxLength: 1024
292293
minLength: 1
@@ -300,11 +301,12 @@ spec:
300301
- Unknown
301302
type: string
302303
type:
303-
description: type of condition in CamelCase or in foo.example.com/CamelCase.
304-
--- Many .condition.type values are consistent across resources
305-
like Available, but because arbitrary conditions can be useful
306-
(see .node.status.conditions), the ability to deconflict is
307-
important. The regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt)
304+
description: |-
305+
type of condition in CamelCase or in foo.example.com/CamelCase.
306+
---
307+
Many .condition.type values are consistent across resources like Available, but because arbitrary conditions can be
308+
useful (see .node.status.conditions), the ability to deconflict is important.
309+
The regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt)
308310
maxLength: 316
309311
pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$
310312
type: string
@@ -451,9 +453,3 @@ spec:
451453
storage: true
452454
subresources:
453455
status: {}
454-
status:
455-
acceptedNames:
456-
kind: ""
457-
plural: ""
458-
conditions: []
459-
storedVersions: []

‎deploy/crds/base/jvmbuildservice.io_jbsconfigs.yaml‎

Lines changed: 15 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
1-
21
---
32
apiVersion: apiextensions.k8s.io/v1
43
kind: CustomResourceDefinition
54
metadata:
65
annotations:
7-
controller-gen.kubebuilder.io/version: v0.6.2
8-
creationTimestamp: null
6+
controller-gen.kubebuilder.io/version: v0.15.0
97
name: jbsconfigs.jvmbuildservice.io
108
spec:
119
group: jvmbuildservice.io
@@ -26,14 +24,19 @@ spec:
2624
description: JBSConfig TODO provide godoc description
2725
properties:
2826
apiVersion:
29-
description: 'APIVersion defines the versioned schema of this representation
30-
of an object. Servers should convert recognized schemas to the latest
31-
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
27+
description: |-
28+
APIVersion defines the versioned schema of this representation of an object.
29+
Servers should convert recognized schemas to the latest internal value, and
30+
may reject unrecognized values.
31+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
3232
type: string
3333
kind:
34-
description: 'Kind is a string value representing the REST resource this
35-
object represents. Servers may infer this from the endpoint the client
36-
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
34+
description: |-
35+
Kind is a string value representing the REST resource this object represents.
36+
Servers may infer this from the endpoint the client submits requests to.
37+
Cannot be updated.
38+
In CamelCase.
39+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
3740
type: string
3841
metadata:
3942
type: object
@@ -169,9 +172,9 @@ spec:
169172
type: object
170173
type: array
171174
requireArtifactVerification:
172-
description: If this is true then the build will fail if artifact
173-
verification fails otherwise deploy will happen as normal, but a
174-
field will be set on the DependencyBuild
175+
description: |-
176+
If this is true then the build will fail if artifact verification fails
177+
otherwise deploy will happen as normal, but a field will be set on the DependencyBuild
175178
type: boolean
176179
sharedRegistries:
177180
items:
@@ -228,9 +231,3 @@ spec:
228231
storage: true
229232
subresources:
230233
status: {}
231-
status:
232-
acceptedNames:
233-
kind: ""
234-
plural: ""
235-
conditions: []
236-
storedVersions: []

‎deploy/crds/base/jvmbuildservice.io_jvmimagescans.yaml‎

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
1-
21
---
32
apiVersion: apiextensions.k8s.io/v1
43
kind: CustomResourceDefinition
54
metadata:
65
annotations:
7-
controller-gen.kubebuilder.io/version: v0.6.2
8-
creationTimestamp: null
6+
controller-gen.kubebuilder.io/version: v0.15.0
97
name: jvmimagescans.jvmbuildservice.io
108
spec:
119
group: jvmbuildservice.io
@@ -29,14 +27,19 @@ spec:
2927
description: JvmImageScan TODO provide godoc description
3028
properties:
3129
apiVersion:
32-
description: 'APIVersion defines the versioned schema of this representation
33-
of an object. Servers should convert recognized schemas to the latest
34-
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
30+
description: |-
31+
APIVersion defines the versioned schema of this representation of an object.
32+
Servers should convert recognized schemas to the latest internal value, and
33+
may reject unrecognized values.
34+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
3535
type: string
3636
kind:
37-
description: 'Kind is a string value representing the REST resource this
38-
object represents. Servers may infer this from the endpoint the client
39-
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
37+
description: |-
38+
Kind is a string value representing the REST resource this object represents.
39+
Servers may infer this from the endpoint the client submits requests to.
40+
Cannot be updated.
41+
In CamelCase.
42+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
4043
type: string
4144
metadata:
4245
type: object
@@ -74,9 +77,3 @@ spec:
7477
storage: true
7578
subresources:
7679
status: {}
77-
status:
78-
acceptedNames:
79-
kind: ""
80-
plural: ""
81-
conditions: []
82-
storedVersions: []

‎deploy/crds/base/jvmbuildservice.io_rebuiltartifacts.yaml‎

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
1-
21
---
32
apiVersion: apiextensions.k8s.io/v1
43
kind: CustomResourceDefinition
54
metadata:
65
annotations:
7-
controller-gen.kubebuilder.io/version: v0.6.2
8-
creationTimestamp: null
6+
controller-gen.kubebuilder.io/version: v0.15.0
97
name: rebuiltartifacts.jvmbuildservice.io
108
spec:
119
group: jvmbuildservice.io
@@ -27,14 +25,19 @@ spec:
2725
to S3 or a Container registry
2826
properties:
2927
apiVersion:
30-
description: 'APIVersion defines the versioned schema of this representation
31-
of an object. Servers should convert recognized schemas to the latest
32-
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
28+
description: |-
29+
APIVersion defines the versioned schema of this representation of an object.
30+
Servers should convert recognized schemas to the latest internal value, and
31+
may reject unrecognized values.
32+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
3333
type: string
3434
kind:
35-
description: 'Kind is a string value representing the REST resource this
36-
object represents. Servers may infer this from the endpoint the client
37-
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
35+
description: |-
36+
Kind is a string value representing the REST resource this object represents.
37+
Servers may infer this from the endpoint the client submits requests to.
38+
Cannot be updated.
39+
In CamelCase.
40+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
3841
type: string
3942
metadata:
4043
type: object
@@ -56,9 +59,3 @@ spec:
5659
served: true
5760
storage: true
5861
subresources: {}
59-
status:
60-
acceptedNames:
61-
kind: ""
62-
plural: ""
63-
conditions: []
64-
storedVersions: []

0 commit comments

Comments
 (0)