[Feature] [ML] Use Scheduler API (#1620)

CHANGELOG.md

@@ -4,6 +4,7 @@
 - (Feature) Add Core fields to the Scheduler Container Spec
 - (Feature) Add Metadata fields to the Scheduler Pod Spec
 - (Feature) Extend Backup Details in DebugPackage
+- (Feature) (ML) Use Scheduler API
 
 ## [1.2.39](https://github.com/arangodb/kube-arangodb/tree/1.2.39) (2024-03-11)
 - (Feature) Extract Scheduler API

pkg/apis/scheduler/v1alpha1/profile_template.go

@@ -23,6 +23,7 @@ package v1alpha1
 import (
 	schedulerPodApi "github.com/arangodb/kube-arangodb/pkg/apis/scheduler/v1alpha1/pod"
 	shared "github.com/arangodb/kube-arangodb/pkg/apis/shared"
+	"github.com/arangodb/kube-arangodb/pkg/util"
 )
 
 type ProfileTemplate struct {
@@ -33,6 +34,50 @@ type ProfileTemplate struct {
 	Container *ProfileContainerTemplate `json:"container,omitempty"`
 }
 
+func (p *ProfileTemplate) GetPod() *schedulerPodApi.Pod {
+	if p == nil || p.Pod == nil {
+		return nil
+	}
+
+	return p.Pod
+}
+
+func (p *ProfileTemplate) GetContainer() *ProfileContainerTemplate {
+	if p == nil || p.Container == nil {
+		return nil
+	}
+
+	return p.Container
+}
+
+func (p *ProfileTemplate) GetPriority() int {
+	if p == nil || p.Priority == nil {
+		return 0
+	}
+
+	return *p.Priority
+}
+
+func (p *ProfileTemplate) With(other *ProfileTemplate) *ProfileTemplate {
+	if p == nil && other == nil {
+		return nil
+	}
+
+	if p == nil {
+		return other.DeepCopy()
+	}
+
+	if other == nil {
+		return p.DeepCopy()
+	}
+
+	return &ProfileTemplate{
+		Priority:  util.NewType(max(p.GetPriority(), other.GetPriority())),
+		Pod:       p.Pod.With(other.Pod),
+		Container: p.Container.With(other.Container),
+	}
+}
+
 func (p *ProfileTemplate) Validate() error {
 	if p == nil {
 		return nil

pkg/apis/scheduler/v1alpha1/profile_templates.go

@@ -25,15 +25,14 @@ import (
 
 	core "k8s.io/api/core/v1"
 
-	"github.com/arangodb/kube-arangodb/pkg/util"
 	"github.com/arangodb/kube-arangodb/pkg/util/errors"
 )
 
 type ProfileTemplates []*ProfileTemplate
 
 func (p ProfileTemplates) Sort() ProfileTemplates {
 	sort.Slice(p, func(i, j int) bool {
-		if a, b := util.WithDefault(p[i].Priority), util.WithDefault(p[j].Priority); a != b {
+		if a, b := p[i].GetPriority(), p[j].GetPriority(); a != b {
 			return a < b
 		}
 
@@ -43,26 +42,32 @@ func (p ProfileTemplates) Sort() ProfileTemplates {
 	return p
 }
 
+func (p ProfileTemplates) Merge() *ProfileTemplate {
+	var z *ProfileTemplate
+
+	for _, q := range p {
+		z = z.With(q)
+	}
+
+	return z
+}
+
 func (p ProfileTemplates) RenderOnTemplate(pod *core.PodTemplateSpec) error {
+	t := p.Merge()
+
 	// Apply Pod Spec
-	for id := range p {
-		if err := p[id].Pod.Apply(pod); err != nil {
-			return errors.Wrapf(err, "Error while rendering Pod for %d", id)
-		}
+	if err := t.GetPod().Apply(pod); err != nil {
+		return errors.Wrapf(err, "Error while rendering Pod")
 	}
 
 	// Apply Generic Containers Spec
-	for id := range p {
-		if err := p[id].Container.ApplyGeneric(pod); err != nil {
-			return errors.Wrapf(err, "Error while rendering Pod for %d", id)
-		}
+	if err := t.GetContainer().ApplyGeneric(pod); err != nil {
+		return errors.Wrapf(err, "Error while rendering Pod")
 	}
 
 	// Apply Containers Spec
-	for id := range p {
-		if err := p[id].Container.ApplyContainers(pod); err != nil {
-			return errors.Wrapf(err, "Error while rendering Pod for %d", id)
-		}
+	if err := t.GetContainer().ApplyContainers(pod); err != nil {
+		return errors.Wrapf(err, "Error while rendering Pod")
 	}
 
 	return nil

pkg/operatorV2/operator_worker.go

@@ -23,6 +23,7 @@ package operator
 import (
 	"context"
 	"fmt"
+	"runtime/debug"
 
 	"github.com/arangodb/kube-arangodb/pkg/operatorV2/operation"
 	"github.com/arangodb/kube-arangodb/pkg/util/errors"
@@ -52,6 +53,10 @@ func (o *operator) processNextItem() bool {
 				e.Interface("err", obj)
 			}
 
+			if v := debug.Stack(); len(v) != 0 {
+				e = e.Str("stack", string(v))
+			}
+
 			e.Error("Recovered from panic")
 		}
 	}()

pkg/util/k8sutil/helpers/service_account.go

@@ -383,12 +383,3 @@ func EnsureServiceAccount(ctx context.Context, client kubernetes.Interface, owne
 
 	return false, nil
 }
-
-func AppendServiceAccount(obj *sharedApi.ServiceAccount, spec *core.PodTemplateSpec) {
-	if obj == nil || obj.Object == nil || spec == nil {
-		return
-	}
-
-	spec.Spec.ServiceAccountName = obj.Object.GetName()
-	spec.Spec.AutomountServiceAccountToken = util.NewType(true)
-}