Skip to content

Commit

Permalink
add cosnul registry e2e test
Browse files Browse the repository at this point in the history
  • Loading branch information
2456868764 committed Jul 28, 2023
1 parent f149238 commit f237264
Show file tree
Hide file tree
Showing 4 changed files with 185 additions and 1 deletion.
81 changes: 80 additions & 1 deletion test/e2e/conformance/base/manifests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -361,4 +361,83 @@ spec:
- name: DUBBO_GROUP
value: dev
ports:
- containerPort: 20880
- containerPort: 20880
---
apiVersion: apps/v1
kind: Deployment
metadata:
name: consul-standlone
namespace: higress-conformance-app-backend
labels:
name: consul-standlone
spec:
selector:
matchLabels:
name: consul-standlone
template:
metadata:
labels:
name: consul-standlone
spec:
containers:
- name: consul
image: registry.cn-hangzhou.aliyuncs.com/2456868764/consul:latest
resources:
requests:
cpu: 10m
ports:
- containerPort: 8500
name: http
protocol: TCP
---
apiVersion: v1
kind: Service
metadata:
name: consul-service
namespace: higress-conformance-app-backend
labels:
name: consul-standlone
spec:
clusterIP: None
ports:
- name: http-query
port: 8500
protocol: TCP
targetPort: 8500
selector:
name: consul-standlone
---
apiVersion: v1
kind: Pod
metadata:
name: consul-demo
namespace: higress-conformance-app-backend
spec:
containers:
- name: consul-demo
image: registry.cn-hangzhou.aliyuncs.com/2456868764/consuldemo:0.0.1
env:
- name: JAVA_HOME
value: /usr/local/openjdk-18
- name: LANG
value: C.UTF-8
ports:
- containerPort: 8080
name: http
protocol: TCP
readinessProbe:
failureThreshold: 5
httpGet:
path: /ping
port: 8080
scheme: HTTP
periodSeconds: 20
successThreshold: 1
timeoutSeconds: 1
livenessProbe:
httpGet:
path: /ping
port: 8080
scheme: HTTP
initialDelaySeconds: 10
periodSeconds: 20
56 changes: 56 additions & 0 deletions test/e2e/conformance/tests/httproute-consul-demo.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
// 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() {
HigressConformanceTests = append(HigressConformanceTests, HTTPRouteHttp2Rpc)
}

var HTTPRouteConsulDemo = suite.ConformanceTest{
ShortName: "HTTPRouteConsulDemo",
Description: "The Ingress in the higress-conformance-infra namespace uses the consul service registry.",
Manifests: []string{"tests/httproute-consul-demo.yaml"},
Test: func(t *testing.T, suite *suite.ConformanceTestSuite) {
testcases := []http.Assertion{
{
Request: http.AssertionRequest{
ActualRequest: http.Request{
Host: "foo.com",
Path: "/user/1",
Method: "GET",
},
},
Response: http.AssertionResponse{
ExpectedResponseNoRequest: true,
ExpectedResponse: http.Response{
StatusCode: 200,
},
},
},
}
t.Run("HTTPRoute Consul Demo", func(t *testing.T) {
for _, testcase := range testcases {
http.MakeRequestAndExpectEventuallyConsistentResponse(t, suite.RoundTripper, suite.TimeoutConfig, suite.GatewayAddress, testcase)
}
})
},
}
48 changes: 48 additions & 0 deletions test/e2e/conformance/tests/httproute-consul-demo.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
# 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.higress.io/v1
kind: McpBridge
metadata:
name: default
namespace: higress-system
spec:
registries:
- consulDatacenter: dc1
consulServiceTag: higress
domain: consul-service.higress-conformance-app-backend.svc.cluster.local
name: consuldemo
port: 8500
type: consul
---
apiVersion: networking.k8s.io/v1
kind: Ingress
metadata:
annotations:
higress.io/destination: consuldemo.dc1.consul
name: httproute-consul-demo-ingress
namespace: higress-system
spec:
ingressClassName: higress
rules:
- host: "foo.com"
http:
paths:
- pathType: Prefix
path: /
backend:
resource:
apiGroup: networking.higress.io
kind: McpBridge
name: default
1 change: 1 addition & 0 deletions test/e2e/e2e_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ func TestHigressConformanceTests(t *testing.T) {
tests.HTTPRouteDownstreamEncryption,
tests.HTTPRouteFullPathRegex,
tests.HTTPRouteHttp2Rpc,
tests.HTTPRouteConsulDemo,
}
}

Expand Down

0 comments on commit f237264

Please sign in to comment.