github/kubevela
1
0
Fork 0
mirror of https://github.com/kubevela/kubevela.git synced 2026-08-27 16:17:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix: fix workflowstep depends-on-app (#2723)

Browse Source 
Co-authored-by: yangsoon <songyang.song@alibaba-inc.com>
This commit is contained in:
yangsoon
2021-11-16 22:48:26 +08:00
committed by GitHub
co-authored by yangsoon
parent 061c061867
commit 0673bc9cd5
3 changed files with 27 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
charts/vela-core/templates/defwithtemplate/depends-on-app.yaml
+9 -10
View File
@@ -27,7 +27,7 @@ spec:
}
}
load: op.#Steps & {
if dependsOn.err != _|_ && dependsOn.value == _|_ {
if dependsOn.err != _|_ {
configMap: op.#Read & {
value: {
apiVersion: "v1"
@@ -37,18 +37,17 @@ spec:
namespace: parameter.namespace
}
}
}
apply: op.#Apply & {
value: {
yaml.Unmarshal(configMap.value.data[parameter.name])
}
}
} @step(1)
template: configMap.value.data["application"]
apply: op.#Apply & {
value: yaml.Unmarshal(template)
} @step(2)
wait: op.#ConditionalWait & {
continue: load.apply.value.status.status == "running"
}
continue: apply.value.status.status == "running"
} @step(3)
}
if dependsOn.value != _|_ {
if dependsOn.err == _|_ {
wait: op.#ConditionalWait & {
continue: dependsOn.value.status.status == "running"
}
charts/vela-minimal/templates/defwithtemplate/depends-on-app.yaml
+9 -10
View File
@@ -27,7 +27,7 @@ spec:
}
}
load: op.#Steps & {
if dependsOn.err != _|_ && dependsOn.value == _|_ {
if dependsOn.err != _|_ {
configMap: op.#Read & {
value: {
apiVersion: "v1"
@@ -37,18 +37,17 @@ spec:
namespace: parameter.namespace
}
}
}
apply: op.#Apply & {
value: {
yaml.Unmarshal(configMap.value.data[parameter.name])
}
}
} @step(1)
template: configMap.value.data["application"]
apply: op.#Apply & {
value: yaml.Unmarshal(template)
} @step(2)
wait: op.#ConditionalWait & {
continue: load.apply.value.status.status == "running"
}
continue: apply.value.status.status == "running"
} @step(3)
}
if dependsOn.value != _|_ {
if dependsOn.err == _|_ {
wait: op.#ConditionalWait & {
continue: dependsOn.value.status.status == "running"
}
vela-templates/definitions/internal/depends-on-app.cue
+9 -12
View File
@@ -21,9 +21,8 @@ template: {
}
}
}
load: op.#Steps & {
if dependsOn.err != _|_ && dependsOn.value == _|_ {
if dependsOn.err != _|_ {
configMap: op.#Read & {
value: {
apiVersion: "v1"
@@ -33,24 +32,22 @@ template: {
namespace: parameter.namespace
}
}
}
apply: op.#Apply & {
value: {
yaml.Unmarshal(configMap.value.data[parameter.name])
}
}
} @step(1)
template: configMap.value.data["application"]
apply: op.#Apply & {
value: yaml.Unmarshal(template)
} @step(2)
wait: op.#ConditionalWait & {
continue: load.apply.value.status.status == "running"
}
continue: apply.value.status.status == "running"
} @step(3)
}
if dependsOn.value != _|_ {
if dependsOn.err == _|_ {
wait: op.#ConditionalWait & {
continue: dependsOn.value.status.status == "running"
}
}
}
parameter: {
// +usage=Specify the name of the dependent Application
name: string