Add support for HTTPOption

config/config-gateway.yaml

@@ -50,6 +50,7 @@ data:
       - class: istio
         gateway: istio-system/knative-gateway
         service: istio-system/istio-ingressgateway
+        http-listener-name: http
         supported-features:
         - HTTPRouteRequestTimeout
 
@@ -58,5 +59,6 @@ data:
       - class: istio
         gateway: istio-system/knative-local-gateway
         service: istio-system/knative-local-gateway
+        http-listener-name: http
         supported-features:
         - HTTPRouteRequestTimeout

docs/test-version.md

@@ -15,5 +15,5 @@ The following Gateway API version and Ingress were tested as part of the release
 
 | Ingress | Tested version          | Unavailable features           |
 | ------- | ----------------------- | ------------------------------ |
-| Istio   | v1.22.1     | retry,httpoption   |
-| Contour | v1.29.1    | httpoption |
+| Istio   | v1.22.1     | retry   |
+| Contour | v1.29.1    |  |

hack/test-env.sh

@@ -16,9 +16,9 @@
 
 export GATEWAY_API_VERSION="v1.1.0"
 export ISTIO_VERSION="1.22.1"
-export ISTIO_UNSUPPORTED_E2E_TESTS="retry,httpoption"
+export ISTIO_UNSUPPORTED_E2E_TESTS="retry"
 export CONTOUR_VERSION="v1.29.1"
-export CONTOUR_UNSUPPORTED_E2E_TESTS="httpoption"
+export CONTOUR_UNSUPPORTED_E2E_TESTS=""
 
 export ENVOY_GATEWAY_VERSION="latest"
-export ENVOY_GATEWAY_UNSUPPORTED_E2E_TESTS="httpoption,host-rewrite"
+export ENVOY_GATEWAY_UNSUPPORTED_E2E_TESTS="host-rewrite"

pkg/reconciler/ingress/config/gateway.go

@@ -47,6 +47,7 @@ func defaultExternalGateways() []Gateway {
 			Name:      "istio-ingressgateway",
 			Namespace: "istio-system",
 		},
+		HTTPListenerName: "http",
 		SupportedFeatures: sets.New(
 			features.SupportHTTPRouteRequestTimeout,
 		),
@@ -64,6 +65,7 @@ func defaultLocalGateways() []Gateway {
 			Name:      "knative-local-gateway",
 			Namespace: "istio-system",
 		},
+		HTTPListenerName: "http",
 		SupportedFeatures: sets.New(
 			features.SupportHTTPRouteRequestTimeout,
 		),
@@ -90,6 +92,7 @@ type Gateway struct {
 	types.NamespacedName
 
 	Class             string
+	HTTPListenerName  string
 	Service           *types.NamespacedName
 	SupportedFeatures sets.Set[features.SupportedFeature]
 }
@@ -138,6 +141,7 @@ type gatewayEntry struct {
 	Gateway           string                      `json:"gateway"`
 	Service           *string                     `json:"service"`
 	Class             string                      `json:"class"`
+	HTTPListenerName  string                      `json:"http-listener-name"`
 	SupportedFeatures []features.SupportedFeature `json:"supported-features"`
 }
 
@@ -152,6 +156,7 @@ func parseGatewayConfig(data string) ([]Gateway, error) {
 	for i, entry := range entries {
 		gw := Gateway{
 			Class:             entry.Class,
+			HTTPListenerName:  entry.HTTPListenerName,
 			SupportedFeatures: sets.New(entry.SupportedFeatures...),
 		}
 
@@ -174,6 +179,9 @@ func parseGatewayConfig(data string) ([]Gateway, error) {
 		if len(strings.TrimSpace(gw.Class)) == 0 {
 			return nil, fmt.Errorf(`entry [%d] field "class" is required`, i)
 		}
+		if len(strings.TrimSpace(gw.HTTPListenerName)) == 0 {
+			return nil, fmt.Errorf(`entry [%d] field "http-listener-name" is required`, i)
+		}
 
 		gws = append(gws, gw)
 	}

pkg/reconciler/ingress/config/gateway_test.go

@@ -21,11 +21,11 @@ import (
 	"testing"
 
 	corev1 "k8s.io/api/core/v1"
-	. "knative.dev/pkg/configmap/testing"
+	ktesting "knative.dev/pkg/configmap/testing"
 )
 
 func TestFromConfigMap(t *testing.T) {
-	cm, example := ConfigMapsFromTestFile(t, GatewayConfigName)
+	cm, example := ktesting.ConfigMapsFromTestFile(t, GatewayConfigName)
 
 	if _, err := FromConfigMap(cm); err != nil {
 		t.Error("FromConfigMap(actual) =", err)
@@ -58,9 +58,11 @@ func TestFromConfigMapErrors(t *testing.T) {
 		data: map[string]string{
 			"external-gateways": `[{
 					"class":"boo",
+					"http-listener-name":"http",
 					"gateway": "ns/n"
 				},{
 					"class":"boo",
+					"http-listener-name":"http",
 					"gateway": "ns/n"
 				}]`,
 		},
@@ -70,9 +72,11 @@ func TestFromConfigMapErrors(t *testing.T) {
 		data: map[string]string{
 			"local-gateways": `[{
 					"class":"boo",
+					"http-listener-name":"http",
 					"gateway": "ns/n"
 				},{
 					"class":"boo",
+					"http-listener-name":"http",
 					"gateway": "ns/n"
 				}]`,
 		},
@@ -119,6 +123,12 @@ func TestFromConfigMapErrors(t *testing.T) {
 			"local-gateways": `[{"class": "class", "gateway": "ns/n", "service":"name"}]`,
 		},
 		want: `unable to parse "local-gateways"`,
+	}, {
+		name: "missing gateway http-listener-name",
+		data: map[string]string{
+			"local-gateways": `[{"class":"class", "gateway": "namespace/name"}]`,
+		},
+		want: `unable to parse "local-gateways": entry [0] field "http-listener-name" is required`,
 	}}
 
 	for _, tc := range cases {
@@ -141,9 +151,11 @@ func TestGatewayNoService(t *testing.T) {
 		Data: map[string]string{
 			"external-gateways": `
       - class: istio
+        http-listener-name: http
         gateway: istio-system/knative-gateway`,
 			"local-gateways": `
       - class: istio
+        http-listener-name: http
         gateway: istio-system/knative-local-gateway`,
 		},
 	})

pkg/reconciler/ingress/controller_test.go

@@ -33,11 +33,11 @@ import (
 	_ "knative.dev/pkg/client/injection/kube/informers/core/v1/endpoints/fake"
 	_ "knative.dev/pkg/client/injection/kube/informers/core/v1/pod/fake"
 
-	. "knative.dev/pkg/reconciler/testing"
+	ktesting "knative.dev/pkg/reconciler/testing"
 )
 
 func TestNew(t *testing.T) {
-	ctx, _ := SetupFakeContext(t)
+	ctx, _ := ktesting.SetupFakeContext(t)
 
 	c := NewController(ctx, configmap.NewStaticWatcher(&corev1.ConfigMap{
 		ObjectMeta: metav1.ObjectMeta{

pkg/reconciler/ingress/ingress.go

@@ -107,12 +107,22 @@ func (c *Reconciler) reconcileIngress(ctx context.Context, ing *v1alpha1.Ingress
 	for _, rule := range ing.Spec.Rules {
 		rule := rule
 
-		httproute, probeTargets, err := c.reconcileHTTPRoute(ctx, ingressHash, ing, &rule)
+		workloadRoute, probeTargets, err := c.reconcileWorkloadRoute(ctx, ingressHash, ing, &rule)
 		if err != nil {
 			return err
 		}
 
-		if isHTTPRouteReady(httproute) {
+		// For now, we only generate the redirected HTTPRoute for external visibility,
+		// because currently we do not (yet) support HTTPs for cluster-local domains in net-gateway-api.
+		var redirectRoute *gatewayapi.HTTPRoute
+		if ing.Spec.HTTPOption == v1alpha1.HTTPOptionRedirected && rule.Visibility == v1alpha1.IngressVisibilityExternalIP {
+			redirectRoute, err = c.reconcileRedirectHTTPRoute(ctx, ing, &rule)
+			if err != nil {
+				return err
+			}
+		}
+
+		if isHTTPRouteReady(workloadRoute) && (redirectRoute == nil || isHTTPRouteReady(redirectRoute)) {
 			ing.Status.MarkNetworkConfigured()
 
 			state, err := c.statusManager.DoProbes(ctx, probeTargets)