github/kubevela
1
0
Fork 0
mirror of https://github.com/kubevela/kubevela.git synced 2026-08-18 03:56:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Feat: apply-component supports namespace (#6228)

Browse Source 
* Feat: apply-component supports namespace

Signed-off-by: wuzhongjian <wuzhongjian_yewu@cmss.chinamobile.com>

* Feat: apply-component supports namespace

Signed-off-by: wuzhongjian <wuzhongjian_yewu@cmss.chinamobile.com>

---------

Signed-off-by: wuzhongjian <wuzhongjian_yewu@cmss.chinamobile.com>
This commit is contained in:
JohnJan
2023-07-25 10:31:18 +08:00
committed by GitHub
parent ef8b0ac00f
commit f0357fdc8f
5 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/controller/core.oam.dev/v1beta1/application/generator.go
+7 -2
View File
@@ -252,6 +252,7 @@ func convertStepProperties(step *workflowv1alpha1.WorkflowStep, app *v1beta1.App
o := struct {
Component string `json:"component"`
Cluster string `json:"cluster"`
Namespace string `json:"namespace"`
}{}
js, err := common.RawExtensionPointer{RawExtension: step.Properties}.MarshalJSON()
if err != nil {
@@ -260,6 +261,9 @@ func convertStepProperties(step *workflowv1alpha1.WorkflowStep, app *v1beta1.App
if err := json.Unmarshal(js, &o); err != nil {
return err
}
if len(o.Namespace) == 0 {
o.Namespace = app.Namespace
}
var componentNames []string
for _, c := range app.Spec.Components {
@@ -288,8 +292,9 @@ func convertStepProperties(step *workflowv1alpha1.WorkflowStep, app *v1beta1.App
c.Outputs = nil
c.DependsOn = nil
stepProperties := map[string]interface{}{
"value": c,
"cluster": o.Cluster,
"value": c,
"cluster": o.Cluster,
"namespace": o.Namespace,
}
step.Properties = util.Object2RawExtension(stepProperties)
return nil