Skip to content

Onboarding: Replace flavor selection logic with value #272

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
fwiesel merged 1 commit into from
Mar 18, 2026
Merged

Onboarding: Replace flavor selection logic with value #272

Show file tree
Hide file tree
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
33 changes: 6 additions & 27 deletions internal/controller/onboarding_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ import (
logger "sigs.k8s.io/controller-runtime/pkg/log"

"github.com/gophercloud/gophercloud/v2"
"github.com/gophercloud/gophercloud/v2/openstack/compute/v2/flavors"
"github.com/gophercloud/gophercloud/v2/openstack/compute/v2/hypervisors"
"github.com/gophercloud/gophercloud/v2/openstack/compute/v2/servers"
"github.com/gophercloud/gophercloud/v2/openstack/compute/v2/services"
Expand All @@ -63,6 +62,7 @@ const (
type OnboardingController struct {
k8sclient.Client
Scheme *runtime.Scheme
TestFlavorID string
computeClient *gophercloud.ServiceClient
testComputeClient *gophercloud.ServiceClient
testImageClient *gophercloud.ServiceClient
Expand Down Expand Up @@ -490,10 +490,7 @@ func (r *OnboardingController) createOrGetTestServer(ctx context.Context, zone,
return foundServer, nil
}

flavorRef, err := r.findTestFlavor(ctx)
if err != nil {
return nil, err
}
flavorRef := r.TestFlavorID

imageRef, err := r.findTestImage(ctx)
if err != nil {
Expand Down Expand Up @@ -576,35 +573,17 @@ func (r *OnboardingController) findTestImage(ctx context.Context) (string, error
return "", fmt.Errorf("couldn't find image with name %v", testImageName)
}

func (r *OnboardingController) findTestFlavor(ctx context.Context) (string, error) {
flavorPages, err := flavors.ListDetail(r.testComputeClient, flavors.ListOpts{SortDir: "asc", SortKey: "memory_mb"}).AllPages(ctx)
if err != nil {
return "", err
}

extractedFlavors, err := flavors.ExtractFlavors(flavorPages)
if err != nil {
return "", err
}

for _, flavor := range extractedFlavors {
_, found := flavor.ExtraSpecs["capabilities:hypervisor_type"]
if !found {
// Flavor does not restrict the hypervisor-type
return flavor.ID, nil
}
}

return "", errors.New("couldn't find flavor")
}

func (r *OnboardingController) patchStatus(ctx context.Context, hv, base *kvmv1.Hypervisor) error {
return r.Status().Patch(ctx, hv, k8sclient.MergeFromWithOptions(base,
k8sclient.MergeFromWithOptimisticLock{}), k8sclient.FieldOwner(OnboardingControllerName))
}

// SetupWithManager sets up the controller with the Manager.
func (r *OnboardingController) SetupWithManager(mgr ctrl.Manager) error {
if r.TestFlavorID == "" {
r.TestFlavorID = "1"
}

ctx := context.Background()

var err error
Expand Down
9 changes: 1 addition & 8 deletions internal/controller/onboarding_controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,6 +220,7 @@ var _ = Describe("Onboarding Controller", func() {
onboardingReconciler = &OnboardingController{
Client: k8sClient,
Scheme: k8sClient.Scheme(),
TestFlavorID: "1",
computeClient: client.ServiceClient(fakeServer),
testComputeClient: client.ServiceClient(fakeServer),
testImageClient: client.ServiceClient(fakeServer),
Expand Down Expand Up @@ -384,14 +385,6 @@ var _ = Describe("Onboarding Controller", func() {
Expect(err).NotTo(HaveOccurred())
})

// Only needed for mocking the test
fakeServer.Mux.HandleFunc("GET /flavors/detail", func(w http.ResponseWriter, r *http.Request) {
w.Header().Add("Content-Type", "application/json")
w.WriteHeader(http.StatusOK)
_, err := fmt.Fprint(w, flavorDetailsBody)
Expect(err).NotTo(HaveOccurred())
})

fakeServer.Mux.HandleFunc("GET /images", func(w http.ResponseWriter, r *http.Request) {
w.Header().Add("Content-Type", "application/json")
w.WriteHeader(http.StatusOK)
Expand Down
Loading