From 9dccfcea1e2d70f1ff4849a81d1f78e26bc5e4bf Mon Sep 17 00:00:00 2001 From: Somefive Date: Wed, 8 Feb 2023 19:17:50 +0800 Subject: [PATCH] Fix: expose trait load balance cue check bug Signed-off-by: Somefive --- charts/vela-core/templates/defwithtemplate/expose.yaml | 5 ++++- charts/vela-minimal/templates/defwithtemplate/expose.yaml | 5 ++++- vela-templates/definitions/internal/trait/expose.cue | 5 ++++- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/charts/vela-core/templates/defwithtemplate/expose.yaml b/charts/vela-core/templates/defwithtemplate/expose.yaml index d3bfb755a..027d8993f 100644 --- a/charts/vela-core/templates/defwithtemplate/expose.yaml +++ b/charts/vela-core/templates/defwithtemplate/expose.yaml @@ -53,7 +53,10 @@ spec: } if service.spec.type == "LoadBalancer" { status: service.status - isHealth: status != _|_ && status.loadBalancer != _|_ && status.loadBalancer.ingress != _|_ && len(status.loadBalancer.ingress) > 0 + isHealth: *false | bool + if status != _|_ if status.loadBalancer != _|_ if status.loadBalancer.ingress != _|_ if len(status.loadBalancer.ingress) > 0 { + isHealth: true + } if !isHealth { message: "ExternalIP: Pending" } diff --git a/charts/vela-minimal/templates/defwithtemplate/expose.yaml b/charts/vela-minimal/templates/defwithtemplate/expose.yaml index d3bfb755a..027d8993f 100644 --- a/charts/vela-minimal/templates/defwithtemplate/expose.yaml +++ b/charts/vela-minimal/templates/defwithtemplate/expose.yaml @@ -53,7 +53,10 @@ spec: } if service.spec.type == "LoadBalancer" { status: service.status - isHealth: status != _|_ && status.loadBalancer != _|_ && status.loadBalancer.ingress != _|_ && len(status.loadBalancer.ingress) > 0 + isHealth: *false | bool + if status != _|_ if status.loadBalancer != _|_ if status.loadBalancer.ingress != _|_ if len(status.loadBalancer.ingress) > 0 { + isHealth: true + } if !isHealth { message: "ExternalIP: Pending" } diff --git a/vela-templates/definitions/internal/trait/expose.cue b/vela-templates/definitions/internal/trait/expose.cue index 4c91dbbfb..0fea0ed34 100644 --- a/vela-templates/definitions/internal/trait/expose.cue +++ b/vela-templates/definitions/internal/trait/expose.cue @@ -18,7 +18,10 @@ expose: { } if service.spec.type == "LoadBalancer" { status: service.status - isHealth: status != _|_ && status.loadBalancer != _|_ && status.loadBalancer.ingress != _|_ && len(status.loadBalancer.ingress) > 0 + isHealth: *false | bool + if status != _|_ if status.loadBalancer != _|_ if status.loadBalancer.ingress != _|_ if len(status.loadBalancer.ingress) > 0 { + isHealth: true + } if !isHealth { message: "ExternalIP: Pending" }