From 3ec728ba05b937053037e2eea771f7a8dcfe77eb Mon Sep 17 00:00:00 2001 From: Enxebre Date: Mon, 29 Apr 2019 10:57:39 +0200 Subject: [PATCH] UPSTREAM: : openshift: Drop machine.status.conditions field --- config/crds/machine_v1beta1_machine.yaml | 9 --------- pkg/apis/machine/v1beta1/machine_types.go | 8 -------- pkg/apis/machine/v1beta1/zz_generated.deepcopy.go | 7 ------- 3 files changed, 24 deletions(-) diff --git a/config/crds/machine_v1beta1_machine.yaml b/config/crds/machine_v1beta1_machine.yaml index 18b9ffdc4ca6..791c3d75e62b 100644 --- a/config/crds/machine_v1beta1_machine.yaml +++ b/config/crds/machine_v1beta1_machine.yaml @@ -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 diff --git a/pkg/apis/machine/v1beta1/machine_types.go b/pkg/apis/machine/v1beta1/machine_types.go index 64262e99da66..926c6915195c 100644 --- a/pkg/apis/machine/v1beta1/machine_types.go +++ b/pkg/apis/machine/v1beta1/machine_types.go @@ -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 diff --git a/pkg/apis/machine/v1beta1/zz_generated.deepcopy.go b/pkg/apis/machine/v1beta1/zz_generated.deepcopy.go index 50bf023c9265..67a6eff0d21b 100644 --- a/pkg/apis/machine/v1beta1/zz_generated.deepcopy.go +++ b/pkg/apis/machine/v1beta1/zz_generated.deepcopy.go @@ -682,13 +682,6 @@ func (in *MachineStatus) DeepCopyInto(out *MachineStatus) { *out = make([]v1.NodeAddress, len(*in)) copy(*out, *in) } - if in.Conditions != nil { - in, out := &in.Conditions, &out.Conditions - *out = make([]v1.NodeCondition, len(*in)) - for i := range *in { - (*in)[i].DeepCopyInto(&(*out)[i]) - } - } if in.LastOperation != nil { in, out := &in.LastOperation, &out.LastOperation *out = new(LastOperation)