Skip to content

Commit b45a5c5

Browse files
committed
Some minor changes (comments, etc) to improve readability
Signed-off-by: Michael Shitrit <mshitrit@redhat.com>
1 parent 4dfaa31 commit b45a5c5

File tree

2 files changed

+5
-6
lines changed

2 files changed

+5
-6
lines changed

controllers/machinehealthcheck_controller.go

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -404,17 +404,15 @@ func (r *MachineHealthCheckReconciler) remediate(target resources.Target, rm res
404404
return errors.Wrapf(err, "failed to get remediation template")
405405
}
406406

407-
// TODO add control plane label
408-
409-
// create remediation CR
410407
var nodeNamePtr *string
411-
nodeName := ""
412408
if target.Node != nil && target.Node.ResourceVersion != "" {
413409
nodeNamePtr = &target.Node.Name
414-
nodeName = target.Node.Name
415410
}
416411

417-
remediationCR, err := rm.GenerateRemediationCRForMachine(target.Machine, target.MHC, template, nodeName)
412+
// TODO add control plane label
413+
414+
// create remediation CR
415+
remediationCR, err := rm.GenerateRemediationCRForMachine(target.Machine, target.MHC, template, pointer.StringDeref(nodeNamePtr, ""))
418416
if err != nil {
419417
return errors.Wrapf(err, "failed to generate remediation CR")
420418
}

controllers/resources/manager.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,7 @@ func (m *manager) generateRemediationCR(name string, nodeName string, healthChec
127127
templateSpec, _, _ := unstructured.NestedMap(template.Object, "spec", "template", "spec")
128128
unstructured.SetNestedField(remediationCR.Object, templateSpec, "spec")
129129

130+
// Multiple same kind templates are never supported for MHC, and remediators are not expected to handle generated names in this case, even if they do for NHC.
130131
isMHCRemediation := name != nodeName
131132
if annotations.HasMultipleTemplatesAnnotation(template) && !isMHCRemediation {
132133
remediationCR.SetGenerateName(fmt.Sprintf("%s-", name))

0 commit comments

Comments
 (0)