Skip to content

Commit 8d16ab9

Browse files
committed
Regenerate CRDs and add preserveUnknownFields:false for MHC
1 parent 9b58462 commit 8d16ab9

4 files changed

+8
-8
lines changed

install/0000_30_machine-api-operator_02_machine.crd.yaml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ spec:
5050
listKind: MachineList
5151
plural: machines
5252
singular: machine
53-
scope: ""
53+
scope: Namespaced
5454
subresources:
5555
status: {}
5656
validation:
@@ -129,8 +129,7 @@ spec:
129129
format: date-time
130130
type: string
131131
value:
132-
description: Required. The taint value corresponding to the taint
133-
key.
132+
description: The taint value corresponding to the taint key.
134133
type: string
135134
required:
136135
- effect

install/0000_30_machine-api-operator_03_machineset.crd.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ spec:
3535
listKind: MachineSetList
3636
plural: machinesets
3737
singular: machineset
38-
scope: ""
38+
scope: Namespaced
3939
subresources:
4040
scale:
4141
labelSelectorPath: .status.labelSelector
@@ -203,8 +203,8 @@ spec:
203203
format: date-time
204204
type: string
205205
value:
206-
description: Required. The taint value corresponding to
207-
the taint key.
206+
description: The taint value corresponding to the taint
207+
key.
208208
type: string
209209
required:
210210
- effect

install/0000_30_machine-api-operator_07_machinehealthcheck.crd.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ spec:
3131
- mhcs
3232
singular: machinehealthcheck
3333
scope: Namespaced
34+
preserveUnknownFields: false
3435
subresources:
3536
status: {}
3637
validation:
@@ -54,10 +55,11 @@ spec:
5455
properties:
5556
maxUnhealthy:
5657
anyOf:
57-
- type: string
5858
- type: integer
59+
- type: string
5960
description: Any farther remediation is only allowed if at most "MaxUnhealthy"
6061
machines selected by "selector" are not healthy.
62+
x-kubernetes-int-or-string: true
6163
nodeStartupTimeout:
6264
description: Machines older than this duration without a node will be
6365
considered to have failed and will be remediated.

pkg/apis/machine/v1beta1/machinehealthcheck_types.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,6 @@ type MachineHealthCheckStatus struct {
9999
ExpectedMachines *int `json:"expectedMachines"`
100100

101101
// total number of machines counted by this machine health check
102-
// +kubebuilder:default=0
103102
// +kubebuilder:validation:Minimum=0
104103
CurrentHealthy *int `json:"currentHealthy" protobuf:"varint,4,opt,name=currentHealthy"`
105104
}

0 commit comments

Comments
 (0)