rancher
/
cluster-api-provider-rke2
mirror of https://github.com/rancher/cluster-api-provider-rke2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Ensure we always lookup machines by node name from collection 

Signed-off-by: Danil Grigorev <danil.grigorev@suse.com>
This commit is contained in:
Danil Grigorev 2024-01-30 18:38:46 +01:00
parent 1563d863e8
commit 74df8499f7
No known key found for this signature in database
GPG Key ID: 7C96CE1776C81090
2 changed files with 76 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
pkg/rke2/control_plane.go
View File

@ -76,13 +76,17 @@ func NewControlPlane(
patchHelpers := map[string]*patch.Helper{}
for _, machine := range ownedMachines {
for name, machine := range ownedMachines {
patchHelper, err := patch.NewHelper(machine, client)
if err != nil {
return nil, errors.Wrapf(err, "failed to create patch helper for machine %s", machine.Name)
if machine.Status.NodeRef != nil {
name = machine.Status.NodeRef.Name
}
return nil, errors.Wrapf(err, "failed to create patch helper for machine %s with node %s", machine.Name, name)
}
patchHelpers[machine.Name] = patchHelper
patchHelpers[name] = patchHelper
}
return &ControlPlane{
@ -305,7 +309,7 @@ func getInfraResources(ctx context.Context, cl client.Client, machines collectio
func getRKE2Configs(ctx context.Context, cl client.Client, machines collections.Machines) (map[string]*bootstrapv1.RKE2Config, error) {
result := map[string]*bootstrapv1.RKE2Config{}
for _, m := range machines {
for name, m := range machines {
bootstrapRef := m.Spec.Bootstrap.ConfigRef
if bootstrapRef == nil {
continue
@ -318,10 +322,14 @@ func getRKE2Configs(ctx context.Context, cl client.Client, machines collections.
continue
}
return nil, errors.Wrapf(err, "failed to retrieve bootstrap config for machine %q", m.Name)
if m.Status.NodeRef != nil {
name = m.Status.NodeRef.Name
}
return nil, errors.Wrapf(err, "failed to retrieve bootstrap config for machine %q with node %s", m.Name, name)
}
result[m.Name] = machineConfig
result[name] = machineConfig
}
return result, nil
@ -346,21 +354,29 @@ func (c *ControlPlane) HasUnhealthyMachine() bool {
func (c *ControlPlane) PatchMachines(ctx context.Context) error {
errList := []error{}
for i := range c.Machines {
machine := c.Machines[i]
if helper, ok := c.machinesPatchHelpers[machine.Name]; ok {
for name := range c.Machines {
machine := c.Machines[name]
if helper, ok := c.machinesPatchHelpers[name]; ok {
if err := helper.Patch(ctx, machine, patch.WithOwnedConditions{Conditions: []clusterv1.ConditionType{
controlplanev1.MachineAgentHealthyCondition,
controlplanev1.MachineEtcdMemberHealthyCondition,
controlplanev1.NodeMetadataUpToDate,
}}); err != nil {
errList = append(errList, errors.Wrapf(err, "failed to patch machine %s", machine.Name))
if machine.Status.NodeRef != nil {
name = machine.Status.NodeRef.Name
}
errList = append(errList, errors.Wrapf(err, "failed to patch machine %s with node %s", machine.Name, name))
}
continue
}
errList = append(errList, errors.Errorf("failed to get patch helper for machine %s", machine.Name))
if machine.Status.NodeRef != nil {
name = machine.Status.NodeRef.Name
}
errList = append(errList, errors.Errorf("failed to get patch helper for machine %s with node %s", machine.Name, name))
}
return kerrors.NewAggregate(errList)

64
pkg/rke2/workload_cluster.go
View File

@ -142,23 +142,35 @@ func (w *Workload) PatchNodes(ctx context.Context, cp *ControlPlane) error {
for i := range w.Nodes {
node := w.Nodes[i]
if _, found := cp.Machines[node.Name]; !found {
continue
machine, found := cp.Machines[node.Name]
if !found {
for _, m := range cp.Machines {
if m.Status.NodeRef != nil && m.Status.NodeRef.Name == node.Name {
machine = m
break
}
}
if machine == nil {
continue
}
}
if helper, ok := w.nodePatchHelpers[node.Name]; ok {
if err := helper.Patch(ctx, node); err != nil {
conditions.MarkUnknown(
cp.Machines[node.Name],
machine,
controlplanev1.NodeMetadataUpToDate,
controlplanev1.NodePatchFailedReason, errors.Wrapf(err, "failed to patch node %s", node.Name).Error())
errList = append(errList, errors.Wrapf(err, "failed to patch node %s", node.Name))
}
if !conditions.Has(cp.Machines[node.Name], controlplanev1.NodeMetadataUpToDate) {
if !conditions.Has(machine, controlplanev1.NodeMetadataUpToDate) {
conditions.MarkTrue(
cp.Machines[node.Name],
machine,
controlplanev1.NodeMetadataUpToDate)
}
@ -233,9 +245,19 @@ func (w *Workload) UpdateAgentConditions(controlPlane *ControlPlane) {
continue
}
rcpErrors = append(rcpErrors, fmt.Sprintf("Control plane node %s does not have a corresponding machine", node.Name))
for _, m := range controlPlane.Machines {
if m.Status.NodeRef != nil && m.Status.NodeRef.Name == node.Name {
machine = m
continue
break
}
}
if machine == nil {
rcpErrors = append(rcpErrors, fmt.Sprintf("Control plane node %s does not have a corresponding machine", node.Name))
continue
}
}
// If the machine is deleting, report all the conditions as deleting
@ -426,7 +448,15 @@ func (w *Workload) updateManagedEtcdConditions(controlPlane *ControlPlane) {
continue
}
continue
for _, m := range controlPlane.Machines {
if m.Status.NodeRef != nil && m.Status.NodeRef.Name == node.Name {
machine = m
}
}
if machine == nil {
continue
}
}
// If the machine is deleting, report all the conditions as deleting
@ -443,32 +473,36 @@ func (w *Workload) updateManagedEtcdConditions(controlPlane *ControlPlane) {
// UpdateNodeMetadata is responsible for populating node metadata after
// it is referenced from machine object.
func (w *Workload) UpdateNodeMetadata(ctx context.Context, controlPlane *ControlPlane) error {
for commonName, machine := range controlPlane.Machines {
for nodeName, machine := range controlPlane.Machines {
if machine.Spec.Bootstrap.ConfigRef == nil {
continue
}
node, nodeFound := w.Nodes[commonName]
if machine.Status.NodeRef != nil {
nodeName = machine.Status.NodeRef.Name
}
node, nodeFound := w.Nodes[nodeName]
if !nodeFound {
conditions.MarkUnknown(
controlPlane.Machines[commonName],
machine,
controlplanev1.NodeMetadataUpToDate,
controlplanev1.NodePatchFailedReason, "associated node not found")
continue
} else if name, ok := node.Annotations[clusterv1.MachineAnnotation]; !ok || name != commonName {
} else if name, ok := node.Annotations[clusterv1.MachineAnnotation]; !ok || name != machine.Name {
conditions.MarkUnknown(
controlPlane.Machines[commonName],
machine,
controlplanev1.NodeMetadataUpToDate,
controlplanev1.NodePatchFailedReason, fmt.Sprintf("node object is missing %s annotation", clusterv1.MachineAnnotation))
continue
}
rkeConfig, found := controlPlane.rke2Configs[commonName]
rkeConfig, found := controlPlane.rke2Configs[machine.Name]
if !found {
conditions.MarkUnknown(
controlPlane.Machines[commonName],
machine,
controlplanev1.NodeMetadataUpToDate,
controlplanev1.NodePatchFailedReason, "associated RKE2 config not found")