Skip to content

Commit b29d247

Browse files
committed
use failuredomain hashmeta name to label machines
1 parent 9bd8ac4 commit b29d247

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

controllers/cloudstackfailuredomain_controller.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ func (r *CloudStackFailureDomainReconciliationRunner) ReconcileDelete() (ctrl.Re
127127
// and requeus until all CloudStack machines are cleared from the FailureDomain.
128128
func (r *CloudStackFailureDomainReconciliationRunner) ClearMachines() (ctrl.Result, error) {
129129
machines := &infrav1.CloudStackMachineList{}
130-
if err := r.K8sClient.List(r.RequestCtx, machines, client.MatchingLabels{infrav1.FailureDomainLabelName: r.ReconciliationSubject.Spec.Name}); err != nil {
130+
if err := r.K8sClient.List(r.RequestCtx, machines, client.MatchingLabels{infrav1.FailureDomainLabelName: r.ReconciliationSubject.Name}); err != nil {
131131
return ctrl.Result{}, err
132132
}
133133
// Deleted CAPI machines for CloudStack machines found.

controllers/cloudstackmachine_controller.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ func (r *CloudStackMachineReconciliationRunner) SetFailureDomainOnCSMachine() (r
145145
name = r.CSCluster.Spec.FailureDomains[randNum].Name
146146
}
147147
r.ReconciliationSubject.Spec.FailureDomainName = name
148-
r.ReconciliationSubject.Labels[infrav1.FailureDomainLabelName] = r.ReconciliationSubject.Spec.FailureDomainName
148+
r.ReconciliationSubject.Labels[infrav1.FailureDomainLabelName] = infrav1.FailureDomainHashedMetaName(name, r.CAPICluster.Name)
149149
}
150150
return ctrl.Result{}, nil
151151
}

0 commit comments

Comments
 (0)