From a2b4436ca6a913fd861fe6652b0b0389e3ea93a9 Mon Sep 17 00:00:00 2001 From: bjwswang Date: Mon, 22 Jan 2024 10:21:07 +0000 Subject: [PATCH] fix: replce comma with underline in woker's model label Signed-off-by: bjwswang --- apiserver/pkg/worker/worker.go | 3 ++- controllers/base/worker_controller.go | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/apiserver/pkg/worker/worker.go b/apiserver/pkg/worker/worker.go index fd82b7d0c..e744a6db1 100644 --- a/apiserver/pkg/worker/worker.go +++ b/apiserver/pkg/worker/worker.go @@ -20,6 +20,7 @@ import ( "context" "fmt" "strconv" + "strings" "github.com/pkg/errors" v1 "k8s.io/api/core/v1" @@ -130,7 +131,7 @@ func Worker2model(ctx context.Context, c dynamic.Interface, obj *unstructured.Un API: new(string), } if r := worker.Labels[v1alpha1.WorkerModelTypesLabel]; r != "" { - w.ModelTypes = r + w.ModelTypes = strings.ReplaceAll(r,"_",",") } // read worker's models diff --git a/controllers/base/worker_controller.go b/controllers/base/worker_controller.go index 3998fb3be..62f84a941 100644 --- a/controllers/base/worker_controller.go +++ b/controllers/base/worker_controller.go @@ -19,6 +19,7 @@ package controllers import ( "context" "reflect" + "strings" "github.com/go-logr/logr" "github.com/pkg/errors" @@ -161,8 +162,9 @@ func (r *WorkerReconciler) initialize(ctx context.Context, logger logr.Logger, i if err := r.Client.Get(ctx, types.NamespacedName{Namespace: ns, Name: instance.Spec.Model.Name}, &m); err != nil { return true, err } - if types, ok := instance.Labels[arcadiav1alpha1.WorkerModelTypesLabel]; !ok || types != m.Spec.Types { - instance.Labels[arcadiav1alpha1.WorkerModelTypesLabel] = m.Spec.Types + if types, ok := instanceDeepCopy.Labels[arcadiav1alpha1.WorkerModelTypesLabel]; !ok || types != m.Spec.Types { + // label do not accept `,`,so replace it with `_` + instanceDeepCopy.Labels[arcadiav1alpha1.WorkerModelTypesLabel] = strings.ReplaceAll(m.Spec.Types,",","_") update = true } } else {