Skip to content

Commit e298078

Browse files
24568687642456868764
authored
add dns&static registry e2e test (#1393)
1 parent 85f8eb5 commit e298078

5 files changed

+262
-0
lines changed

‎test/e2e/conformance/base/manifests.yaml

+52
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,58 @@ spec:
8080
---
8181
apiVersion: v1
8282
kind: Service
83+
metadata:
84+
name: infra-backend-v1-ip
85+
namespace: higress-conformance-infra
86+
spec:
87+
selector:
88+
app: infra-backend-v1-ip
89+
ports:
90+
- protocol: TCP
91+
port: 8080
92+
targetPort: 3000
93+
clusterIP: 10.96.254.254
94+
type: ClusterIP
95+
---
96+
apiVersion: apps/v1
97+
kind: Deployment
98+
metadata:
99+
name: infra-backend-v1-ip
100+
namespace: higress-conformance-infra
101+
labels:
102+
app: infra-backend-v1-ip
103+
spec:
104+
replicas: 1
105+
selector:
106+
matchLabels:
107+
app: infra-backend-v1-ip
108+
template:
109+
metadata:
110+
labels:
111+
app: infra-backend-v1-ip
112+
spec:
113+
containers:
114+
- name: infra-backend-v1-ip
115+
# From https://github.com/kubernetes-sigs/ingress-controller-conformance/tree/master/images/echoserver
116+
# image: higress-registry.cn-hangzhou.cr.aliyuncs.com/higress/echoserver:v20221109-7ee2f3e
117+
118+
# From https://github.com/Uncle-Justice/echo-server
119+
image: higress-registry.cn-hangzhou.cr.aliyuncs.com/higress/echo-server:1.3.0
120+
env:
121+
- name: POD_NAME
122+
valueFrom:
123+
fieldRef:
124+
fieldPath: metadata.name
125+
- name: NAMESPACE
126+
valueFrom:
127+
fieldRef:
128+
fieldPath: metadata.namespace
129+
resources:
130+
requests:
131+
cpu: 10m
132+
---
133+
apiVersion: v1
134+
kind: Service
83135
metadata:
84136
name: infra-backend-v2
85137
namespace: higress-conformance-infra

‎test/e2e/conformance/tests/httproute-dns-registry.go

+57
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
// Copyright (c) 2022 Alibaba Group Holding Ltd.
2+
//
3+
// Licensed under the Apache License, Version 2.0 (the "License");
4+
// you may not use this file except in compliance with the License.
5+
// You may obtain a copy of the License at
6+
//
7+
// http://www.apache.org/licenses/LICENSE-2.0
8+
//
9+
// Unless required by applicable law or agreed to in writing, software
10+
// distributed under the License is distributed on an "AS IS" BASIS,
11+
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
// See the License for the specific language governing permissions and
13+
// limitations under the License.
14+
15+
package tests
16+
17+
import (
18+
"testing"
19+
20+
"github.com/alibaba/higress/test/e2e/conformance/utils/http"
21+
"github.com/alibaba/higress/test/e2e/conformance/utils/suite"
22+
)
23+
24+
func init() {
25+
Register(HTTPRouteDNSRegistry)
26+
}
27+
28+
var HTTPRouteDNSRegistry = suite.ConformanceTest{
29+
ShortName: "HTTPRouteDNSRegistry",
30+
Description: "The Ingress in the higress-conformance-infra namespace uses the dns service registry.",
31+
Manifests: []string{"tests/httproute-dns-registry.yaml"},
32+
Features: []suite.SupportedFeature{suite.HTTPConformanceFeature},
33+
Test: func(t *testing.T, suite *suite.ConformanceTestSuite) {
34+
testcases := []http.Assertion{
35+
{
36+
Request: http.AssertionRequest{
37+
ActualRequest: http.Request{
38+
Host: "foo.com",
39+
Path: "/",
40+
Method: "GET",
41+
},
42+
},
43+
Response: http.AssertionResponse{
44+
ExpectedResponseNoRequest: true,
45+
ExpectedResponse: http.Response{
46+
StatusCode: 200,
47+
},
48+
},
49+
},
50+
}
51+
t.Run("HTTPRoute DNS Registry", func(t *testing.T) {
52+
for _, testcase := range testcases {
53+
http.MakeRequestAndExpectEventuallyConsistentResponse(t, suite.RoundTripper, suite.TimeoutConfig, suite.GatewayAddress, testcase)
54+
}
55+
})
56+
},
57+
}

‎test/e2e/conformance/tests/httproute-dns-registry.yaml

+48
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
# Copyright (c) 2022 Alibaba Group Holding Ltd.
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License");
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
14+
15+
apiVersion: networking.higress.io/v1
16+
kind: McpBridge
17+
metadata:
18+
name: default
19+
namespace: higress-system
20+
spec:
21+
registries:
22+
- type: dns
23+
domain: infra-backend-v1.higress-conformance-infra.svc.cluster.local
24+
name: infra-backend-v1
25+
port: 8080
26+
protocol: http
27+
28+
---
29+
apiVersion: networking.k8s.io/v1
30+
kind: Ingress
31+
metadata:
32+
annotations:
33+
higress.io/destination: infra-backend-v1.dns
34+
name: httproute-infra-backend-v1-dns-ingress
35+
namespace: higress-system
36+
spec:
37+
ingressClassName: higress
38+
rules:
39+
- host: "foo.com"
40+
http:
41+
paths:
42+
- pathType: Prefix
43+
path: /
44+
backend:
45+
resource:
46+
apiGroup: networking.higress.io
47+
kind: McpBridge
48+
name: default

‎test/e2e/conformance/tests/httproute-static-registry.go

+57
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
// Copyright (c) 2022 Alibaba Group Holding Ltd.
2+
//
3+
// Licensed under the Apache License, Version 2.0 (the "License");
4+
// you may not use this file except in compliance with the License.
5+
// You may obtain a copy of the License at
6+
//
7+
// http://www.apache.org/licenses/LICENSE-2.0
8+
//
9+
// Unless required by applicable law or agreed to in writing, software
10+
// distributed under the License is distributed on an "AS IS" BASIS,
11+
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
// See the License for the specific language governing permissions and
13+
// limitations under the License.
14+
15+
package tests
16+
17+
import (
18+
"testing"
19+
20+
"github.com/alibaba/higress/test/e2e/conformance/utils/http"
21+
"github.com/alibaba/higress/test/e2e/conformance/utils/suite"
22+
)
23+
24+
func init() {
25+
Register(HTTPRouteStaticRegistry)
26+
}
27+
28+
var HTTPRouteStaticRegistry = suite.ConformanceTest{
29+
ShortName: "HTTPRouteStaticRegistry",
30+
Description: "The Ingress in the higress-conformance-infra namespace uses the static service registry.",
31+
Manifests: []string{"tests/httproute-static-registry.yaml"},
32+
Features: []suite.SupportedFeature{suite.HTTPConformanceFeature},
33+
Test: func(t *testing.T, suite *suite.ConformanceTestSuite) {
34+
testcases := []http.Assertion{
35+
{
36+
Request: http.AssertionRequest{
37+
ActualRequest: http.Request{
38+
Host: "foo.com",
39+
Path: "/",
40+
Method: "GET",
41+
},
42+
},
43+
Response: http.AssertionResponse{
44+
ExpectedResponseNoRequest: true,
45+
ExpectedResponse: http.Response{
46+
StatusCode: 200,
47+
},
48+
},
49+
},
50+
}
51+
t.Run("HTTPRoute Static Registry", func(t *testing.T) {
52+
for _, testcase := range testcases {
53+
http.MakeRequestAndExpectEventuallyConsistentResponse(t, suite.RoundTripper, suite.TimeoutConfig, suite.GatewayAddress, testcase)
54+
}
55+
})
56+
},
57+
}

‎test/e2e/conformance/tests/httproute-static-registry.yaml

+48
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
# Copyright (c) 2022 Alibaba Group Holding Ltd.
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License");
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
14+
15+
apiVersion: networking.higress.io/v1
16+
kind: McpBridge
17+
metadata:
18+
name: default
19+
namespace: higress-system
20+
spec:
21+
registries:
22+
- type: static
23+
domain: 10.96.254.254:8080
24+
name: infra-backend-v1-ip
25+
port: 8080
26+
protocol: http
27+
28+
---
29+
apiVersion: networking.k8s.io/v1
30+
kind: Ingress
31+
metadata:
32+
annotations:
33+
higress.io/destination: infra-backend-v1-ip.static
34+
name: httproute-infra-backend-v1-ip-ingress
35+
namespace: higress-system
36+
spec:
37+
ingressClassName: higress
38+
rules:
39+
- host: "foo.com"
40+
http:
41+
paths:
42+
- pathType: Prefix
43+
path: /
44+
backend:
45+
resource:
46+
apiGroup: networking.higress.io
47+
kind: McpBridge
48+
name: default

0 commit comments

Comments
 (0)