Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update CRDs #863

Merged
merged 1 commit into from
Mar 30, 2019
Merged

Update CRDs #863

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 11 additions & 8 deletions config/crds/cluster_v1alpha1_machine.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,11 +61,11 @@ spec:
could not get registered as Kubernetes nodes. With cluster-api as
a generic out-of-tree provider for autoscaler, this field is required
by autoscaler to be able to have a provider view of the list of machines.
Another list of nodes is queried from the k8s apiserver and then comparison
is done to find out unregistered machines and are marked for delete.
This field will be set by the actuators and consumed by higher level
entities like autoscaler that will be interfacing with cluster-api
as generic provider.
Another list of nodes is queried from the k8s apiserver and then a
comparison is done to find out unregistered machines and are marked
for delete. This field will be set by the actuators and consumed by
higher level entities like autoscaler that will be interfacing with
cluster-api as generic provider.
type: string
providerSpec:
description: ProviderSpec details Provider-specific configuration to
Expand Down Expand Up @@ -93,9 +93,12 @@ spec:
type: object
type: object
taints:
description: Taints is the full, authoritative list of taints to apply
to the corresponding Node. This list will overwrite any modifications
made to the Node on an ongoing basis.
description: The list of the taints to be applied to the corresponding
Node in additive manner. This list will not overwrite any other taints
added to the Node on an ongoing basis by other entities. These taints
should be actively reconciled e.g. if you ask the machine controller
to apply a taint and then manually remove the taint the machine controller
will put it back) but not have the machine controller remove any taints
items:
type: object
type: array
Expand Down
10 changes: 7 additions & 3 deletions config/crds/cluster_v1alpha1_machinedeployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,9 +181,13 @@ spec:
type: object
type: object
taints:
description: Taints is the full, authoritative list of taints
to apply to the corresponding Node. This list will overwrite
any modifications made to the Node on an ongoing basis.
description: The list of the taints to be applied to the corresponding
Node in additive manner. This list will not overwrite any
other taints added to the Node on an ongoing basis by other
entities. These taints should be actively reconciled e.g.
if you ask the machine controller to apply a taint and then
manually remove the taint the machine controller will put
it back) but not have the machine controller remove any taints
items:
type: object
type: array
Expand Down
10 changes: 7 additions & 3 deletions config/crds/cluster_v1alpha1_machineset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,9 +130,13 @@ spec:
type: object
type: object
taints:
description: Taints is the full, authoritative list of taints
to apply to the corresponding Node. This list will overwrite
any modifications made to the Node on an ongoing basis.
description: The list of the taints to be applied to the corresponding
Node in additive manner. This list will not overwrite any
other taints added to the Node on an ongoing basis by other
entities. These taints should be actively reconciled e.g.
if you ask the machine controller to apply a taint and then
manually remove the taint the machine controller will put
it back) but not have the machine controller remove any taints
items:
type: object
type: array
Expand Down