Skip to content

Commit 221b813

Browse files
committed
Apply controller-gen changes
Update config and bundle directories
1 parent bcb4d00 commit 221b813

File tree

4 files changed

+28
-128
lines changed

4 files changed

+28
-128
lines changed

bundle/manifests/node-healthcheck-operator.clusterserviceversion.yaml

Lines changed: 10 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -277,32 +277,34 @@ spec:
277277
clusterPermissions:
278278
- rules:
279279
- apiGroups:
280-
- apps
280+
- ""
281281
resources:
282-
- deployments
282+
- namespaces
283283
verbs:
284+
- create
284285
- get
285-
- list
286-
- watch
287286
- apiGroups:
288-
- config.openshift.io
287+
- ""
289288
resources:
290-
- clusterversions
289+
- nodes
290+
- pods
291291
verbs:
292292
- get
293293
- list
294294
- watch
295295
- apiGroups:
296-
- config.openshift.io
296+
- apps
297297
resources:
298-
- featuregates
298+
- deployments
299299
verbs:
300300
- get
301301
- list
302302
- watch
303303
- apiGroups:
304304
- config.openshift.io
305305
resources:
306+
- clusterversions
307+
- featuregates
306308
- infrastructures
307309
verbs:
308310
- get
@@ -332,29 +334,6 @@ spec:
332334
- patch
333335
- update
334336
- watch
335-
- apiGroups:
336-
- ""
337-
resources:
338-
- namespaces
339-
verbs:
340-
- create
341-
- get
342-
- apiGroups:
343-
- ""
344-
resources:
345-
- nodes
346-
verbs:
347-
- get
348-
- list
349-
- watch
350-
- apiGroups:
351-
- ""
352-
resources:
353-
- pods
354-
verbs:
355-
- get
356-
- list
357-
- watch
358337
- apiGroups:
359338
- machine.openshift.io
360339
resources:
@@ -393,11 +372,6 @@ spec:
393372
- rbac.authorization.k8s.io
394373
resources:
395374
- clusterrolebindings
396-
verbs:
397-
- '*'
398-
- apiGroups:
399-
- rbac.authorization.k8s.io
400-
resources:
401375
- clusterroles
402376
verbs:
403377
- '*'

bundle/manifests/remediation.medik8s.io_nodehealthchecks.yaml

Lines changed: 4 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
22
kind: CustomResourceDefinition
33
metadata:
44
annotations:
5-
controller-gen.kubebuilder.io/version: v0.14.0
5+
controller-gen.kubebuilder.io/version: v0.18.0
66
creationTimestamp: null
77
labels:
88
app.kubernetes.io/name: node-healthcheck-operator
@@ -50,7 +50,6 @@ spec:
5050
gets healthy within the timeout of the currently processed remediation. The order of
5151
remediation is defined by the "order" field of each "escalatingRemediation".
5252
53-
5453
Mutually exclusive with RemediationTemplate
5554
items:
5655
description: EscalatingRemediation defines a remediation template
@@ -67,7 +66,6 @@ spec:
6766
RemediationTemplate is a reference to a remediation template
6867
provided by a remediation provider.
6968
70-
7169
If a node needs remediation the controller will create an object from this template
7270
and then it should be picked up by a remediation provider.
7371
properties:
@@ -83,7 +81,6 @@ spec:
8381
the event) or if no container name is specified "spec.containers[2]" (container with
8482
index 2 in this pod). This syntax is chosen only to have some well-defined way of
8583
referencing a part of an object.
86-
TODO: this design is not final and this field is subject to change in the future.
8784
type: string
8885
kind:
8986
description: |-
@@ -119,7 +116,6 @@ spec:
119116
the overall remediation is considered as failed.
120117
As a safeguard for preventing parallel remediations, a minimum of 60s is enforced.
121118
122-
123119
Expects a string of decimal numbers each with optional
124120
fraction and a unit suffix, eg "300ms", "1.5h" or "2h45m".
125121
Valid time units are "ns", "us" (or "µs"), "ms", "s", "m", "h".
@@ -179,11 +175,9 @@ spec:
179175
RemediationTemplate is a reference to a remediation template
180176
provided by an infrastructure provider.
181177
182-
183178
If a node needs remediation the controller will create an object from this template
184179
and then it should be picked up by a remediation provider.
185180
186-
187181
Mutually exclusive with EscalatingRemediations
188182
properties:
189183
apiVersion:
@@ -198,7 +192,6 @@ spec:
198192
the event) or if no container name is specified "spec.containers[2]" (container with
199193
index 2 in this pod). This syntax is chosen only to have some well-defined way of
200194
referencing a part of an object.
201-
TODO: this design is not final and this field is subject to change in the future.
202195
type: string
203196
kind:
204197
description: |-
@@ -231,11 +224,9 @@ spec:
231224
description: |-
232225
Label selector to match nodes whose health will be exercised.
233226
234-
235227
Selecting both control-plane and worker nodes in one NHC CR is
236228
highly discouraged and can result in undesired behaviour.
237229
238-
239230
Note: mandatory now for above reason, but for backwards compatibility existing
240231
CRs will continue to work with an empty selector, which matches all nodes.
241232
properties:
@@ -302,7 +293,6 @@ spec:
302293
description: |-
303294
Duration of the condition specified when a node is considered unhealthy.
304295
305-
306296
Expects a string of decimal numbers each with optional
307297
fraction and a unit suffix, eg "300ms", "1.5h" or "2h45m".
308298
Valid time units are "ns", "us" (or "µs"), "ms", "s", "m", "h".
@@ -338,16 +328,8 @@ spec:
338328
Represents the observations of a NodeHealthCheck's current state.
339329
Known .status.conditions.type are: "Disabled"
340330
items:
341-
description: "Condition contains details for one aspect of the current
342-
state of this API Resource.\n---\nThis struct is intended for
343-
direct use as an array at the field path .status.conditions. For
344-
example,\n\n\n\ttype FooStatus struct{\n\t // Represents the
345-
observations of a foo's current state.\n\t // Known .status.conditions.type
346-
are: \"Available\", \"Progressing\", and \"Degraded\"\n\t //
347-
+patchMergeKey=type\n\t // +patchStrategy=merge\n\t // +listType=map\n\t
348-
\ // +listMapKey=type\n\t Conditions []metav1.Condition `json:\"conditions,omitempty\"
349-
patchStrategy:\"merge\" patchMergeKey:\"type\" protobuf:\"bytes,1,rep,name=conditions\"`\n\n\n\t
350-
\ // other fields\n\t}"
331+
description: Condition contains details for one aspect of the current
332+
state of this API Resource.
351333
properties:
352334
lastTransitionTime:
353335
description: |-
@@ -388,12 +370,7 @@ spec:
388370
- Unknown
389371
type: string
390372
type:
391-
description: |-
392-
type of condition in CamelCase or in foo.example.com/CamelCase.
393-
---
394-
Many .condition.type values are consistent across resources like Available, but because arbitrary conditions can be
395-
useful (see .node.status.conditions), the ability to deconflict is important.
396-
The regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt)
373+
description: type of condition in CamelCase or in foo.example.com/CamelCase.
397374
maxLength: 316
398375
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])$
399376
type: string
@@ -482,7 +459,6 @@ spec:
482459
the event) or if no container name is specified "spec.containers[2]" (container with
483460
index 2 in this pod). This syntax is chosen only to have some well-defined way of
484461
referencing a part of an object.
485-
TODO: this design is not final and this field is subject to change in the future.
486462
type: string
487463
kind:
488464
description: |-

config/crd/bases/remediation.medik8s.io_nodehealthchecks.yaml

Lines changed: 4 additions & 28 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.14.0
6+
controller-gen.kubebuilder.io/version: v0.18.0
77
name: nodehealthchecks.remediation.medik8s.io
88
spec:
99
group: remediation.medik8s.io
@@ -48,7 +48,6 @@ spec:
4848
gets healthy within the timeout of the currently processed remediation. The order of
4949
remediation is defined by the "order" field of each "escalatingRemediation".
5050
51-
5251
Mutually exclusive with RemediationTemplate
5352
items:
5453
description: EscalatingRemediation defines a remediation template
@@ -65,7 +64,6 @@ spec:
6564
RemediationTemplate is a reference to a remediation template
6665
provided by a remediation provider.
6766
68-
6967
If a node needs remediation the controller will create an object from this template
7068
and then it should be picked up by a remediation provider.
7169
properties:
@@ -81,7 +79,6 @@ spec:
8179
the event) or if no container name is specified "spec.containers[2]" (container with
8280
index 2 in this pod). This syntax is chosen only to have some well-defined way of
8381
referencing a part of an object.
84-
TODO: this design is not final and this field is subject to change in the future.
8582
type: string
8683
kind:
8784
description: |-
@@ -117,7 +114,6 @@ spec:
117114
the overall remediation is considered as failed.
118115
As a safeguard for preventing parallel remediations, a minimum of 60s is enforced.
119116
120-
121117
Expects a string of decimal numbers each with optional
122118
fraction and a unit suffix, eg "300ms", "1.5h" or "2h45m".
123119
Valid time units are "ns", "us" (or "µs"), "ms", "s", "m", "h".
@@ -177,11 +173,9 @@ spec:
177173
RemediationTemplate is a reference to a remediation template
178174
provided by an infrastructure provider.
179175
180-
181176
If a node needs remediation the controller will create an object from this template
182177
and then it should be picked up by a remediation provider.
183178
184-
185179
Mutually exclusive with EscalatingRemediations
186180
properties:
187181
apiVersion:
@@ -196,7 +190,6 @@ spec:
196190
the event) or if no container name is specified "spec.containers[2]" (container with
197191
index 2 in this pod). This syntax is chosen only to have some well-defined way of
198192
referencing a part of an object.
199-
TODO: this design is not final and this field is subject to change in the future.
200193
type: string
201194
kind:
202195
description: |-
@@ -229,11 +222,9 @@ spec:
229222
description: |-
230223
Label selector to match nodes whose health will be exercised.
231224
232-
233225
Selecting both control-plane and worker nodes in one NHC CR is
234226
highly discouraged and can result in undesired behaviour.
235227
236-
237228
Note: mandatory now for above reason, but for backwards compatibility existing
238229
CRs will continue to work with an empty selector, which matches all nodes.
239230
properties:
@@ -300,7 +291,6 @@ spec:
300291
description: |-
301292
Duration of the condition specified when a node is considered unhealthy.
302293
303-
304294
Expects a string of decimal numbers each with optional
305295
fraction and a unit suffix, eg "300ms", "1.5h" or "2h45m".
306296
Valid time units are "ns", "us" (or "µs"), "ms", "s", "m", "h".
@@ -336,16 +326,8 @@ spec:
336326
Represents the observations of a NodeHealthCheck's current state.
337327
Known .status.conditions.type are: "Disabled"
338328
items:
339-
description: "Condition contains details for one aspect of the current
340-
state of this API Resource.\n---\nThis struct is intended for
341-
direct use as an array at the field path .status.conditions. For
342-
example,\n\n\n\ttype FooStatus struct{\n\t // Represents the
343-
observations of a foo's current state.\n\t // Known .status.conditions.type
344-
are: \"Available\", \"Progressing\", and \"Degraded\"\n\t //
345-
+patchMergeKey=type\n\t // +patchStrategy=merge\n\t // +listType=map\n\t
346-
\ // +listMapKey=type\n\t Conditions []metav1.Condition `json:\"conditions,omitempty\"
347-
patchStrategy:\"merge\" patchMergeKey:\"type\" protobuf:\"bytes,1,rep,name=conditions\"`\n\n\n\t
348-
\ // other fields\n\t}"
329+
description: Condition contains details for one aspect of the current
330+
state of this API Resource.
349331
properties:
350332
lastTransitionTime:
351333
description: |-
@@ -386,12 +368,7 @@ spec:
386368
- Unknown
387369
type: string
388370
type:
389-
description: |-
390-
type of condition in CamelCase or in foo.example.com/CamelCase.
391-
---
392-
Many .condition.type values are consistent across resources like Available, but because arbitrary conditions can be
393-
useful (see .node.status.conditions), the ability to deconflict is important.
394-
The regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt)
371+
description: type of condition in CamelCase or in foo.example.com/CamelCase.
395372
maxLength: 316
396373
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])$
397374
type: string
@@ -480,7 +457,6 @@ spec:
480457
the event) or if no container name is specified "spec.containers[2]" (container with
481458
index 2 in this pod). This syntax is chosen only to have some well-defined way of
482459
referencing a part of an object.
483-
TODO: this design is not final and this field is subject to change in the future.
484460
type: string
485461
kind:
486462
description: |-

0 commit comments

Comments
 (0)