Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 18 additions & 6 deletions pkg/apis/rollouts/validation/validation_references.go
Original file line number Diff line number Diff line change
Expand Up @@ -222,13 +222,25 @@ func ValidateIngress(rollout *v1alpha1.Rollout, ingress *ingressutil.Ingress) fi
fldPath := field.NewPath("spec", "strategy", "canary", "trafficRouting")
canary := rollout.Spec.Strategy.Canary

if canary.TrafficRouting.Nginx != nil {
return validateNginxIngress(canary, ingress, fldPath)
} else if canary.TrafficRouting.ALB != nil {
return validateAlbIngress(canary, ingress, fldPath)
} else {
return allErrs
ingressName := ingress.GetName()

// Check NGINX ingresses first
if nginx := canary.TrafficRouting.Nginx; nginx != nil {
if nginx.StableIngress == ingressName ||
(nginx.StableIngresses != nil && slices.Contains(nginx.StableIngresses, ingressName)) {
return validateNginxIngress(canary, ingress, fldPath)
}
}

// Check ALB ingresses
if alb := canary.TrafficRouting.ALB; alb != nil {
if alb.Ingress == ingressName ||
(alb.Ingresses != nil && slices.Contains(alb.Ingresses, ingressName)) {
return validateAlbIngress(canary, ingress, fldPath)
}
}

return allErrs
}

func validateNginxIngress(canary *v1alpha1.CanaryStrategy, ingress *ingressutil.Ingress, fldPath *field.Path) field.ErrorList {
Expand Down
20 changes: 20 additions & 0 deletions pkg/apis/rollouts/validation/validation_references_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -846,6 +846,26 @@ func TestValidateAlbIngress(t *testing.T) {
})
}

func TestValidateIngressSimultaneousAlbNginx(t *testing.T) {
// Setup rollout with both ALB and NGINX traffic routing
rollout := getAlbRollout("alb-ingress")
rollout.Spec.Strategy.Canary.TrafficRouting.Nginx = &v1alpha1.NginxTrafficRouting{
StableIngresses: []string{"nginx-ingress-1"},
}

// Test ALB ingress validation
albIngressObj := getIngress()
albIngressObj.Name = "alb-ingress"
albIngress := ingressutil.NewLegacyIngress(albIngressObj)
assert.Empty(t, ValidateIngress(rollout, albIngress))

// Test NGINX ingress validation
nginxIngressObj := getIngress()
nginxIngressObj.Name = "nginx-ingress-1"
nginxIngress := ingressutil.NewLegacyIngress(nginxIngressObj)
assert.Empty(t, ValidateIngress(rollout, nginxIngress))
}

func TestValidateRolloutNginxIngressesConfig(t *testing.T) {
var emptyStableIngress string
var emptyStableIngresses []string
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@ spec:
- name: web
interval: 7s
inconclusiveLimit: 3
successCondition: result.status == "success"
failureCondition: result.status == "failure"
successCondition: result.json.status == "success"
failureCondition: result.json.status == "failure"
provider:
web:
url: "{{args.url-val}}"
method: POST
jsonBody:
status: "inconclusive"
jsonPath: "{$.json}"
jsonPath: "{$}"
Loading