Skip to content

Commit 5222b14

Browse files
use kubernetes builtin corev1.Nodes instead of custom podsv1alpha1.Nodes
1 parent 5078e42 commit 5222b14

File tree

9 files changed

+44
-298
lines changed

9 files changed

+44
-298
lines changed

api/delegation/pods/messages.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ package pods
66
import (
77
"log/slog"
88

9-
podsv1alpha1 "github.com/cobaltcore-dev/cortex/api/delegation/pods/v1alpha1"
9+
corev1 "k8s.io/api/core/v1"
1010
)
1111

1212
type PodPipelineRequest struct {
1313
// The available nodes.
14-
Nodes []podsv1alpha1.Node `json:"nodes"`
14+
Nodes []corev1.Node `json:"nodes"`
1515
}
1616

1717
func (r PodPipelineRequest) GetSubjects() []string {

api/delegation/pods/v1alpha1/groupversion_info.go

Lines changed: 0 additions & 22 deletions
This file was deleted.

api/delegation/pods/v1alpha1/node_types.go

Lines changed: 0 additions & 35 deletions
This file was deleted.

api/delegation/pods/v1alpha1/pod_types.go

Lines changed: 0 additions & 47 deletions
This file was deleted.

api/delegation/pods/v1alpha1/zz_generated.deepcopy.go

Lines changed: 0 additions & 146 deletions
This file was deleted.

cmd/main.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ import (
3131
"sigs.k8s.io/controller-runtime/pkg/webhook"
3232

3333
ironcorev1alpha1 "github.com/cobaltcore-dev/cortex/api/delegation/ironcore/v1alpha1"
34-
podsv1alpha1 "github.com/cobaltcore-dev/cortex/api/delegation/pods/v1alpha1"
3534
"github.com/cobaltcore-dev/cortex/api/v1alpha1"
3635
"github.com/cobaltcore-dev/cortex/internal/knowledge/datasources"
3736
"github.com/cobaltcore-dev/cortex/internal/knowledge/datasources/openstack"
@@ -74,7 +73,6 @@ func init() {
7473

7574
utilruntime.Must(v1alpha1.AddToScheme(scheme))
7675
utilruntime.Must(ironcorev1alpha1.AddToScheme(scheme))
77-
utilruntime.Must(podsv1alpha1.AddToScheme(scheme))
7876
utilruntime.Must(corev1.AddToScheme(scheme))
7977
// +kubebuilder:scaffold:scheme
8078
}

internal/scheduling/decisions/pods/noop_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"testing"
99

1010
"github.com/cobaltcore-dev/cortex/api/delegation/pods"
11-
podsv1alpha1 "github.com/cobaltcore-dev/cortex/api/delegation/pods/v1alpha1"
11+
corev1 "k8s.io/api/core/v1"
1212
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1313
)
1414

@@ -21,14 +21,14 @@ func TestNoopFilter_Run(t *testing.T) {
2121
{
2222
name: "empty nodes",
2323
request: pods.PodPipelineRequest{
24-
Nodes: []podsv1alpha1.Node{},
24+
Nodes: []corev1.Node{},
2525
},
2626
expected: map[string]float64{},
2727
},
2828
{
2929
name: "single node",
3030
request: pods.PodPipelineRequest{
31-
Nodes: []podsv1alpha1.Node{
31+
Nodes: []corev1.Node{
3232
{
3333
ObjectMeta: metav1.ObjectMeta{Name: "node1"},
3434
},
@@ -41,7 +41,7 @@ func TestNoopFilter_Run(t *testing.T) {
4141
{
4242
name: "multiple nodes",
4343
request: pods.PodPipelineRequest{
44-
Nodes: []podsv1alpha1.Node{
44+
Nodes: []corev1.Node{
4545
{
4646
ObjectMeta: metav1.ObjectMeta{Name: "node1"},
4747
},

internal/scheduling/decisions/pods/pipeline_controller.go

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import (
1212
"time"
1313

1414
"github.com/cobaltcore-dev/cortex/api/delegation/pods"
15-
podsv1alpha1 "github.com/cobaltcore-dev/cortex/api/delegation/pods/v1alpha1"
1615
"github.com/cobaltcore-dev/cortex/api/v1alpha1"
1716
"github.com/cobaltcore-dev/cortex/pkg/conf"
1817
"github.com/cobaltcore-dev/cortex/pkg/multicluster"
@@ -68,7 +67,7 @@ func (c *DecisionPipelineController) Reconcile(ctx context.Context, req ctrl.Req
6867
return ctrl.Result{}, nil
6968
}
7069

71-
func (c *DecisionPipelineController) ProcessNewPod(ctx context.Context, pod *podsv1alpha1.Pod) error {
70+
func (c *DecisionPipelineController) ProcessNewPod(ctx context.Context, pod *corev1.Pod) error {
7271
c.processMu.Lock()
7372
defer c.processMu.Unlock()
7473

@@ -122,7 +121,7 @@ func (c *DecisionPipelineController) process(ctx context.Context, decision *v1al
122121
}
123122

124123
// Find all available nodes.
125-
nodes := &podsv1alpha1.NodeList{}
124+
nodes := &corev1.NodeList{}
126125
if err := c.List(ctx, nodes); err != nil {
127126
return err
128127
}
@@ -142,7 +141,7 @@ func (c *DecisionPipelineController) process(ctx context.Context, decision *v1al
142141
log.Info("decision processed successfully", "duration", time.Since(startedAt))
143142

144143
// Set the node name on the pod.
145-
pod := &podsv1alpha1.Pod{}
144+
pod := &corev1.Pod{}
146145
if err := c.Get(ctx, client.ObjectKey{
147146
Name: decision.Spec.PodRef.Name,
148147
Namespace: decision.Spec.PodRef.Namespace,
@@ -173,14 +172,14 @@ func (c *DecisionPipelineController) InitPipeline(
173172
func (c *DecisionPipelineController) handlePod() handler.EventHandler {
174173
return handler.Funcs{
175174
CreateFunc: func(ctx context.Context, evt event.CreateEvent, queue workqueue.TypedRateLimitingInterface[reconcile.Request]) {
176-
pod := evt.Object.(*podsv1alpha1.Pod)
175+
pod := evt.Object.(*corev1.Pod)
177176
if err := c.ProcessNewPod(ctx, pod); err != nil {
178177
log := ctrl.LoggerFrom(ctx)
179178
log.Error(err, "failed to process new pod for scheduling", "pod", pod.Name)
180179
}
181180
},
182181
UpdateFunc: func(ctx context.Context, evt event.UpdateEvent, queue workqueue.TypedRateLimitingInterface[reconcile.Request]) {
183-
newPod := evt.ObjectNew.(*podsv1alpha1.Pod)
182+
newPod := evt.ObjectNew.(*corev1.Pod)
184183
if newPod.Spec.NodeName != "" {
185184
// Pod is already scheduled, no need to create a decision.
186185
return
@@ -193,7 +192,7 @@ func (c *DecisionPipelineController) handlePod() handler.EventHandler {
193192
DeleteFunc: func(ctx context.Context, evt event.DeleteEvent, queue workqueue.TypedRateLimitingInterface[reconcile.Request]) {
194193
// Delete the associated decision(s).
195194
log := ctrl.LoggerFrom(ctx)
196-
pod := evt.Object.(*podsv1alpha1.Pod)
195+
pod := evt.Object.(*corev1.Pod)
197196
var decisions v1alpha1.DecisionList
198197
if err := c.List(ctx, &decisions); err != nil {
199198
log.Error(err, "failed to list decisions for deleted pod")
@@ -217,11 +216,11 @@ func (c *DecisionPipelineController) SetupWithManager(mgr manager.Manager, mcl *
217216
}
218217
return multicluster.BuildController(mcl, mgr).
219218
WatchesMulticluster(
220-
&podsv1alpha1.Pod{},
219+
&corev1.Pod{},
221220
c.handlePod(),
222221
// Only schedule pods that have a custom scheduler set.
223222
predicate.NewPredicateFuncs(func(obj client.Object) bool {
224-
pod := obj.(*podsv1alpha1.Pod)
223+
pod := obj.(*corev1.Pod)
225224
if pod.Spec.NodeName != "" {
226225
// Skip pods that already have a node assigned.
227226
return false

0 commit comments

Comments
 (0)