github/kubevela
1
0
Fork 0
mirror of https://github.com/kubevela/kubevela.git synced 2026-08-19 04:26:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix: fix component definition status message (#3054)

Browse Source 
Signed-off-by: FogDong <dongtianxin.tx@alibaba-inc.com>
This commit is contained in:
Tianxin Dong
2022-01-06 23:12:29 +08:00
committed by GitHub
parent 96485ea0db
commit 578aae6482
6 changed files with 12 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files
charts/vela-core/templates/defwithtemplate/webservice.yaml
+2 -12
View File
@@ -494,12 +494,7 @@ spec:
replica: strconv.FormatInt(context.output.status.readyReplicas, 10)
}
}
if context.output.status.replicas != _|_ {
message: "Ready:" + ready.replica + "/" + strconv.FormatInt(context.output.status.replicas, 10)
}
if context.output.status.replicas == _|_ {
message: ""
}
message: "Ready:" + ready.replica + "/" + strconv.FormatInt(context.output.spec.replicas, 10)
healthPolicy: |-
ready: {
if context.output.status.readyReplicas == _|_ {
@@ -509,12 +504,7 @@ spec:
replica: context.output.status.readyReplicas
}
}
if context.output.status.replicas != _|_ {
isHealth: context.output.status.replicas == ready.replica
}
if context.output.status.replicas == _|_ {
isHealth: false
}
isHealth: context.output.spec.replicas == ready.replica
workload:
definition:
apiVersion: apps/v1
charts/vela-core/templates/defwithtemplate/worker.yaml
+2 -12
View File
@@ -405,12 +405,7 @@ spec:
replica: strconv.FormatInt(context.output.status.readyReplicas, 10)
}
}
if context.output.status.replicas != _|_ {
message: "Ready:" + ready.replica + "/" + strconv.FormatInt(context.output.status.replicas, 10)
}
if context.output.status.replicas == _|_ {
message: ""
}
message: "Ready:" + ready.replica + "/" + strconv.FormatInt(context.output.spec.replicas, 10)
healthPolicy: |-
ready: {
if context.output.status.readyReplicas == _|_ {
@@ -420,12 +415,7 @@ spec:
replica: context.output.status.readyReplicas
}
}
if context.output.status.replicas != _|_ {
isHealth: context.output.status.replicas == ready.replica
}
if context.output.status.replicas == _|_ {
isHealth: false
}
isHealth: context.output.spec.replicas == ready.replica
workload:
definition:
apiVersion: apps/v1
charts/vela-minimal/templates/defwithtemplate/webservice.yaml
+2 -12
View File
@@ -494,12 +494,7 @@ spec:
replica: strconv.FormatInt(context.output.status.readyReplicas, 10)
}
}
if context.output.status.replicas != _|_ {
message: "Ready:" + ready.replica + "/" + strconv.FormatInt(context.output.status.replicas, 10)
}
if context.output.status.replicas == _|_ {
message: ""
}
message: "Ready:" + ready.replica + "/" + strconv.FormatInt(context.output.spec.replicas, 10)
healthPolicy: |-
ready: {
if context.output.status.readyReplicas == _|_ {
@@ -509,12 +504,7 @@ spec:
replica: context.output.status.readyReplicas
}
}
if context.output.status.replicas != _|_ {
isHealth: context.output.status.replicas == ready.replica
}
if context.output.status.replicas == _|_ {
isHealth: false
}
isHealth: context.output.spec.replicas == ready.replica
workload:
definition:
apiVersion: apps/v1
charts/vela-minimal/templates/defwithtemplate/worker.yaml
+2 -12
View File
@@ -405,12 +405,7 @@ spec:
replica: strconv.FormatInt(context.output.status.readyReplicas, 10)
}
}
if context.output.status.replicas != _|_ {
message: "Ready:" + ready.replica + "/" + strconv.FormatInt(context.output.status.replicas, 10)
}
if context.output.status.replicas == _|_ {
message: ""
}
message: "Ready:" + ready.replica + "/" + strconv.FormatInt(context.output.spec.replicas, 10)
healthPolicy: |-
ready: {
if context.output.status.readyReplicas == _|_ {
@@ -420,12 +415,7 @@ spec:
replica: context.output.status.readyReplicas
}
}
if context.output.status.replicas != _|_ {
isHealth: context.output.status.replicas == ready.replica
}
if context.output.status.replicas == _|_ {
isHealth: false
}
isHealth: context.output.spec.replicas == ready.replica
workload:
definition:
apiVersion: apps/v1
vela-templates/definitions/internal/component/webservice.cue
+2 -12
View File
@@ -22,12 +22,7 @@ webservice: {
replica: strconv.FormatInt(context.output.status.readyReplicas, 10)
}
}
if context.output.status.replicas != _|_ {
message: "Ready:" + ready.replica + "/" + strconv.FormatInt(context.output.status.replicas, 10)
}
if context.output.status.replicas == _|_ {
message: ""
}
message: "Ready:" + ready.replica + "/" + strconv.FormatInt(context.output.spec.replicas, 10)
"""#
healthPolicy: #"""
ready: {
@@ -38,12 +33,7 @@ webservice: {
replica: context.output.status.readyReplicas
}
}
if context.output.status.replicas != _|_ {
isHealth: context.output.status.replicas == ready.replica
}
if context.output.status.replicas == _|_ {
isHealth: false
}
isHealth: context.output.spec.replicas == ready.replica
"""#
}
}
vela-templates/definitions/internal/component/worker.cue
+2 -12
View File
@@ -24,12 +24,7 @@ worker: {
replica: strconv.FormatInt(context.output.status.readyReplicas, 10)
}
}
if context.output.status.replicas != _|_ {
message: "Ready:" + ready.replica + "/" + strconv.FormatInt(context.output.status.replicas, 10)
}
if context.output.status.replicas == _|_ {
message: ""
}
message: "Ready:" + ready.replica + "/" + strconv.FormatInt(context.output.spec.replicas, 10)
"""#
healthPolicy: #"""
ready: {
@@ -40,12 +35,7 @@ worker: {
replica: context.output.status.readyReplicas
}
}
if context.output.status.replicas != _|_ {
isHealth: context.output.status.replicas == ready.replica
}
if context.output.status.replicas == _|_ {
isHealth: false
}
isHealth: context.output.spec.replicas == ready.replica
"""#
}
}