Merge branch 'main' into release-please--branches--main--components--…

…kardinal-kontrol
kurtosis-tech · Sep 16, 2024 · 07ffd06 · 07ffd06
2 parents 89a4ed6 + f5b1376
commit 07ffd06
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 12 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/kontrol-service/engine/flow/merger.go b/kontrol-service/engine/flow/merger.go
@@ -37,6 +37,7 @@ func foldAllIngress(ingresses []*resolved.Ingress) []*resolved.Ingress {
 			IngressID:     key,
 			ActiveFlowIDs: lo.Uniq(lo.FlatMap(value, func(ingress *resolved.Ingress, _ int) []string { return ingress.ActiveFlowIDs })),
 			IngressRules:  lo.Uniq(lo.FlatMap(value, func(ingress *resolved.Ingress, _ int) []*v1.IngressRule { return ingress.IngressRules })),
+			IngressSpec:   value[0].IngressSpec,
 			ServiceSpec:   value[0].ServiceSpec,
 		}
 		return &merged