Skip to content

Commit aabb41f

Browse files
authored
Merge pull request #1243 from fluxcd/controller-gen-v0.16.1
Update controller-gen to v0.16.1
2 parents c00854e + eedc8a7 commit aabb41f

File tree

2 files changed

+13
-50
lines changed

2 files changed

+13
-50
lines changed

Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ OCIREPO_CRD ?= config/crd/bases/ocirepositories.yaml
4444
SOURCE_CRD_VER=$(BUILD_DIR)/.src-crd-$(SOURCE_VER)
4545

4646
# API (doc) generation utilities
47-
CONTROLLER_GEN_VERSION ?= v0.15.0
47+
CONTROLLER_GEN_VERSION ?= v0.16.1
4848
GEN_API_REF_DOCS_VERSION ?= e327d0730470cbd61b06300f81c5fcf91c23c113
4949

5050
all: manager

config/crd/bases/kustomize.toolkit.fluxcd.io_kustomizations.yaml

+12-49
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: kustomizations.kustomize.toolkit.fluxcd.io
88
spec:
99
group: kustomize.toolkit.fluxcd.io
@@ -427,16 +427,8 @@ spec:
427427
properties:
428428
conditions:
429429
items:
430-
description: "Condition contains details for one aspect of the current
431-
state of this API Resource.\n---\nThis struct is intended for
432-
direct use as an array at the field path .status.conditions. For
433-
example,\n\n\n\ttype FooStatus struct{\n\t // Represents the
434-
observations of a foo's current state.\n\t // Known .status.conditions.type
435-
are: \"Available\", \"Progressing\", and \"Degraded\"\n\t //
436-
+patchMergeKey=type\n\t // +patchStrategy=merge\n\t // +listType=map\n\t
437-
\ // +listMapKey=type\n\t Conditions []metav1.Condition `json:\"conditions,omitempty\"
438-
patchStrategy:\"merge\" patchMergeKey:\"type\" protobuf:\"bytes,1,rep,name=conditions\"`\n\n\n\t
439-
\ // other fields\n\t}"
430+
description: Condition contains details for one aspect of the current
431+
state of this API Resource.
440432
properties:
441433
lastTransitionTime:
442434
description: |-
@@ -477,12 +469,7 @@ spec:
477469
- Unknown
478470
type: string
479471
type:
480-
description: |-
481-
type of condition in CamelCase or in foo.example.com/CamelCase.
482-
---
483-
Many .condition.type values are consistent across resources like Available, but because arbitrary conditions can be
484-
useful (see .node.status.conditions), the ability to deconflict is important.
485-
The regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt)
472+
description: type of condition in CamelCase or in foo.example.com/CamelCase.
486473
maxLength: 316
487474
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])$
488475
type: string
@@ -713,6 +700,8 @@ spec:
713700
required:
714701
- name
715702
type: object
703+
required:
704+
- secretRef
716705
type: object
717706
patches:
718707
description: |-
@@ -1005,16 +994,8 @@ spec:
1005994
properties:
1006995
conditions:
1007996
items:
1008-
description: "Condition contains details for one aspect of the current
1009-
state of this API Resource.\n---\nThis struct is intended for
1010-
direct use as an array at the field path .status.conditions. For
1011-
example,\n\n\n\ttype FooStatus struct{\n\t // Represents the
1012-
observations of a foo's current state.\n\t // Known .status.conditions.type
1013-
are: \"Available\", \"Progressing\", and \"Degraded\"\n\t //
1014-
+patchMergeKey=type\n\t // +patchStrategy=merge\n\t // +listType=map\n\t
1015-
\ // +listMapKey=type\n\t Conditions []metav1.Condition `json:\"conditions,omitempty\"
1016-
patchStrategy:\"merge\" patchMergeKey:\"type\" protobuf:\"bytes,1,rep,name=conditions\"`\n\n\n\t
1017-
\ // other fields\n\t}"
997+
description: Condition contains details for one aspect of the current
998+
state of this API Resource.
1018999
properties:
10191000
lastTransitionTime:
10201001
description: |-
@@ -1055,12 +1036,7 @@ spec:
10551036
- Unknown
10561037
type: string
10571038
type:
1058-
description: |-
1059-
type of condition in CamelCase or in foo.example.com/CamelCase.
1060-
---
1061-
Many .condition.type values are consistent across resources like Available, but because arbitrary conditions can be
1062-
useful (see .node.status.conditions), the ability to deconflict is important.
1063-
The regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt)
1039+
description: type of condition in CamelCase or in foo.example.com/CamelCase.
10641040
maxLength: 316
10651041
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])$
10661042
type: string
@@ -1633,16 +1609,8 @@ spec:
16331609
properties:
16341610
conditions:
16351611
items:
1636-
description: "Condition contains details for one aspect of the current
1637-
state of this API Resource.\n---\nThis struct is intended for
1638-
direct use as an array at the field path .status.conditions. For
1639-
example,\n\n\n\ttype FooStatus struct{\n\t // Represents the
1640-
observations of a foo's current state.\n\t // Known .status.conditions.type
1641-
are: \"Available\", \"Progressing\", and \"Degraded\"\n\t //
1642-
+patchMergeKey=type\n\t // +patchStrategy=merge\n\t // +listType=map\n\t
1643-
\ // +listMapKey=type\n\t Conditions []metav1.Condition `json:\"conditions,omitempty\"
1644-
patchStrategy:\"merge\" patchMergeKey:\"type\" protobuf:\"bytes,1,rep,name=conditions\"`\n\n\n\t
1645-
\ // other fields\n\t}"
1612+
description: Condition contains details for one aspect of the current
1613+
state of this API Resource.
16461614
properties:
16471615
lastTransitionTime:
16481616
description: |-
@@ -1683,12 +1651,7 @@ spec:
16831651
- Unknown
16841652
type: string
16851653
type:
1686-
description: |-
1687-
type of condition in CamelCase or in foo.example.com/CamelCase.
1688-
---
1689-
Many .condition.type values are consistent across resources like Available, but because arbitrary conditions can be
1690-
useful (see .node.status.conditions), the ability to deconflict is important.
1691-
The regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt)
1654+
description: type of condition in CamelCase or in foo.example.com/CamelCase.
16921655
maxLength: 316
16931656
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])$
16941657
type: string

0 commit comments

Comments
 (0)