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
3 changes: 2 additions & 1 deletion .github/workflows/build_and_test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,7 @@ jobs:

- name: Read Benchmark report
run: cat test/benchmark/benchmark_report/benchmark_report.md

resilience-test:
runs-on: ubuntu-latest
if: ${{ ! startsWith(github.event_name, 'push') }}
Expand All @@ -203,7 +204,7 @@ jobs:

publish:
runs-on: ubuntu-latest
needs: [conformance-test, e2e-test]
needs: [conformance-test, e2e-test, resilience-test]
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
- uses: ./tools/github-actions/setup-deps
Expand Down
24 changes: 24 additions & 0 deletions test/config/envoy-gateaway-config/gateway-namespace-mode.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
apiVersion: v1
kind: ConfigMap
metadata:
name: envoy-gateway-config
namespace: envoy-gateway-system
data:
envoy-gateway.yaml: |
apiVersion: gateway.envoyproxy.io/v1alpha1
kind: EnvoyGateway
provider:
type: Kubernetes
kubernetes:
deploy:
type: GatewayNamespace
gateway:
controllerName: gateway.envoyproxy.io/gatewayclass-controller
extensionApis:
enableEnvoyPatchPolicy: true
enableBackend: true
rateLimit:
backend:
type: Redis
redis:
url: redis.redis-system.svc.cluster.local:6379
1 change: 1 addition & 0 deletions test/config/helm/default.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
# the default configuration for the gateway helm chart
9 changes: 9 additions & 0 deletions test/config/helm/gateway-namespace-mode.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
config:
envoyGateway:
gateway:
controllerName: gateway.envoyproxy.io/gatewayclass-controller
provider:
type: Kubernetes
kubernetes:
deploy:
type: GatewayNamespace
13 changes: 11 additions & 2 deletions tools/make/kube.mk
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,10 @@ E2E_CLEANUP ?= true
E2E_TIMEOUT ?= 20m
E2E_TEST_ARGS ?= -v -tags e2e -timeout $(E2E_TIMEOUT)

KUBE_DEPLOY_PROFILE ?= default
KUBE_DEPLOY_HELM_VALUES_FILE = $(ROOT_DIR)/test/config/helm/$(KUBE_DEPLOY_PROFILE).yaml
KUBE_DEPLOY_EG_CONFIG_FILE = $(ROOT_DIR)/test/config/envoy-gateaway-config/$(KUBE_DEPLOY_PROFILE).yaml

# Set Kubernetes Resources Directory Path
ifeq ($(origin KUBE_PROVIDER_DIR),undefined)
KUBE_PROVIDER_DIR := $(ROOT_DIR)/internal/provider/kubernetes/config
Expand Down Expand Up @@ -105,7 +109,12 @@ endif
.PHONY: kube-deploy
kube-deploy: manifests helm-generate.gateway-helm ## Install Envoy Gateway into the Kubernetes cluster specified in ~/.kube/config.
@$(LOG_TARGET)
helm install eg charts/gateway-helm --set deployment.envoyGateway.imagePullPolicy=$(IMAGE_PULL_POLICY) -n envoy-gateway-system --create-namespace --debug --timeout='$(WAIT_TIMEOUT)' --wait --wait-for-jobs
helm install eg charts/gateway-helm \
--set deployment.envoyGateway.imagePullPolicy=$(IMAGE_PULL_POLICY) \
-n envoy-gateway-system --create-namespace \
--debug --timeout='$(WAIT_TIMEOUT)' \
--wait --wait-for-jobs \
-f $(KUBE_DEPLOY_HELM_VALUES_FILE)

.PHONY: kube-deploy-for-benchmark-test
kube-deploy-for-benchmark-test: manifests helm-generate ## Install Envoy Gateway and prometheus-server for benchmark test purpose only.
Expand Down Expand Up @@ -192,7 +201,7 @@ e2e-prepare: prepare-ip-family ## Prepare the environment for running e2e tests
@$(LOG_TARGET)
kubectl wait --timeout=5m -n envoy-gateway-system deployment/envoy-ratelimit --for=condition=Available
kubectl wait --timeout=5m -n envoy-gateway-system deployment/envoy-gateway --for=condition=Available
kubectl apply -f test/config/envoy-gateway-config.yaml
kubectl apply -f $(KUBE_DEPLOY_EG_CONFIG_FILE)
kubectl apply -f test/config/gatewayclass.yaml

.PHONY: run-e2e
Expand Down