Skip to content

fix(metal3): reconcile BMCSecret for existing BareMetalHosts #161

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
defo89 merged 1 commit into from
Jun 11, 2026
+8 −8
Merged

fix(metal3): reconcile BMCSecret for existing BareMetalHosts #161

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions internal/controller/metal3_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,11 @@ func (r *Metal3Reconciler) reconcileDevice(ctx context.Context, cluster *cluster
return nil
}

bmcSecret, _, err := r.reconcileBmcSecret(ctx, cluster, device)
if err != nil {
return fmt.Errorf("unable to reconcile bmc secret: %w", err)
}

bmh := &bmov1alpha1.BareMetalHost{}
if err := r.k8sClient.Get(ctx, client.ObjectKey{Name: device.Name, Namespace: cluster.Namespace}, bmh); err == nil {
logger.Info("BareMetalHost custom resource already exists, will skip", "host", bmh.Name)
Expand Down Expand Up @@ -211,11 +216,6 @@ func (r *Metal3Reconciler) reconcileDevice(ctx context.Context, cluster *cluster
return fmt.Errorf("unable to get region for device: %w", err)
}

bmcSecret, _, err := r.reconcileBmcSecret(ctx, cluster, device)
if err != nil {
return fmt.Errorf("unable to reconcile bmc secret: %w", err)
}

role, err := getRoleFromTags(device)
if err != nil {
return fmt.Errorf("unable to get role from tags: %w", err)
Expand Down Expand Up @@ -379,9 +379,9 @@ func (r *Metal3Reconciler) reconcileBmcSecret(ctx context.Context, cluster *clus
}

result, err := controllerutil.CreateOrUpdate(ctx, r.k8sClient, bmcSecret, func() error {
bmcSecret.StringData = map[string]string{
"username": user,
"password": password,
bmcSecret.Data = map[string][]byte{
"username": []byte(user),
"password": []byte(password),
}
return nil
})
Expand Down
Loading