Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 96b319c

Browse files
theSuesstheSuess
committedSep 23, 2024··
fix: upgrade controller-gen
1 parent dd1aad4 commit 96b319c

20 files changed

+685
-1629
lines changed
 

‎Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ ENVTEST ?= $(LOCALBIN)/setup-envtest
175175

176176
## Tool Versions
177177
KUSTOMIZE_VERSION ?= v5.1.1
178-
CONTROLLER_TOOLS_VERSION ?= v0.14.0
178+
CONTROLLER_TOOLS_VERSION ?= v0.16.3
179179

180180
KUSTOMIZE_INSTALL_SCRIPT ?= "https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh"
181181
.PHONY: kustomize

‎config/crd/bases/grafana.integreatly.org_grafanaalertrulegroups.yaml

+4-17
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.14.0
6+
controller-gen.kubebuilder.io/version: v0.16.3
77
name: grafanaalertrulegroups.grafana.integreatly.org
88
spec:
99
group: grafana.integreatly.org
@@ -234,16 +234,8 @@ spec:
234234
properties:
235235
conditions:
236236
items:
237-
description: "Condition contains details for one aspect of the current
238-
state of this API Resource.\n---\nThis struct is intended for
239-
direct use as an array at the field path .status.conditions. For
240-
example,\n\n\n\ttype FooStatus struct{\n\t // Represents the
241-
observations of a foo's current state.\n\t // Known .status.conditions.type
242-
are: \"Available\", \"Progressing\", and \"Degraded\"\n\t //
243-
+patchMergeKey=type\n\t // +patchStrategy=merge\n\t // +listType=map\n\t
244-
\ // +listMapKey=type\n\t Conditions []metav1.Condition `json:\"conditions,omitempty\"
245-
patchStrategy:\"merge\" patchMergeKey:\"type\" protobuf:\"bytes,1,rep,name=conditions\"`\n\n\n\t
246-
\ // other fields\n\t}"
237+
description: Condition contains details for one aspect of the current
238+
state of this API Resource.
247239
properties:
248240
lastTransitionTime:
249241
description: |-
@@ -284,12 +276,7 @@ spec:
284276
- Unknown
285277
type: string
286278
type:
287-
description: |-
288-
type of condition in CamelCase or in foo.example.com/CamelCase.
289-
---
290-
Many .condition.type values are consistent across resources like Available, but because arbitrary conditions can be
291-
useful (see .node.status.conditions), the ability to deconflict is important.
292-
The regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt)
279+
description: type of condition in CamelCase or in foo.example.com/CamelCase.
293280
maxLength: 316
294281
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])$
295282
type: string

‎config/crd/bases/grafana.integreatly.org_grafanacontactpoints.yaml

+4-17
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.14.0
6+
controller-gen.kubebuilder.io/version: v0.16.3
77
name: grafanacontactpoints.grafana.integreatly.org
88
spec:
99
group: grafana.integreatly.org
@@ -142,16 +142,8 @@ spec:
142142
INSERT ADDITIONAL STATUS FIELD - define observed state of cluster
143143
Important: Run "make" to regenerate code after modifying this file
144144
items:
145-
description: "Condition contains details for one aspect of the current
146-
state of this API Resource.\n---\nThis struct is intended for
147-
direct use as an array at the field path .status.conditions. For
148-
example,\n\n\n\ttype FooStatus struct{\n\t // Represents the
149-
observations of a foo's current state.\n\t // Known .status.conditions.type
150-
are: \"Available\", \"Progressing\", and \"Degraded\"\n\t //
151-
+patchMergeKey=type\n\t // +patchStrategy=merge\n\t // +listType=map\n\t
152-
\ // +listMapKey=type\n\t Conditions []metav1.Condition `json:\"conditions,omitempty\"
153-
patchStrategy:\"merge\" patchMergeKey:\"type\" protobuf:\"bytes,1,rep,name=conditions\"`\n\n\n\t
154-
\ // other fields\n\t}"
145+
description: Condition contains details for one aspect of the current
146+
state of this API Resource.
155147
properties:
156148
lastTransitionTime:
157149
description: |-
@@ -192,12 +184,7 @@ spec:
192184
- Unknown
193185
type: string
194186
type:
195-
description: |-
196-
type of condition in CamelCase or in foo.example.com/CamelCase.
197-
---
198-
Many .condition.type values are consistent across resources like Available, but because arbitrary conditions can be
199-
useful (see .node.status.conditions), the ability to deconflict is important.
200-
The regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt)
187+
description: type of condition in CamelCase or in foo.example.com/CamelCase.
201188
maxLength: 316
202189
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])$
203190
type: string

‎config/crd/bases/grafana.integreatly.org_grafanadashboards.yaml

+4-31
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.14.0
6+
controller-gen.kubebuilder.io/version: v0.16.3
77
name: grafanadashboards.grafana.integreatly.org
88
spec:
99
group: grafana.integreatly.org
@@ -69,9 +69,7 @@ spec:
6969
This field is effectively required, but due to backwards compatibility is
7070
allowed to be empty. Instances of this type with an empty value here are
7171
almost certainly wrong.
72-
TODO: Add other useful fields. apiVersion, kind, uid?
7372
More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
74-
TODO: Drop `kubebuilder:default` when controller-gen doesn't need it https://github.com/kubernetes-sigs/kubebuilder/issues/3896.
7573
type: string
7674
optional:
7775
description: Specify whether the ConfigMap or its key must be
@@ -114,9 +112,7 @@ spec:
114112
This field is effectively required, but due to backwards compatibility is
115113
allowed to be empty. Instances of this type with an empty value here are
116114
almost certainly wrong.
117-
TODO: Add other useful fields. apiVersion, kind, uid?
118115
More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
119-
TODO: Drop `kubebuilder:default` when controller-gen doesn't need it https://github.com/kubernetes-sigs/kubebuilder/issues/3896.
120116
type: string
121117
optional:
122118
description: Specify whether the ConfigMap or its key must
@@ -140,9 +136,7 @@ spec:
140136
This field is effectively required, but due to backwards compatibility is
141137
allowed to be empty. Instances of this type with an empty value here are
142138
almost certainly wrong.
143-
TODO: Add other useful fields. apiVersion, kind, uid?
144139
More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
145-
TODO: Drop `kubebuilder:default` when controller-gen doesn't need it https://github.com/kubernetes-sigs/kubebuilder/issues/3896.
146140
type: string
147141
optional:
148142
description: Specify whether the Secret or its key must
@@ -180,9 +174,7 @@ spec:
180174
This field is effectively required, but due to backwards compatibility is
181175
allowed to be empty. Instances of this type with an empty value here are
182176
almost certainly wrong.
183-
TODO: Add other useful fields. apiVersion, kind, uid?
184177
More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
185-
TODO: Drop `kubebuilder:default` when controller-gen doesn't need it https://github.com/kubernetes-sigs/kubebuilder/issues/3896.
186178
type: string
187179
optional:
188180
description: Specify whether the ConfigMap or its key
@@ -206,9 +198,7 @@ spec:
206198
This field is effectively required, but due to backwards compatibility is
207199
allowed to be empty. Instances of this type with an empty value here are
208200
almost certainly wrong.
209-
TODO: Add other useful fields. apiVersion, kind, uid?
210201
More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
211-
TODO: Drop `kubebuilder:default` when controller-gen doesn't need it https://github.com/kubernetes-sigs/kubebuilder/issues/3896.
212202
type: string
213203
optional:
214204
description: Specify whether the Secret or its key must
@@ -360,9 +350,7 @@ spec:
360350
This field is effectively required, but due to backwards compatibility is
361351
allowed to be empty. Instances of this type with an empty value here are
362352
almost certainly wrong.
363-
TODO: Add other useful fields. apiVersion, kind, uid?
364353
More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
365-
TODO: Drop `kubebuilder:default` when controller-gen doesn't need it https://github.com/kubernetes-sigs/kubebuilder/issues/3896.
366354
type: string
367355
optional:
368356
description: Specify whether the Secret or its key must
@@ -386,9 +374,7 @@ spec:
386374
This field is effectively required, but due to backwards compatibility is
387375
allowed to be empty. Instances of this type with an empty value here are
388376
almost certainly wrong.
389-
TODO: Add other useful fields. apiVersion, kind, uid?
390377
More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
391-
TODO: Drop `kubebuilder:default` when controller-gen doesn't need it https://github.com/kubernetes-sigs/kubebuilder/issues/3896.
392378
type: string
393379
optional:
394380
description: Specify whether the Secret or its key must
@@ -421,16 +407,8 @@ spec:
421407
type: boolean
422408
conditions:
423409
items:
424-
description: "Condition contains details for one aspect of the current
425-
state of this API Resource.\n---\nThis struct is intended for
426-
direct use as an array at the field path .status.conditions. For
427-
example,\n\n\n\ttype FooStatus struct{\n\t // Represents the
428-
observations of a foo's current state.\n\t // Known .status.conditions.type
429-
are: \"Available\", \"Progressing\", and \"Degraded\"\n\t //
430-
+patchMergeKey=type\n\t // +patchStrategy=merge\n\t // +listType=map\n\t
431-
\ // +listMapKey=type\n\t Conditions []metav1.Condition `json:\"conditions,omitempty\"
432-
patchStrategy:\"merge\" patchMergeKey:\"type\" protobuf:\"bytes,1,rep,name=conditions\"`\n\n\n\t
433-
\ // other fields\n\t}"
410+
description: Condition contains details for one aspect of the current
411+
state of this API Resource.
434412
properties:
435413
lastTransitionTime:
436414
description: |-
@@ -471,12 +449,7 @@ spec:
471449
- Unknown
472450
type: string
473451
type:
474-
description: |-
475-
type of condition in CamelCase or in foo.example.com/CamelCase.
476-
---
477-
Many .condition.type values are consistent across resources like Available, but because arbitrary conditions can be
478-
useful (see .node.status.conditions), the ability to deconflict is important.
479-
The regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt)
452+
description: type of condition in CamelCase or in foo.example.com/CamelCase.
480453
maxLength: 316
481454
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])$
482455
type: string

‎config/crd/bases/grafana.integreatly.org_grafanadatasources.yaml

+1-5
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.14.0
6+
controller-gen.kubebuilder.io/version: v0.16.3
77
name: grafanadatasources.grafana.integreatly.org
88
spec:
99
group: grafana.integreatly.org
@@ -182,9 +182,7 @@ spec:
182182
This field is effectively required, but due to backwards compatibility is
183183
allowed to be empty. Instances of this type with an empty value here are
184184
almost certainly wrong.
185-
TODO: Add other useful fields. apiVersion, kind, uid?
186185
More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
187-
TODO: Drop `kubebuilder:default` when controller-gen doesn't need it https://github.com/kubernetes-sigs/kubebuilder/issues/3896.
188186
type: string
189187
optional:
190188
description: Specify whether the ConfigMap or its key
@@ -208,9 +206,7 @@ spec:
208206
This field is effectively required, but due to backwards compatibility is
209207
allowed to be empty. Instances of this type with an empty value here are
210208
almost certainly wrong.
211-
TODO: Add other useful fields. apiVersion, kind, uid?
212209
More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
213-
TODO: Drop `kubebuilder:default` when controller-gen doesn't need it https://github.com/kubernetes-sigs/kubebuilder/issues/3896.
214210
type: string
215211
optional:
216212
description: Specify whether the Secret or its key must

‎config/crd/bases/grafana.integreatly.org_grafanafolders.yaml

+4-17
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.14.0
6+
controller-gen.kubebuilder.io/version: v0.16.3
77
name: grafanafolders.grafana.integreatly.org
88
spec:
99
group: grafana.integreatly.org
@@ -138,16 +138,8 @@ spec:
138138
type: boolean
139139
conditions:
140140
items:
141-
description: "Condition contains details for one aspect of the current
142-
state of this API Resource.\n---\nThis struct is intended for
143-
direct use as an array at the field path .status.conditions. For
144-
example,\n\n\n\ttype FooStatus struct{\n\t // Represents the
145-
observations of a foo's current state.\n\t // Known .status.conditions.type
146-
are: \"Available\", \"Progressing\", and \"Degraded\"\n\t //
147-
+patchMergeKey=type\n\t // +patchStrategy=merge\n\t // +listType=map\n\t
148-
\ // +listMapKey=type\n\t Conditions []metav1.Condition `json:\"conditions,omitempty\"
149-
patchStrategy:\"merge\" patchMergeKey:\"type\" protobuf:\"bytes,1,rep,name=conditions\"`\n\n\n\t
150-
\ // other fields\n\t}"
141+
description: Condition contains details for one aspect of the current
142+
state of this API Resource.
151143
properties:
152144
lastTransitionTime:
153145
description: |-
@@ -188,12 +180,7 @@ spec:
188180
- Unknown
189181
type: string
190182
type:
191-
description: |-
192-
type of condition in CamelCase or in foo.example.com/CamelCase.
193-
---
194-
Many .condition.type values are consistent across resources like Available, but because arbitrary conditions can be
195-
useful (see .node.status.conditions), the ability to deconflict is important.
196-
The regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt)
183+
description: type of condition in CamelCase or in foo.example.com/CamelCase.
197184
maxLength: 316
198185
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])$
199186
type: string

0 commit comments

Comments
 (0)
Please sign in to comment.