Skip to content

Commit b93308f

Browse files
authored
Merge pull request #748 from fluxcd/controller-gen-v0.16.1
Update controller-gen to v0.16.1
2 parents 649188c + 14e5969 commit b93308f

File tree

2 files changed

+12
-38
lines changed

2 files changed

+12
-38
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ ifeq ($(shell uname -s),Linux)
4646
endif
4747

4848
# API (doc) generation utilities
49-
CONTROLLER_GEN_VERSION ?= v0.15.0
49+
CONTROLLER_GEN_VERSION ?= v0.16.1
5050
GEN_API_REF_DOCS_VERSION ?= e327d0730470cbd61b06300f81c5fcf91c23c113
5151

5252
# If gobin not set, create one on ./build and add to path.

config/crd/bases/image.toolkit.fluxcd.io_imageupdateautomations.yaml

Lines changed: 11 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.15.0
6+
controller-gen.kubebuilder.io/version: v0.16.1
77
name: imageupdateautomations.image.toolkit.fluxcd.io
88
spec:
99
group: image.toolkit.fluxcd.io
@@ -71,15 +71,13 @@ spec:
7171
description: |-
7272
Commit SHA to check out, takes precedence over all reference fields.
7373
74-
7574
This can be combined with Branch to shallow clone the branch, in which
7675
the commit is expected to exist.
7776
type: string
7877
name:
7978
description: |-
8079
Name of the reference to check out; takes precedence over Branch, Tag and SemVer.
8180
82-
8381
It must be a valid Git reference: https://git-scm.com/docs/git-check-ref-format#_description
8482
Examples: "refs/heads/main", "refs/tags/v0.1.0", "refs/pull/420/head", "refs/merge-requests/1/head"
8583
type: string
@@ -135,6 +133,8 @@ spec:
135133
required:
136134
- name
137135
type: object
136+
required:
137+
- secretRef
138138
type: object
139139
required:
140140
- author
@@ -242,16 +242,8 @@ spec:
242242
properties:
243243
conditions:
244244
items:
245-
description: "Condition contains details for one aspect of the current
246-
state of this API Resource.\n---\nThis struct is intended for
247-
direct use as an array at the field path .status.conditions. For
248-
example,\n\n\n\ttype FooStatus struct{\n\t // Represents the
249-
observations of a foo's current state.\n\t // Known .status.conditions.type
250-
are: \"Available\", \"Progressing\", and \"Degraded\"\n\t //
251-
+patchMergeKey=type\n\t // +patchStrategy=merge\n\t // +listType=map\n\t
252-
\ // +listMapKey=type\n\t Conditions []metav1.Condition `json:\"conditions,omitempty\"
253-
patchStrategy:\"merge\" patchMergeKey:\"type\" protobuf:\"bytes,1,rep,name=conditions\"`\n\n\n\t
254-
\ // other fields\n\t}"
245+
description: Condition contains details for one aspect of the current
246+
state of this API Resource.
255247
properties:
256248
lastTransitionTime:
257249
description: |-
@@ -292,12 +284,7 @@ spec:
292284
- Unknown
293285
type: string
294286
type:
295-
description: |-
296-
type of condition in CamelCase or in foo.example.com/CamelCase.
297-
---
298-
Many .condition.type values are consistent across resources like Available, but because arbitrary conditions can be
299-
useful (see .node.status.conditions), the ability to deconflict is important.
300-
The regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt)
287+
description: type of condition in CamelCase or in foo.example.com/CamelCase.
301288
maxLength: 316
302289
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])$
303290
type: string
@@ -395,15 +382,13 @@ spec:
395382
description: |-
396383
Commit SHA to check out, takes precedence over all reference fields.
397384
398-
399385
This can be combined with Branch to shallow clone the branch, in which
400386
the commit is expected to exist.
401387
type: string
402388
name:
403389
description: |-
404390
Name of the reference to check out; takes precedence over Branch, Tag and SemVer.
405391
406-
407392
It must be a valid Git reference: https://git-scm.com/docs/git-check-ref-format#_description
408393
Examples: "refs/heads/main", "refs/tags/v0.1.0", "refs/pull/420/head", "refs/merge-requests/1/head"
409394
type: string
@@ -459,6 +444,8 @@ spec:
459444
required:
460445
- name
461446
type: object
447+
required:
448+
- secretRef
462449
type: object
463450
required:
464451
- author
@@ -614,16 +601,8 @@ spec:
614601
properties:
615602
conditions:
616603
items:
617-
description: "Condition contains details for one aspect of the current
618-
state of this API Resource.\n---\nThis struct is intended for
619-
direct use as an array at the field path .status.conditions. For
620-
example,\n\n\n\ttype FooStatus struct{\n\t // Represents the
621-
observations of a foo's current state.\n\t // Known .status.conditions.type
622-
are: \"Available\", \"Progressing\", and \"Degraded\"\n\t //
623-
+patchMergeKey=type\n\t // +patchStrategy=merge\n\t // +listType=map\n\t
624-
\ // +listMapKey=type\n\t Conditions []metav1.Condition `json:\"conditions,omitempty\"
625-
patchStrategy:\"merge\" patchMergeKey:\"type\" protobuf:\"bytes,1,rep,name=conditions\"`\n\n\n\t
626-
\ // other fields\n\t}"
604+
description: Condition contains details for one aspect of the current
605+
state of this API Resource.
627606
properties:
628607
lastTransitionTime:
629608
description: |-
@@ -664,12 +643,7 @@ spec:
664643
- Unknown
665644
type: string
666645
type:
667-
description: |-
668-
type of condition in CamelCase or in foo.example.com/CamelCase.
669-
---
670-
Many .condition.type values are consistent across resources like Available, but because arbitrary conditions can be
671-
useful (see .node.status.conditions), the ability to deconflict is important.
672-
The regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt)
646+
description: type of condition in CamelCase or in foo.example.com/CamelCase.
673647
maxLength: 316
674648
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])$
675649
type: string

0 commit comments

Comments
 (0)