Skip to content
This repository has been archived by the owner on Dec 14, 2022. It is now read-only.

Implement LoadBalancer controller #77

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Implement LoadBalancer controller #77

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
2 changes: 1 addition & 1 deletion api/compute/client/index/index.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
"context"
"fmt"

computev1alpha1 "github.com/onmetal/onmetal-api/apis/compute/v1alpha1"
computev1alpha1 "github.com/onmetal/onmetal-api/api/compute/v1alpha1"
"github.com/onmetal/poollet/api/compute/index/fields"
"sigs.k8s.io/controller-runtime/pkg/client"
)
Expand Down
2 changes: 1 addition & 1 deletion api/compute/dependent/dependent.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ package dependent
import (
"context"

computev1alpha1 "github.com/onmetal/onmetal-api/apis/compute/v1alpha1"
computev1alpha1 "github.com/onmetal/onmetal-api/api/compute/v1alpha1"
computehelper "github.com/onmetal/poollet/api/compute/helper"
computeindex "github.com/onmetal/poollet/api/compute/index"
computefields "github.com/onmetal/poollet/api/compute/index/fields"
Expand Down
7 changes: 3 additions & 4 deletions api/compute/helper/helper.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@
package helper

import (
computev1alpha1 "github.com/onmetal/onmetal-api/apis/compute/v1alpha1"
"github.com/onmetal/onmetal-api/controllers/shared"
computev1alpha1 "github.com/onmetal/onmetal-api/api/compute/v1alpha1"
"k8s.io/apimachinery/pkg/util/sets"
)

Expand All @@ -42,11 +41,11 @@ func AndMachinePredicate(predicates ...MachinePredicate) MachinePredicate {
}

func MachineSpecVolumeNames(machine *computev1alpha1.Machine) sets.String {
return shared.MachineSpecVolumeNames(machine)
return sets.NewString(computev1alpha1.MachineVolumeNames(machine)...)
}

func MachineSpecNetworkInterfaceNames(machine *computev1alpha1.Machine) sets.String {
return shared.MachineSpecNetworkInterfaceNames(machine)
return sets.NewString(computev1alpha1.MachineNetworkInterfaceNames(machine)...)
}

func MachineSpecReferencesNetworkInterfaceName(machine *computev1alpha1.Machine, nicName string) bool {
Expand Down
2 changes: 1 addition & 1 deletion api/compute/index/index.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ package index
import (
"context"

computev1alpha1 "github.com/onmetal/onmetal-api/apis/compute/v1alpha1"
computev1alpha1 "github.com/onmetal/onmetal-api/api/compute/v1alpha1"
"github.com/onmetal/poollet/api/compute/helper"
"github.com/onmetal/poollet/api/compute/index/fields"
"sigs.k8s.io/controller-runtime/pkg/client"
Expand Down
2 changes: 1 addition & 1 deletion api/compute/predicate/predicate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
package predicate

import (
computev1alpha1 "github.com/onmetal/onmetal-api/apis/compute/v1alpha1"
computev1alpha1 "github.com/onmetal/onmetal-api/api/compute/v1alpha1"
"github.com/onmetal/poollet/api/compute/helper"
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/predicate"
Expand Down
2 changes: 1 addition & 1 deletion api/networking/client/index/index.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
"context"
"fmt"

networkingv1alpha1 "github.com/onmetal/onmetal-api/apis/networking/v1alpha1"
networkingv1alpha1 "github.com/onmetal/onmetal-api/api/networking/v1alpha1"
"github.com/onmetal/poollet/api/networking/index/fields"
"sigs.k8s.io/controller-runtime/pkg/client"
)
Expand Down
4 changes: 2 additions & 2 deletions api/networking/controller/controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ import (
"context"
"fmt"

computev1alpha1 "github.com/onmetal/onmetal-api/apis/compute/v1alpha1"
networkingv1alpha1 "github.com/onmetal/onmetal-api/apis/networking/v1alpha1"
computev1alpha1 "github.com/onmetal/onmetal-api/api/compute/v1alpha1"
networkingv1alpha1 "github.com/onmetal/onmetal-api/api/networking/v1alpha1"
computehelper "github.com/onmetal/poollet/api/compute/helper"
networkingindexclient "github.com/onmetal/poollet/api/networking/client/index"
networkinghelper "github.com/onmetal/poollet/api/networking/helper"
Expand Down
2 changes: 1 addition & 1 deletion api/networking/helper/helper.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

package helper

import networkingv1alpha1 "github.com/onmetal/onmetal-api/apis/networking/v1alpha1"
import networkingv1alpha1 "github.com/onmetal/onmetal-api/api/networking/v1alpha1"

func NetworkInterfaceReferencesNetworkName(nic *networkingv1alpha1.NetworkInterface, networkName string) bool {
return nic.Spec.NetworkRef.Name == networkName
Expand Down
2 changes: 1 addition & 1 deletion api/networking/index/index.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ package index
import (
"context"

networkingv1alpha1 "github.com/onmetal/onmetal-api/apis/networking/v1alpha1"
networkingv1alpha1 "github.com/onmetal/onmetal-api/api/networking/v1alpha1"
"github.com/onmetal/poollet/api/networking/helper"
"github.com/onmetal/poollet/api/networking/index/fields"
"sigs.k8s.io/controller-runtime/pkg/client"
Expand Down
2 changes: 1 addition & 1 deletion api/storage/client/index/index.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
"context"
"fmt"

storagev1alpha1 "github.com/onmetal/onmetal-api/apis/storage/v1alpha1"
storagev1alpha1 "github.com/onmetal/onmetal-api/api/storage/v1alpha1"
"github.com/onmetal/poollet/api/storage/index/fields"
"sigs.k8s.io/controller-runtime/pkg/client"
)
Expand Down
9 changes: 4 additions & 5 deletions api/storage/controller/controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,8 @@ package controller
import (
"context"

computev1alpha1 "github.com/onmetal/onmetal-api/apis/compute/v1alpha1"
storagev1alpha1 "github.com/onmetal/onmetal-api/apis/storage/v1alpha1"
"github.com/onmetal/onmetal-api/controllers/shared"
computev1alpha1 "github.com/onmetal/onmetal-api/api/compute/v1alpha1"
storagev1alpha1 "github.com/onmetal/onmetal-api/api/storage/v1alpha1"
computehelper "github.com/onmetal/poollet/api/compute/helper"
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/reconcile"
Expand Down Expand Up @@ -72,9 +71,9 @@ func IsVolumeUsedCachedOrLive(ctx context.Context, r client.Reader, c client.Cli
}

func VolumeReconcileRequestsFromMachine(machine *computev1alpha1.Machine) []reconcile.Request {
volumeNames := shared.MachineSpecVolumeNames(machine)
volumeNames := computev1alpha1.MachineVolumeNames(machine)
res := make([]reconcile.Request, 0, len(volumeNames))
for volumeName := range volumeNames {
for _, volumeName := range volumeNames {
res = append(res, reconcile.Request{NamespacedName: client.ObjectKey{Namespace: machine.Namespace, Name: volumeName}})
}
return res
Expand Down
2 changes: 1 addition & 1 deletion api/storage/dependent/dependent.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ package dependent
import (
"context"

storagev1alpha1 "github.com/onmetal/onmetal-api/apis/storage/v1alpha1"
storagev1alpha1 "github.com/onmetal/onmetal-api/api/storage/v1alpha1"
"github.com/onmetal/poollet/api/storage/controller"
storagehelper "github.com/onmetal/poollet/api/storage/helper"
storageindex "github.com/onmetal/poollet/api/storage/index"
Expand Down
2 changes: 1 addition & 1 deletion api/storage/helper/helper.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

package helper

import storagev1alpha1 "github.com/onmetal/onmetal-api/apis/storage/v1alpha1"
import storagev1alpha1 "github.com/onmetal/onmetal-api/api/storage/v1alpha1"

func VolumeRunsInVolumePool(volume *storagev1alpha1.Volume, poolName string) bool {
volumePoolRef := volume.Spec.VolumePoolRef
Expand Down
2 changes: 1 addition & 1 deletion api/storage/index/index.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ package index
import (
"context"

storagev1alpha1 "github.com/onmetal/onmetal-api/apis/storage/v1alpha1"
storagev1alpha1 "github.com/onmetal/onmetal-api/api/storage/v1alpha1"
"github.com/onmetal/poollet/api/storage/helper"
"github.com/onmetal/poollet/api/storage/index/fields"
"sigs.k8s.io/controller-runtime/pkg/client"
Expand Down
2 changes: 1 addition & 1 deletion api/storage/predicate/predicate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
package predicate

import (
storagev1alpha1 "github.com/onmetal/onmetal-api/apis/storage/v1alpha1"
storagev1alpha1 "github.com/onmetal/onmetal-api/api/storage/v1alpha1"
"github.com/onmetal/poollet/api/storage/helper"
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/predicate"
Expand Down
8 changes: 4 additions & 4 deletions broker/controllers/compute/compute_suite_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ import (

"github.com/onmetal/controller-utils/buildutils"
"github.com/onmetal/controller-utils/modutils"
computev1alpha1 "github.com/onmetal/onmetal-api/apis/compute/v1alpha1"
"github.com/onmetal/onmetal-api/envtestutils"
"github.com/onmetal/onmetal-api/envtestutils/apiserver"
computev1alpha1 "github.com/onmetal/onmetal-api/api/compute/v1alpha1"
"github.com/onmetal/onmetal-api/testutils/envtestutils"
"github.com/onmetal/onmetal-api/testutils/envtestutils/apiserver"
computeindex "github.com/onmetal/poollet/api/compute/index"
"github.com/onmetal/poollet/broker"
brokercluster "github.com/onmetal/poollet/broker/cluster"
Expand Down Expand Up @@ -120,7 +120,7 @@ var _ = BeforeSuite(func() {
SetClient(k8sClient)

apiSrv, err := apiserver.New(cfg, apiserver.Options{
MainPath: "github.com/onmetal/onmetal-api/cmd/apiserver",
MainPath: "github.com/onmetal/onmetal-api/onmetal-apiserver/cmd/apiserver",
BuildOptions: []buildutils.BuildOption{buildutils.ModModeMod},
ETCDServers: []string{testEnv.ControlPlane.Etcd.URL.String()},
Host: testEnvExt.APIServiceInstallOptions.LocalServingHost,
Expand Down
23 changes: 11 additions & 12 deletions broker/controllers/compute/machine_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,10 @@ import (

"github.com/go-logr/logr"
"github.com/onmetal/controller-utils/clientutils"
commonv1alpha1 "github.com/onmetal/onmetal-api/apis/common/v1alpha1"
computev1alpha1 "github.com/onmetal/onmetal-api/apis/compute/v1alpha1"
networkingv1alpha1 "github.com/onmetal/onmetal-api/apis/networking/v1alpha1"
storagev1alpha1 "github.com/onmetal/onmetal-api/apis/storage/v1alpha1"
"github.com/onmetal/onmetal-api/controllers/shared"
commonv1alpha1 "github.com/onmetal/onmetal-api/api/common/v1alpha1"
computev1alpha1 "github.com/onmetal/onmetal-api/api/compute/v1alpha1"
networkingv1alpha1 "github.com/onmetal/onmetal-api/api/networking/v1alpha1"
storagev1alpha1 "github.com/onmetal/onmetal-api/api/storage/v1alpha1"
computehelper "github.com/onmetal/poollet/api/compute/helper"
computefields "github.com/onmetal/poollet/api/compute/index/fields"
"github.com/onmetal/poollet/broker"
Expand Down Expand Up @@ -239,8 +238,8 @@ func (r *MachineReconciler) registerIgnitionMutation(ctx context.Context, machin

b.Add(func() {
target.Spec.IgnitionRef = &commonv1alpha1.SecretKeySelector{
LocalObjectReference: corev1.LocalObjectReference{Name: targetIgnition.Name},
Key: ignitionRef.Key,
Name: targetIgnition.Name,
Key: ignitionRef.Key,
}
})
return nil
Expand All @@ -260,7 +259,7 @@ func (r *MachineReconciler) machineVolumeName(machine *computev1alpha1.Machine,
return machineVolume.VolumeRef.Name
}

return shared.MachineEphemeralVolumeName(machine.Name, machineVolume.Name)
return computev1alpha1.MachineEphemeralVolumeName(machine.Name, machineVolume.Name)
}

func (r *MachineReconciler) targetVolumeSource(ctx context.Context, machine *computev1alpha1.Machine, machineVolume *computev1alpha1.Volume) (src *computev1alpha1.VolumeSource, ok bool, warning string, err error) {
Expand Down Expand Up @@ -353,15 +352,15 @@ func (r *MachineReconciler) findMachineNetworkInterfaceStatus(machine *computev1
return computev1alpha1.NetworkInterfaceStatus{}, false
}

func (r *MachineReconciler) machineNetworkInterfaceName(machine *computev1alpha1.Machine, machineNic *computev1alpha1.NetworkInterface) string {
func (r *MachineReconciler) machineNetworkInterfaceName(machine *computev1alpha1.Machine, machineNic computev1alpha1.NetworkInterface) string {
if machineNic.NetworkInterfaceRef != nil {
return machineNic.NetworkInterfaceRef.Name
}

return shared.MachineEphemeralNetworkInterfaceName(machine.Name, machineNic.Name)
return computev1alpha1.MachineNetworkInterfaceName(machine.Name, machineNic)
}

func (r *MachineReconciler) targetNetworkInterfaceSource(ctx context.Context, machine, target *computev1alpha1.Machine, machineNic *computev1alpha1.NetworkInterface) (src *computev1alpha1.NetworkInterfaceSource, ok bool, warning string, err error) {
func (r *MachineReconciler) targetNetworkInterfaceSource(ctx context.Context, machine, target *computev1alpha1.Machine, machineNic computev1alpha1.NetworkInterface) (src *computev1alpha1.NetworkInterfaceSource, ok bool, warning string, err error) {
switch {
case machineNic.NetworkInterfaceRef != nil || machineNic.Ephemeral != nil:
status, ok := r.findMachineNetworkInterfaceStatus(machine, machineNic.Name)
Expand Down Expand Up @@ -400,7 +399,7 @@ func (r *MachineReconciler) registerNetworkInterfacesMutation(ctx context.Contex
warnings []string
)
for _, machineNic := range machine.Spec.NetworkInterfaces {
src, ok, warning, err := r.targetNetworkInterfaceSource(ctx, machine, target, &machineNic)
src, ok, warning, err := r.targetNetworkInterfaceSource(ctx, machine, target, machineNic)
if err != nil {
return fmt.Errorf("[network interface %s] %w", machineNic.Name, err)
}
Expand Down
2 changes: 1 addition & 1 deletion broker/controllers/compute/machinepool_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (

"github.com/go-logr/logr"
"github.com/onmetal/controller-utils/clientutils"
computev1alpha1 "github.com/onmetal/onmetal-api/apis/compute/v1alpha1"
computev1alpha1 "github.com/onmetal/onmetal-api/api/compute/v1alpha1"
computeindexclient "github.com/onmetal/poollet/api/compute/client/index"
computepredicate "github.com/onmetal/poollet/api/compute/predicate"
"github.com/onmetal/poollet/broker"
Expand Down
2 changes: 1 addition & 1 deletion broker/controllers/compute/machinepool_controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
package compute_test

import (
computev1alpha1 "github.com/onmetal/onmetal-api/apis/compute/v1alpha1"
computev1alpha1 "github.com/onmetal/onmetal-api/api/compute/v1alpha1"
. "github.com/onmetal/onmetal-api/testutils"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
Expand Down
6 changes: 3 additions & 3 deletions broker/controllers/networking/aliasprefix_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ import (

"github.com/go-logr/logr"
"github.com/onmetal/controller-utils/clientutils"
commonv1alpha1 "github.com/onmetal/onmetal-api/apis/common/v1alpha1"
computev1alpha1 "github.com/onmetal/onmetal-api/apis/compute/v1alpha1"
networkingv1alpha1 "github.com/onmetal/onmetal-api/apis/networking/v1alpha1"
commonv1alpha1 "github.com/onmetal/onmetal-api/api/common/v1alpha1"
computev1alpha1 "github.com/onmetal/onmetal-api/api/compute/v1alpha1"
networkingv1alpha1 "github.com/onmetal/onmetal-api/api/networking/v1alpha1"
computehelper "github.com/onmetal/poollet/api/compute/helper"
networkingctrl "github.com/onmetal/poollet/api/networking/controller"
"github.com/onmetal/poollet/broker"
Expand Down
2 changes: 1 addition & 1 deletion broker/controllers/networking/network_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (

"github.com/go-logr/logr"
"github.com/onmetal/controller-utils/clientutils"
networkingv1alpha1 "github.com/onmetal/onmetal-api/apis/networking/v1alpha1"
networkingv1alpha1 "github.com/onmetal/onmetal-api/api/networking/v1alpha1"
networkingctrl "github.com/onmetal/poollet/api/networking/controller"
"github.com/onmetal/poollet/broker"
brokerclient "github.com/onmetal/poollet/broker/client"
Expand Down
6 changes: 3 additions & 3 deletions broker/controllers/networking/networkinterface_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ import (

"github.com/go-logr/logr"
"github.com/onmetal/controller-utils/clientutils"
commonv1alpha1 "github.com/onmetal/onmetal-api/apis/common/v1alpha1"
computev1alpha1 "github.com/onmetal/onmetal-api/apis/compute/v1alpha1"
networkingv1alpha1 "github.com/onmetal/onmetal-api/apis/networking/v1alpha1"
commonv1alpha1 "github.com/onmetal/onmetal-api/api/common/v1alpha1"
computev1alpha1 "github.com/onmetal/onmetal-api/api/compute/v1alpha1"
networkingv1alpha1 "github.com/onmetal/onmetal-api/api/networking/v1alpha1"
computehelper "github.com/onmetal/poollet/api/compute/helper"
computepredicate "github.com/onmetal/poollet/api/compute/predicate"
networkingctrl "github.com/onmetal/poollet/api/networking/controller"
Expand Down
4 changes: 2 additions & 2 deletions broker/controllers/networking/virtualip_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ import (

"github.com/go-logr/logr"
"github.com/onmetal/controller-utils/clientutils"
commonv1alpha1 "github.com/onmetal/onmetal-api/apis/common/v1alpha1"
networkingv1alpha1 "github.com/onmetal/onmetal-api/apis/networking/v1alpha1"
commonv1alpha1 "github.com/onmetal/onmetal-api/api/common/v1alpha1"
networkingv1alpha1 "github.com/onmetal/onmetal-api/api/networking/v1alpha1"
networkingctrl "github.com/onmetal/poollet/api/networking/controller"
networkingfields "github.com/onmetal/poollet/api/networking/index/fields"
"github.com/onmetal/poollet/broker"
Expand Down
8 changes: 4 additions & 4 deletions broker/controllers/storage/storage_suite_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ import (

"github.com/onmetal/controller-utils/buildutils"
"github.com/onmetal/controller-utils/modutils"
storagev1alpha1 "github.com/onmetal/onmetal-api/apis/storage/v1alpha1"
"github.com/onmetal/onmetal-api/envtestutils"
"github.com/onmetal/onmetal-api/envtestutils/apiserver"
storagev1alpha1 "github.com/onmetal/onmetal-api/api/storage/v1alpha1"
"github.com/onmetal/onmetal-api/testutils/envtestutils"
"github.com/onmetal/onmetal-api/testutils/envtestutils/apiserver"
storageindex "github.com/onmetal/poollet/api/storage/index"
"github.com/onmetal/poollet/broker"
brokercluster "github.com/onmetal/poollet/broker/cluster"
Expand Down Expand Up @@ -120,7 +120,7 @@ var _ = BeforeSuite(func() {
SetClient(k8sClient)

apiSrv, err := apiserver.New(cfg, apiserver.Options{
MainPath: "github.com/onmetal/onmetal-api/cmd/apiserver",
MainPath: "github.com/onmetal/onmetal-api/onmetal-apiserver/cmd/apiserver",
BuildOptions: []buildutils.BuildOption{buildutils.ModModeMod},
ETCDServers: []string{testEnv.ControlPlane.Etcd.URL.String()},
Host: testEnvExt.APIServiceInstallOptions.LocalServingHost,
Expand Down
6 changes: 3 additions & 3 deletions broker/controllers/storage/volume.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ import (
"github.com/go-logr/logr"
"github.com/onmetal/controller-utils/clientutils"
"github.com/onmetal/controller-utils/metautils"
commonv1alpha1 "github.com/onmetal/onmetal-api/apis/common/v1alpha1"
computev1alpha1 "github.com/onmetal/onmetal-api/apis/compute/v1alpha1"
storagev1alpha1 "github.com/onmetal/onmetal-api/apis/storage/v1alpha1"
commonv1alpha1 "github.com/onmetal/onmetal-api/api/common/v1alpha1"
computev1alpha1 "github.com/onmetal/onmetal-api/api/compute/v1alpha1"
storagev1alpha1 "github.com/onmetal/onmetal-api/api/storage/v1alpha1"
brokerclient "github.com/onmetal/poollet/broker/client"
"github.com/onmetal/poollet/broker/domain"
brokererrors "github.com/onmetal/poollet/broker/errors"
Expand Down
2 changes: 1 addition & 1 deletion broker/controllers/storage/volumepool_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (

"github.com/go-logr/logr"
"github.com/onmetal/controller-utils/clientutils"
storagev1alpha1 "github.com/onmetal/onmetal-api/apis/storage/v1alpha1"
storagev1alpha1 "github.com/onmetal/onmetal-api/api/storage/v1alpha1"
storageindexclient "github.com/onmetal/poollet/api/storage/client/index"
storagepredicate "github.com/onmetal/poollet/api/storage/predicate"
"github.com/onmetal/poollet/broker"
Expand Down
2 changes: 1 addition & 1 deletion broker/controllers/storage/volumepool_controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
package storage_test

import (
storagev1alpha1 "github.com/onmetal/onmetal-api/apis/storage/v1alpha1"
storagev1alpha1 "github.com/onmetal/onmetal-api/api/storage/v1alpha1"
. "github.com/onmetal/onmetal-api/testutils"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
Expand Down
Loading