Skip to content

Commit

Permalink
UPSTREAM: <carry>: openshift: Drop machine.status.conditions field
Browse files Browse the repository at this point in the history
  • Loading branch information
enxebre committed Apr 29, 2019
1 parent 7644c17 commit 3ec728b
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 24 deletions.
9 changes: 0 additions & 9 deletions config/crds/machine_v1beta1_machine.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -94,15 +94,6 @@ spec:
items:
type: object
type: array
conditions:
description: 'Conditions lists the conditions synced from the node conditions
of the corresponding node-object. Machine-controller is responsible
for keeping conditions up-to-date. MachineSet controller will be taking
these conditions as a signal to decide if machine is healthy or needs
to be replaced. Refer: https://kubernetes.io/docs/concepts/architecture/nodes/#condition'
items:
type: object
type: array
errorMessage:
description: ErrorMessage will be set in the event that there is a terminal
problem reconciling the Machine and will contain a more verbose string
Expand Down
8 changes: 0 additions & 8 deletions pkg/apis/machine/v1beta1/machine_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -151,14 +151,6 @@ type MachineStatus struct {
// +optional
Addresses []corev1.NodeAddress `json:"addresses,omitempty"`

// Conditions lists the conditions synced from the node conditions of the corresponding node-object.
// Machine-controller is responsible for keeping conditions up-to-date.
// MachineSet controller will be taking these conditions as a signal to decide if
// machine is healthy or needs to be replaced.
// Refer: https://kubernetes.io/docs/concepts/architecture/nodes/#condition
// +optional
Conditions []corev1.NodeCondition `json:"conditions,omitempty"`

// LastOperation describes the last-operation performed by the machine-controller.
// This API should be useful as a history in terms of the latest operation performed on the
// specific machine. It should also convey the state of the latest-operation for example if
Expand Down
7 changes: 0 additions & 7 deletions pkg/apis/machine/v1beta1/zz_generated.deepcopy.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 3ec728b

Please sign in to comment.