From 621c2ba1cf8e955e8f70e72d369eac90ea2a77dc Mon Sep 17 00:00:00 2001 From: Dave Protasowski Date: Fri, 31 May 2024 16:38:46 -0400 Subject: [PATCH] set the svc name of the gateway for testing reasons --- test/e2e-common.sh | 2 +- third_party/envoy-gateway/external.yaml | 21 +++++++++++++++++++++ third_party/envoy-gateway/internal.yaml | 12 ++++++++---- 3 files changed, 30 insertions(+), 5 deletions(-) diff --git a/test/e2e-common.sh b/test/e2e-common.sh index f5737ec64..5cb31129b 100755 --- a/test/e2e-common.sh +++ b/test/e2e-common.sh @@ -55,7 +55,7 @@ function parse_flags() { ;; --envoy-gateway) readonly INGRESS=envoy-gateway - readonly GATEWAY_OVERRIDE= + readonly GATEWAY_OVERRIDE=knative-external readonly GATEWAY_NAMESPACE_OVERRIDE=envoy-gateway-system readonly GATEWAY_CLASS=eg-external readonly UNSUPPORTED_E2E_TESTS="${ENVOY_GATEWAY_UNSUPPORTED_E2E_TESTS}" diff --git a/third_party/envoy-gateway/external.yaml b/third_party/envoy-gateway/external.yaml index ee821d643..496ba9a8a 100644 --- a/third_party/envoy-gateway/external.yaml +++ b/third_party/envoy-gateway/external.yaml @@ -4,12 +4,33 @@ kind: Namespace metadata: name: eg-external --- +apiVersion: gateway.envoyproxy.io/v1alpha1 +kind: EnvoyProxy +metadata: + name: knative-external-config + namespace: envoy-gateway-system +spec: + provider: + type: Kubernetes + kubernetes: + envoyService: + type: ClusterIP + patch: + value: + metadata: + name: knative-external +--- apiVersion: gateway.networking.k8s.io/v1 kind: GatewayClass metadata: name: eg-external spec: controllerName: gateway.envoyproxy.io/gatewayclass-controller + parametersRef: + group: gateway.envoyproxy.io + kind: EnvoyProxy + name: knative-external-config + namespace: envoy-gateway-system --- apiVersion: gateway.networking.k8s.io/v1 kind: Gateway diff --git a/third_party/envoy-gateway/internal.yaml b/third_party/envoy-gateway/internal.yaml index d9b5d8f48..7438b5511 100644 --- a/third_party/envoy-gateway/internal.yaml +++ b/third_party/envoy-gateway/internal.yaml @@ -7,14 +7,18 @@ metadata: apiVersion: gateway.envoyproxy.io/v1alpha1 kind: EnvoyProxy metadata: - name: internal-config - namespace: eg-internal + name: knative-internal-config + namespace: envoy-gateway-system spec: provider: type: Kubernetes kubernetes: envoyService: type: ClusterIP + patch: + value: + metadata: + name: knative-internal --- apiVersion: gateway.networking.k8s.io/v1 kind: GatewayClass @@ -25,8 +29,8 @@ spec: parametersRef: group: gateway.envoyproxy.io kind: EnvoyProxy - name: internal-config - namespace: eg-internal + name: knative-internal-config + namespace: envoy-gateway-system --- apiVersion: gateway.networking.k8s.io/v1 kind: Gateway