allow path related ingress fields to co-exist

apache · Dec 16, 2024 · 3876fe1 · 3876fe1
1 parent 8d2f4f5
commit 3876fe1
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/pkg/trait/ingress.go b/pkg/trait/ingress.go
@@ -154,9 +154,10 @@ func (t *ingressTrait) getPaths(service *corev1.Service) []networkingv1.HTTPIngr
 	paths := []networkingv1.HTTPIngressPath{}
 	if t.Path == "" && len(t.Paths) == 0 {
 		paths = append(paths, createIngressPath(defaultPath))
-	} else if t.Path != "" {
-		paths = append(paths, createIngressPath(t.Path))
 	} else {
+		if t.Path != "" {
+			paths = append(paths, createIngressPath(t.Path))
+		}
 		for _, p := range t.Paths {
 			paths = append(paths, createIngressPath(p))
 		}

diff --git a/pkg/trait/ingress_test.go b/pkg/trait/ingress_test.go
@@ -188,6 +188,21 @@ func TestApplyIngressTraitWithPathsDoesSucceed(t *testing.T) {
 	assert.Equal(t, "service-name(hostname) -> service-name(http)", conditions[0].Message)
 }
 
+func TestApplyIngressTraitWithPathAndPathsDoesSucceed(t *testing.T) {
+	ingressTrait, environment := createNominalIngressTest()
+	ingressTrait.Path = string("/path")
+	ingressTrait.Paths = []string{"/path-a", "/path-b"}
+
+	err := ingressTrait.Apply(environment)
+
+	require.NoError(t, err)
+	environment.Resources.Visit(func(resource runtime.Object) {
+		if ingress, ok := resource.(*networkingv1.Ingress); ok {
+			assert.Len(t, ingress.Spec.Rules[0].HTTP.Paths, 3)
+		}
+	})
+}
+
 func TestApplyIngressTraitWithIngressClassNameDoesSucceed(t *testing.T) {
 	ingressTrait, environment := createNominalIngressTestWithIngressClassName("someIngressClass")