Skip to content

Commit af29b4b

Browse files
committed
Regenerate CRDs
1 parent 8ef7321 commit af29b4b

4 files changed

+298
-46
lines changed

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

Lines changed: 102 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1+
2+
---
13
apiVersion: apiextensions.k8s.io/v1beta1
24
kind: CustomResourceDefinition
35
metadata:
46
creationTimestamp: null
5-
labels:
6-
controller-tools.k8s.io: "1.0"
77
name: machines.machine.openshift.io
88
spec:
99
additionalPrinterColumns:
@@ -40,26 +40,30 @@ spec:
4040
group: machine.openshift.io
4141
names:
4242
kind: Machine
43+
listKind: MachineList
4344
plural: machines
44-
scope: Namespaced
45+
singular: machine
46+
scope: ""
4547
subresources:
4648
status: {}
4749
validation:
4850
openAPIV3Schema:
51+
description: / [Machine] Machine is the Schema for the machines API
4952
properties:
5053
apiVersion:
5154
description: 'APIVersion defines the versioned schema of this representation
5255
of an object. Servers should convert recognized schemas to the latest
53-
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#resources'
56+
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
5457
type: string
5558
kind:
5659
description: 'Kind is a string value representing the REST resource this
5760
object represents. Servers may infer this from the endpoint the client
58-
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#types-kinds'
61+
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
5962
type: string
6063
metadata:
6164
type: object
6265
spec:
66+
description: / [MachineSpec] MachineSpec defines the desired state of Machine
6367
properties:
6468
metadata:
6569
description: ObjectMeta will autopopulate the Node created. Use this
@@ -101,48 +105,83 @@ spec:
101105
to apply a taint and then manually remove the taint the machine controller
102106
will put it back) but not have the machine controller remove any taints
103107
items:
108+
description: The node this Taint is attached to has the "effect" on
109+
any pod that does not tolerate the Taint.
110+
properties:
111+
effect:
112+
description: Required. The effect of the taint on pods that do
113+
not tolerate the taint. Valid effects are NoSchedule, PreferNoSchedule
114+
and NoExecute.
115+
type: string
116+
key:
117+
description: Required. The taint key to be applied to a node.
118+
type: string
119+
timeAdded:
120+
description: TimeAdded represents the time at which the taint
121+
was added. It is only written for NoExecute taints.
122+
format: date-time
123+
type: string
124+
value:
125+
description: Required. The taint value corresponding to the taint
126+
key.
127+
type: string
128+
required:
129+
- effect
130+
- key
104131
type: object
105132
type: array
106-
required:
107-
- providerSpec
108133
type: object
109134
status:
135+
description: / [MachineStatus] MachineStatus defines the observed state
136+
of Machine
110137
properties:
111138
addresses:
112139
description: Addresses is a list of addresses assigned to the machine.
113140
Queried from cloud provider, if available.
114141
items:
142+
description: NodeAddress contains information for the node's address.
143+
properties:
144+
address:
145+
description: The node address.
146+
type: string
147+
type:
148+
description: Node address type, one of Hostname, ExternalIP or
149+
InternalIP.
150+
type: string
151+
required:
152+
- address
153+
- type
115154
type: object
116155
type: array
117156
errorMessage:
118-
description: ErrorMessage will be set in the event that there is a terminal
119-
problem reconciling the Machine and will contain a more verbose string
120-
suitable for logging and human consumption. This field should not
121-
be set for transitive errors that a controller faces that are expected
122-
to be fixed automatically over time (like service outages), but instead
123-
indicate that something is fundamentally wrong with the Machine's
124-
spec or the configuration of the controller, and that manual intervention
125-
is required. Examples of terminal errors would be invalid combinations
126-
of settings in the spec, values that are unsupported by the controller,
127-
or the responsible controller itself being critically misconfigured. Any
128-
transient errors that occur during the reconciliation of Machines
129-
can be added as events to the Machine object and/or logged in the
130-
controller's output.
157+
description: "ErrorMessage will be set in the event that there is a
158+
terminal problem reconciling the Machine and will contain a more verbose
159+
string suitable for logging and human consumption. \n This field should
160+
not be set for transitive errors that a controller faces that are
161+
expected to be fixed automatically over time (like service outages),
162+
but instead indicate that something is fundamentally wrong with the
163+
Machine's spec or the configuration of the controller, and that manual
164+
intervention is required. Examples of terminal errors would be invalid
165+
combinations of settings in the spec, values that are unsupported
166+
by the controller, or the responsible controller itself being critically
167+
misconfigured. \n Any transient errors that occur during the reconciliation
168+
of Machines can be added as events to the Machine object and/or logged
169+
in the controller's output."
131170
type: string
132171
errorReason:
133-
description: ErrorReason will be set in the event that there is a terminal
172+
description: "ErrorReason will be set in the event that there is a terminal
134173
problem reconciling the Machine and will contain a succinct value
135-
suitable for machine interpretation. This field should not be set
174+
suitable for machine interpretation. \n This field should not be set
136175
for transitive errors that a controller faces that are expected to
137176
be fixed automatically over time (like service outages), but instead
138177
indicate that something is fundamentally wrong with the Machine's
139178
spec or the configuration of the controller, and that manual intervention
140179
is required. Examples of terminal errors would be invalid combinations
141180
of settings in the spec, values that are unsupported by the controller,
142-
or the responsible controller itself being critically misconfigured. Any
143-
transient errors that occur during the reconciliation of Machines
181+
or the responsible controller itself being critically misconfigured.
182+
\n Any transient errors that occur during the reconciliation of Machines
144183
can be added as events to the Machine object and/or logged in the
145-
controller's output.
184+
controller's output."
146185
type: string
147186
lastOperation:
148187
description: LastOperation describes the last-operation performed by
@@ -175,6 +214,39 @@ spec:
175214
type: string
176215
nodeRef:
177216
description: NodeRef will point to the corresponding Node if it exists.
217+
properties:
218+
apiVersion:
219+
description: API version of the referent.
220+
type: string
221+
fieldPath:
222+
description: 'If referring to a piece of an object instead of an
223+
entire object, this string should contain a valid JSON/Go field
224+
access statement, such as desiredState.manifest.containers[2].
225+
For example, if the object reference is to a container within
226+
a pod, this would take on a value like: "spec.containers{name}"
227+
(where "name" refers to the name of the container that triggered
228+
the event) or if no container name is specified "spec.containers[2]"
229+
(container with index 2 in this pod). This syntax is chosen only
230+
to have some well-defined way of referencing a part of an object.
231+
TODO: this design is not final and this field is subject to change
232+
in the future.'
233+
type: string
234+
kind:
235+
description: 'Kind of the referent. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
236+
type: string
237+
name:
238+
description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
239+
type: string
240+
namespace:
241+
description: 'Namespace of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/'
242+
type: string
243+
resourceVersion:
244+
description: 'Specific resourceVersion to which this reference is
245+
made, if any. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#concurrency-control-and-consistency'
246+
type: string
247+
uid:
248+
description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
249+
type: string
178250
type: object
179251
phase:
180252
description: Phase represents the current phase of machine actuation.
@@ -186,7 +258,12 @@ spec:
186258
that should be serialized/deserialized from this field.
187259
type: object
188260
type: object
261+
type: object
189262
version: v1beta1
263+
versions:
264+
- name: v1beta1
265+
served: true
266+
storage: true
190267
status:
191268
acceptedNames:
192269
kind: ""

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

Lines changed: 87 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1+
2+
---
13
apiVersion: apiextensions.k8s.io/v1beta1
24
kind: CustomResourceDefinition
35
metadata:
46
creationTimestamp: null
5-
labels:
6-
controller-tools.k8s.io: "1.0"
77
name: machinesets.machine.openshift.io
88
spec:
99
additionalPrinterColumns:
@@ -30,8 +30,10 @@ spec:
3030
group: machine.openshift.io
3131
names:
3232
kind: MachineSet
33+
listKind: MachineSetList
3334
plural: machinesets
34-
scope: Namespaced
35+
singular: machineset
36+
scope: ""
3537
subresources:
3638
scale:
3739
labelSelectorPath: .status.labelSelector
@@ -40,20 +42,24 @@ spec:
4042
status: {}
4143
validation:
4244
openAPIV3Schema:
45+
description: / [MachineSet] MachineSet ensures that a specified number of machines
46+
replicas are running at any given time.
4347
properties:
4448
apiVersion:
4549
description: 'APIVersion defines the versioned schema of this representation
4650
of an object. Servers should convert recognized schemas to the latest
47-
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#resources'
51+
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
4852
type: string
4953
kind:
5054
description: 'Kind is a string value representing the REST resource this
5155
object represents. Servers may infer this from the endpoint the client
52-
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#types-kinds'
56+
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
5357
type: string
5458
metadata:
5559
type: object
5660
spec:
61+
description: / [MachineSetSpec] MachineSetSpec defines the desired state
62+
of MachineSet
5763
properties:
5864
deletePolicy:
5965
description: DeletePolicy defines the policy used to identify nodes
@@ -81,6 +87,46 @@ spec:
8187
the replica count. Label keys and values that must match in order
8288
to be controlled by this MachineSet. It must match the machine template''s
8389
labels. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/#label-selectors'
90+
properties:
91+
matchExpressions:
92+
description: matchExpressions is a list of label selector requirements.
93+
The requirements are ANDed.
94+
items:
95+
description: A label selector requirement is a selector that contains
96+
values, a key, and an operator that relates the key and values.
97+
properties:
98+
key:
99+
description: key is the label key that the selector applies
100+
to.
101+
type: string
102+
operator:
103+
description: operator represents a key's relationship to a
104+
set of values. Valid operators are In, NotIn, Exists and
105+
DoesNotExist.
106+
type: string
107+
values:
108+
description: values is an array of string values. If the operator
109+
is In or NotIn, the values array must be non-empty. If the
110+
operator is Exists or DoesNotExist, the values array must
111+
be empty. This array is replaced during a strategic merge
112+
patch.
113+
items:
114+
type: string
115+
type: array
116+
required:
117+
- key
118+
- operator
119+
type: object
120+
type: array
121+
matchLabels:
122+
additionalProperties:
123+
type: string
124+
description: matchLabels is a map of {key,value} pairs. A single
125+
{key,value} in the matchLabels map is equivalent to an element
126+
of matchExpressions, whose key field is "key", the operator is
127+
"In", and the values array contains only "value". The requirements
128+
are ANDed.
129+
type: object
84130
type: object
85131
template:
86132
description: Template is the object that describes the machine that
@@ -137,16 +183,40 @@ spec:
137183
manually remove the taint the machine controller will put
138184
it back) but not have the machine controller remove any taints
139185
items:
186+
description: The node this Taint is attached to has the "effect"
187+
on any pod that does not tolerate the Taint.
188+
properties:
189+
effect:
190+
description: Required. The effect of the taint on pods
191+
that do not tolerate the taint. Valid effects are NoSchedule,
192+
PreferNoSchedule and NoExecute.
193+
type: string
194+
key:
195+
description: Required. The taint key to be applied to
196+
a node.
197+
type: string
198+
timeAdded:
199+
description: TimeAdded represents the time at which the
200+
taint was added. It is only written for NoExecute taints.
201+
format: date-time
202+
type: string
203+
value:
204+
description: Required. The taint value corresponding to
205+
the taint key.
206+
type: string
207+
required:
208+
- effect
209+
- key
140210
type: object
141211
type: array
142-
required:
143-
- providerSpec
144212
type: object
145213
type: object
146214
required:
147215
- selector
148216
type: object
149217
status:
218+
description: / [MachineSetStatus] MachineSetStatus defines the observed
219+
state of MachineSet
150220
properties:
151221
availableReplicas:
152222
description: The number of available replicas (ready for at least minReadySeconds)
@@ -156,21 +226,21 @@ spec:
156226
errorMessage:
157227
type: string
158228
errorReason:
159-
description: In the event that there is a terminal problem reconciling
229+
description: "In the event that there is a terminal problem reconciling
160230
the replicas, both ErrorReason and ErrorMessage will be set. ErrorReason
161231
will be populated with a succinct value suitable for machine interpretation,
162232
while ErrorMessage will contain a more verbose string suitable for
163-
logging and human consumption. These fields should not be set for
233+
logging and human consumption. \n These fields should not be set for
164234
transitive errors that a controller faces that are expected to be
165235
fixed automatically over time (like service outages), but instead
166236
indicate that something is fundamentally wrong with the MachineTemplate's
167237
spec or the configuration of the machine controller, and that manual
168238
intervention is required. Examples of terminal errors would be invalid
169239
combinations of settings in the spec, values that are unsupported
170240
by the machine controller, or the responsible machine controller itself
171-
being critically misconfigured. Any transient errors that occur during
172-
the reconciliation of Machines can be added as events to the MachineSet
173-
object and/or logged in the controller's output.
241+
being critically misconfigured. \n Any transient errors that occur
242+
during the reconciliation of Machines can be added as events to the
243+
MachineSet object and/or logged in the controller's output."
174244
type: string
175245
fullyLabeledReplicas:
176246
description: The number of replicas that have labels matching the labels
@@ -194,7 +264,12 @@ spec:
194264
required:
195265
- replicas
196266
type: object
267+
type: object
197268
version: v1beta1
269+
versions:
270+
- name: v1beta1
271+
served: true
272+
storage: true
198273
status:
199274
acceptedNames:
200275
kind: ""

0 commit comments

Comments
 (0)