From 1e3518a14e4109bf61e4c22a16268515f36f1747 Mon Sep 17 00:00:00 2001 From: zhangwei <894646498@qq.com> Date: Tue, 28 Nov 2023 15:24:18 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=86nsid=E8=AE=BE=E7=BD=AE=E5=88=B0?= =?UTF-8?q?=E5=91=BD=E5=90=8D=E7=A9=BA=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Former-commit-id: d06528b40840b4ca768a5025e16896c97ec892fd --- pkg/scheduler/cloudScheduler.go | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkg/scheduler/cloudScheduler.go b/pkg/scheduler/cloudScheduler.go index 05ac4d6d..df15875e 100644 --- a/pkg/scheduler/cloudScheduler.go +++ b/pkg/scheduler/cloudScheduler.go @@ -55,7 +55,7 @@ func (cs *cloudScheduler) getNewStructForDb(task *response.TaskInfo, participant if err != nil { return nil, err } - cloud := cs.UnMarshalK8sStruct(string(bytes), task.TaskId) + cloud := cs.UnMarshalK8sStruct(string(bytes), task.TaskId, task.NsID) switch cloud.Kind { case "Deployment": deployment := v1.Deployment{} @@ -78,7 +78,7 @@ func (cs *cloudScheduler) getNewStructForDb(task *response.TaskInfo, participant return cloud, nil } -func (cs *cloudScheduler) UnMarshalK8sStruct(yamlString string, taskId int64) models.Cloud { +func (cs *cloudScheduler) UnMarshalK8sStruct(yamlString string, taskId int64, nsID string) models.Cloud { var cloud models.Cloud d := kyaml.NewYAMLOrJSONDecoder(bytes.NewBufferString(yamlString), 4096) var err error @@ -100,6 +100,9 @@ func (cs *cloudScheduler) UnMarshalK8sStruct(yamlString string, taskId int64) mo } unstructureObj := &unstructured.Unstructured{Object: unstructuredMap} + if len(nsID) != 0 { + unstructureObj.SetNamespace(nsID) + } cloud = models.Cloud{ TaskId: taskId, ApiVersion: unstructureObj.GetAPIVersion(),