将nsid设置到命名空间
Former-commit-id: d06528b40840b4ca768a5025e16896c97ec892fd
This commit is contained in:
parent
efb461294c
commit
1e3518a14e
|
@ -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(),
|
||||
|
|
Loading…
Reference in New Issue