Cleanup: move reservations config to reservations module

Author: PhilippMatthes

cmd/main.go

@@ -386,10 +386,11 @@ func main() {
 	if slices.Contains(config.EnabledControllers, "reservations-controller") {
 		monitor := reservationscontroller.NewControllerMonitor(multiclusterClient)
 		metrics.Registry.MustRegister(&monitor)
+		reservationsControllerConfig := conf.GetConfigOrDie[reservationscontroller.Config]()
 		if err := (&reservationscontroller.ReservationReconciler{
 			Client:           multiclusterClient,
 			Scheme:           mgr.GetScheme(),
-			Conf:             config,
+			Conf:             reservationsControllerConfig,
 			HypervisorClient: reservationscontroller.NewHypervisorClient(),
 		}).SetupWithManager(mgr, multiclusterClient); err != nil {
 			setupLog.Error(err, "unable to create controller", "controller", "Reservation")

internal/scheduling/reservations/controller/client.go

@@ -9,7 +9,6 @@ import (
 	"fmt"
 	"net/http"
 
-	"github.com/cobaltcore-dev/cortex/pkg/conf"
 	"github.com/cobaltcore-dev/cortex/pkg/keystone"
 	"github.com/cobaltcore-dev/cortex/pkg/sso"
 	"github.com/gophercloud/gophercloud/v2"
@@ -36,7 +35,7 @@ type Hypervisor struct {
 // Client to fetch hypervisor data.
 type HypervisorClient interface {
 	// Init the client.
-	Init(ctx context.Context, client client.Client, conf conf.Config) error
+	Init(ctx context.Context, client client.Client, conf Config) error
 	// List all hypervisors.
 	ListHypervisors(ctx context.Context) ([]Hypervisor, error)
 }
@@ -56,7 +55,7 @@ func NewHypervisorClient() HypervisorClient {
 }
 
 // Init the client.
-func (c *hypervisorClient) Init(ctx context.Context, client client.Client, conf conf.Config) error {
+func (c *hypervisorClient) Init(ctx context.Context, client client.Client, conf Config) error {
 	var authenticatedHTTP = http.DefaultClient
 	if conf.SSOSecretRef != nil {
 		var err error

internal/scheduling/reservations/controller/client_test.go

@@ -6,7 +6,6 @@ package controller
 import (
 	"context"
 
-	"github.com/cobaltcore-dev/cortex/pkg/conf"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 )
 
@@ -15,7 +14,7 @@ type mockHypervisorClient struct {
 	errToReturn         error
 }
 
-func (m *mockHypervisorClient) Init(ctx context.Context, client client.Client, conf conf.Config) error {
+func (m *mockHypervisorClient) Init(ctx context.Context, client client.Client, conf Config) error {
 	return nil
 }
 

internal/scheduling/reservations/controller/controller.go

@@ -23,10 +23,27 @@ import (
 
 	schedulerdelegationapi "github.com/cobaltcore-dev/cortex/api/external/nova"
 	"github.com/cobaltcore-dev/cortex/api/v1alpha1"
-	"github.com/cobaltcore-dev/cortex/pkg/conf"
 	"github.com/cobaltcore-dev/cortex/pkg/multicluster"
+	corev1 "k8s.io/api/core/v1"
 )
 
+// Endpoints for the reservations operator.
+type EndpointsConfig struct {
+	// The nova external scheduler endpoint.
+	NovaExternalScheduler string `json:"novaExternalScheduler"`
+}
+
+type Config struct {
+	// The endpoint where to find the nova external scheduler endpoint.
+	Endpoints EndpointsConfig `json:"endpoints"`
+
+	// Secret ref to SSO credentials stored in a k8s secret, if applicable.
+	SSOSecretRef *corev1.SecretReference `json:"ssoSecretRef"`
+
+	// Secret ref to keystone credentials stored in a k8s secret.
+	KeystoneSecretRef corev1.SecretReference `json:"keystoneSecretRef"`
+}
+
 // ReservationReconciler reconciles a Reservation object
 type ReservationReconciler struct {
 	// Client to fetch hypervisors.
@@ -36,7 +53,7 @@ type ReservationReconciler struct {
 	// Kubernetes scheme to use for the reservations.
 	Scheme *runtime.Scheme
 	// Configuration for the controller.
-	Conf conf.Config
+	Conf Config
 }
 
 // Reconcile is part of the main kubernetes reconciliation loop which aims to

internal/scheduling/reservations/controller/controller_test.go

@@ -19,7 +19,6 @@ import (
 
 	schedulerdelegationapi "github.com/cobaltcore-dev/cortex/api/external/nova"
 	"github.com/cobaltcore-dev/cortex/api/v1alpha1"
-	"github.com/cobaltcore-dev/cortex/pkg/conf"
 )
 
 func TestReservationReconciler_Reconcile(t *testing.T) {
@@ -185,8 +184,8 @@ func TestReservationReconciler_reconcileInstanceReservation_Success(t *testing.T
 	}))
 	defer server.Close()
 
-	config := conf.Config{
-		Endpoints: conf.EndpointsConfig{
+	config := Config{
+		Endpoints: EndpointsConfig{
 			NovaExternalScheduler: server.URL,
 		},
 	}

pkg/conf/conf.go

@@ -12,22 +12,13 @@ import (
 	corev1 "k8s.io/api/core/v1"
 )
 
-// Endpoints for the reservations operator.
-type EndpointsConfig struct {
-	// The nova external scheduler endpoint.
-	NovaExternalScheduler string `json:"novaExternalScheduler"`
-}
-
 type Config struct {
 	// The controller will only touch resources with this scheduling domain.
 	SchedulingDomain v1alpha1.SchedulingDomain `json:"schedulingDomain"`
 
 	// ID used to identify leader election participants.
 	LeaderElectionID string `json:"leaderElectionID,omitempty"`
 
-	// The endpoint where to find the nova external scheduler endpoint.
-	Endpoints EndpointsConfig `json:"endpoints"`
-
 	// Whether to disable dry-run for descheduler steps.
 	DisableDeschedulerDryRun bool `json:"disableDeschedulerDryRun"`