From b54a2e7387bd74ccdcac7c25e03ecf4db72ae0c3 Mon Sep 17 00:00:00 2001 From: Shiqi Wang <464045584@qq.com> Date: Tue, 24 Oct 2023 02:51:40 -0400 Subject: [PATCH] fix fallback envoy version check bug (#441) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: shiqi wang Co-authored-by: 澄潭 --- .../tests/httproute-default-backend.go | 59 +++++++++++++++++++ .../tests/httproute-default-backend.yaml | 32 ++++++++++ 2 files changed, 91 insertions(+) create mode 100644 test/e2e/conformance/tests/httproute-default-backend.go create mode 100644 test/e2e/conformance/tests/httproute-default-backend.yaml diff --git a/test/e2e/conformance/tests/httproute-default-backend.go b/test/e2e/conformance/tests/httproute-default-backend.go new file mode 100644 index 000000000..01f5388da --- /dev/null +++ b/test/e2e/conformance/tests/httproute-default-backend.go @@ -0,0 +1,59 @@ +// Copyright (c) 2022 Alibaba Group Holding Ltd. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package tests + +import ( + "testing" + + "github.com/alibaba/higress/test/e2e/conformance/utils/http" + "github.com/alibaba/higress/test/e2e/conformance/utils/suite" +) + +func init() { + Register(HTTPRouteDefaultBackend) +} + +var HTTPRouteDefaultBackend = suite.ConformanceTest{ + ShortName: "HTTPRouteDefaultBackend", + Description: "The Ingress in the higress-conformance-infra namespace uses the default backend for fallback", + Features: []suite.SupportedFeature{suite.HTTPConformanceFeature}, + Manifests: []string{"tests/httproute-default-backend.yaml"}, + Test: func(t *testing.T, suite *suite.ConformanceTestSuite) { + testcases := []http.Assertion{ + { + Meta: http.AssertionMeta{ + TargetBackend: "infra-backend-v1", + TargetNamespace: "higress-conformance-infra", + }, + Request: http.AssertionRequest{ + ActualRequest: http.Request{ + Path: "/foo", + }, + }, + Response: http.AssertionResponse{ + ExpectedResponse: http.Response{ + StatusCode: 200, + }, + }, + }, + } + + t.Run("HTTPRoute fallback default backend", func(t *testing.T) { + for _, testcase := range testcases { + http.MakeRequestAndExpectEventuallyConsistentResponse(t, suite.RoundTripper, suite.TimeoutConfig, suite.GatewayAddress, testcase) + } + }) + }, +} diff --git a/test/e2e/conformance/tests/httproute-default-backend.yaml b/test/e2e/conformance/tests/httproute-default-backend.yaml new file mode 100644 index 000000000..65a1f918c --- /dev/null +++ b/test/e2e/conformance/tests/httproute-default-backend.yaml @@ -0,0 +1,32 @@ +# Copyright (c) 2022 Alibaba Group Holding Ltd. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +apiVersion: networking.k8s.io/v1 +kind: Ingress +metadata: + name: higress-conformance-infra-default-backend + namespace: higress-conformance-infra + annotations: + nginx.ingress.kubernetes.io/default-backend: "infra-backend-v1" +spec: + ingressClassName: higress + rules: + - http: + paths: + - pathType: Prefix + path: "/foo" + backend: + service: + name: non-existent + port: + number: 8080