diff --git a/charts/vela-core/templates/defwithtemplate/webservice.yaml b/charts/vela-core/templates/defwithtemplate/webservice.yaml index 12f31fd4c..3f7af2356 100644 --- a/charts/vela-core/templates/defwithtemplate/webservice.yaml +++ b/charts/vela-core/templates/defwithtemplate/webservice.yaml @@ -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 diff --git a/charts/vela-core/templates/defwithtemplate/worker.yaml b/charts/vela-core/templates/defwithtemplate/worker.yaml index b2c8ac00b..fd688660e 100644 --- a/charts/vela-core/templates/defwithtemplate/worker.yaml +++ b/charts/vela-core/templates/defwithtemplate/worker.yaml @@ -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 diff --git a/charts/vela-minimal/templates/defwithtemplate/webservice.yaml b/charts/vela-minimal/templates/defwithtemplate/webservice.yaml index 12f31fd4c..3f7af2356 100644 --- a/charts/vela-minimal/templates/defwithtemplate/webservice.yaml +++ b/charts/vela-minimal/templates/defwithtemplate/webservice.yaml @@ -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 diff --git a/charts/vela-minimal/templates/defwithtemplate/worker.yaml b/charts/vela-minimal/templates/defwithtemplate/worker.yaml index b2c8ac00b..fd688660e 100644 --- a/charts/vela-minimal/templates/defwithtemplate/worker.yaml +++ b/charts/vela-minimal/templates/defwithtemplate/worker.yaml @@ -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 diff --git a/vela-templates/definitions/internal/component/webservice.cue b/vela-templates/definitions/internal/component/webservice.cue index 2f53d1d5e..19c7e15da 100644 --- a/vela-templates/definitions/internal/component/webservice.cue +++ b/vela-templates/definitions/internal/component/webservice.cue @@ -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 """# } } diff --git a/vela-templates/definitions/internal/component/worker.cue b/vela-templates/definitions/internal/component/worker.cue index cc317959a..ecb897ca4 100644 --- a/vela-templates/definitions/internal/component/worker.cue +++ b/vela-templates/definitions/internal/component/worker.cue @@ -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 """# } }