Skip to content

OCPBUGS-33006: baremetal: aarch64-related fixes #8385

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
openshift-merge-bot merged 3 commits into from
May 15, 2024
Merged

OCPBUGS-33006: baremetal: aarch64-related fixes #8385

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d0d5d28
baremetal: set domain arch
honza May 9, 2024
38f5991
baremetal: undefine domain with flags
honza May 10, 2024
3397d08
baremetal: clear out graphics on aarch64
honza May 10, 2024
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
41 changes: 31 additions & 10 deletions pkg/infrastructure/baremetal/bootstrap.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,12 @@ package baremetal

import (
"encoding/xml"
"errors"
"fmt"
"io"
"net/url"
"os"
"strings"

"github.com/digitalocean/go-libvirt"
"github.com/sirupsen/logrus"
Expand Down Expand Up @@ -272,7 +274,7 @@ func createIgnition(virConn *libvirt.Libvirt, config baremetalConfig, pool libvi
return nil
}

func getCapabilities(virConn *libvirt.Libvirt) (libvirtxml.Caps, error) {
func getHostCapabilities(virConn *libvirt.Libvirt) (libvirtxml.Caps, error) {
var caps libvirtxml.Caps

capsBytes, err := virConn.Capabilities()
Expand All @@ -291,19 +293,25 @@ func getCapabilities(virConn *libvirt.Libvirt) (libvirtxml.Caps, error) {
func createBootstrapDomain(virConn *libvirt.Libvirt, config baremetalConfig, pool libvirt.StoragePool, volume libvirt.StorageVol) error {
bootstrapDom := newDomain(fmt.Sprintf("%s-bootstrap", config.ClusterID))
Copy link
Member

@zaneb zaneb May 14, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We're so close to being able to pass the arch to newDomain() 😜

Copy link
Member Author

@honza honza May 14, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The idea is that newDomain() returns all of the /static/ parts of the structure and then you can customize it with runtime values. 😄

Copy link
Member

@aleskandro aleskandro May 15, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

or maybe using the builder pattern :)


if bootstrapDom.OS.Type.Arch == "aarch64" {
capabilities, err := getHostCapabilities(virConn)
if err != nil {
return fmt.Errorf("failed to get libvirt capabilities: %w", err)
}

arch := capabilities.Host.CPU.Arch
bootstrapDom.OS.Type.Arch = arch

if arch == "aarch64" {
// for aarch64 speciffying this will automatically select the firmware and NVRAM file
// reference: https://libvirt.org/formatdomain.html#bios-bootloader
bootstrapDom.OS.Firmware = "efi"
}

capabilities, err := getCapabilities(virConn)
if err != nil {
return fmt.Errorf("failed to get libvirt capabilities: %w", err)
// For aarch64, s390x, ppc64 and ppc64le spice is not supported
if arch == "aarch64" || arch == "s390x" || strings.HasPrefix(arch, "ppc64") {
bootstrapDom.Devices.Graphics = nil
}

bootstrapDom.OS.Type.Arch = capabilities.Host.CPU.Arch

for _, bridge := range config.Bridges {
netIface := libvirtxml.DomainInterface{
Model: &libvirtxml.DomainInterfaceModel{
Expand Down Expand Up @@ -451,9 +459,22 @@ func destroyBootstrap(config baremetalConfig) error {
}

logrus.Debug(" Undefining domain")
err = virConn.DomainUndefine(dom)
if err != nil {
return err

if err := virConn.DomainUndefineFlags(dom, libvirt.DomainUndefineNvram|libvirt.DomainUndefineSnapshotsMetadata|libvirt.DomainUndefineManagedSave|libvirt.DomainUndefineCheckpointsMetadata); err != nil {
var libvirtErr *libvirt.Error

if !errors.As(err, &libvirtErr) {
return fmt.Errorf("failed to cast to libvirt.Error: %w", err)
}

if libvirtErr.Code == uint32(libvirt.ErrNoSupport) || libvirtErr.Code == uint32(libvirt.ErrInvalidArg) {
logrus.Printf("libvirt does not support undefine flags: will try again without flags")
if err := virConn.DomainUndefine(dom); err != nil {
return fmt.Errorf("couldn't undefine libvirt domain: %w", err)
}
} else {
return fmt.Errorf("couldn't undefine libvirt domain with flags: %w", err)
}
}

pool, err := virConn.StoragePoolLookupByName(name)
Expand Down