Skip to content

Commit b2a0bcf

Browse files
ivanmatmatiivanmatmati
committed
MINOR: improve backend naming
to have more clear separation between service name and ingress data, more clear `_svc_` separator was added
1 parent 4eed191 commit b2a0bcf

21 files changed

+200
-199
lines changed

‎.aspell.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,3 +52,4 @@ allowed:
5252
- SNI
5353
- gwapi
5454
- init
55+
- svc

‎deploy/tests/e2e/cookie-persistence/cookie-persistence_test.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ func TestCookiePersistenceTestSuite(t *testing.T) {
3838
}
3939

4040
// Expected backend
41-
// backend e2e-tests-cookie-persistence_http-echo_http
41+
// backend e2e-tests-cookie-persistence_svc_http-echo_http
4242
// ...
4343
// cookie mycookie dynamic indirect nocache insert
4444
// dynamic-cookie-key ohph7OoGhong
@@ -84,7 +84,7 @@ func (suite *CookiePersistenceTestSuite) Test_CookiePersistence_Dynamic() {
8484
reader := strings.NewReader(cfg)
8585
p, err := parser.New(options.Reader(reader))
8686
suite.Require().NoError(err, "Could not get Haproxy config parser")
87-
beName := suite.test.GetNS() + "_http-echo_http"
87+
beName := suite.test.GetNS() + "_svc_http-echo_http"
8888
serverName := "SRV_1"
8989

9090
suite.checkServerNoCookie(p, beName, serverName)
@@ -122,7 +122,7 @@ func (suite *CookiePersistenceTestSuite) Test_CookiePersistence_Dynamic() {
122122
}
123123

124124
// Expected backend
125-
// backend e2e-tests-cookie-persistence_http-echo_http
125+
// backend e2e-tests-cookie-persistence_svc_http-echo_http
126126
// ...
127127
// cookie mycookie indirect nocache insert
128128
// server SRV_1 10.244.0.13:8888 enabled cookie SRV_1
@@ -166,7 +166,7 @@ func (suite *CookiePersistenceTestSuite) Test_CookiePersistence_No_Dynamic() {
166166
suite.Require().NoError(err, "Could not get Haproxy config parser")
167167

168168
// Check that the server line
169-
beName := suite.test.GetNS() + "_http-echo_http"
169+
beName := suite.test.GetNS() + "_svc_http-echo_http"
170170
serverName := "SRV_1"
171171

172172
suite.checkServerCookie(p, beName, serverName)
@@ -242,7 +242,7 @@ func (suite *CookiePersistenceTestSuite) Test_CookiePersistence_Switch() {
242242
reader := strings.NewReader(cfg)
243243
p, err := parser.New(options.Reader(reader))
244244
suite.Require().NoError(err, "Could not get Haproxy config parser")
245-
beName := suite.test.GetNS() + "_http-echo_http"
245+
beName := suite.test.GetNS() + "_svc_http-echo_http"
246246
serverName := "SRV_1"
247247

248248
suite.checkServerNoCookie(p, beName, serverName)

‎deploy/tests/e2e/crd-tcp/config/crd-v1/tcp-cr-backend-switching-rule-acls.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@ spec:
2525
value: -i backend1.example.com
2626
backend_switching_rule_list:
2727
- cond: if
28-
cond_test: 'switch_be_0'
28+
cond_test: "switch_be_0"
2929
index: 0
30-
name: e2e-tests-crd-tcp_http-echo-0_https
30+
name: e2e-tests-crd-tcp_svc_http-echo-0_https
3131
- cond: if
32-
cond_test: 'switch_be_1'
32+
cond_test: "switch_be_1"
3333
index: 1
34-
name: e2e-tests-crd-tcp_http-echo-1_https
34+
name: e2e-tests-crd-tcp_svc_http-echo-1_https
3535
tcp_request_rule_list:
3636
- type: inspect-delay
3737
timeout: 5000

‎deploy/tests/e2e/crd-tcp/config/crd-v1/tcp-cr-backend-switching-rule.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@ spec:
1616
port: 32766
1717
backend_switching_rule_list:
1818
- cond: if
19-
cond_test: '{ req_ssl_sni -i backend0.example.com }'
19+
cond_test: "{ req_ssl_sni -i backend0.example.com }"
2020
index: 0
21-
name: e2e-tests-crd-tcp_http-echo-0_https
21+
name: e2e-tests-crd-tcp_svc_http-echo-0_https
2222
- cond: if
23-
cond_test: '{ req_ssl_sni -i backend1.example.com }'
23+
cond_test: "{ req_ssl_sni -i backend1.example.com }"
2424
index: 1
25-
name: e2e-tests-crd-tcp_http-echo-1_https
25+
name: e2e-tests-crd-tcp_svc_http-echo-1_https
2626
tcp_request_rule_list:
2727
- type: inspect-delay
2828
timeout: 5000

‎deploy/tests/e2e/crd-tcp/config/crd-v1/tcp-cr-full.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@ spec:
2525
value: -i backend1.example.com
2626
backend_switching_rule_list:
2727
- cond: if
28-
cond_test: 'switch_be_0'
28+
cond_test: "switch_be_0"
2929
index: 0
30-
name: e2e-tests-crd-tcp_http-echo-0_https
30+
name: e2e-tests-crd-tcp_svc_http-echo-0_https
3131
- cond: if
32-
cond_test: 'switch_be_1'
32+
cond_test: "switch_be_1"
3333
index: 1
34-
name: e2e-tests-crd-tcp_http-echo-1_https
34+
name: e2e-tests-crd-tcp_svc_http-echo-1_https
3535
capture_list:
3636
- index: 0
3737
type: request

‎deploy/tests/e2e/crd-tcp/config/crd-v3/tcp-cr-backend-switching-rule-acls.yaml‎

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -6,42 +6,42 @@ metadata:
66
creationTimestamp: null
77
name: tcp-1
88
spec:
9-
- frontend:
10-
acl_list:
11-
- acl_name: switch_be_0
12-
criterion: req_ssl_sni
13-
value: -i backend0.example.com
14-
- acl_name: switch_be_1
15-
criterion: req_ssl_sni
16-
value: -i backend1.example.com
17-
backend_switching_rule_list:
18-
- cond: if
19-
cond_test: switch_be_0
20-
name: e2e-tests-crd-tcp_http-echo-0_https
21-
- cond: if
22-
cond_test: switch_be_1
23-
name: e2e-tests-crd-tcp_http-echo-1_https
24-
binds:
25-
v4:
26-
address: 0.0.0.0
27-
name: v4
28-
port: 32766
29-
log_format: '%{+Q}o %t %s'
30-
name: fe-http-echo
31-
tcp_request_rule_list:
32-
- timeout: 5000
33-
type: inspect-delay
34-
- action: accept
35-
cond: if
36-
cond_test: '{ req_ssl_hello_type 1 }'
37-
type: content
38-
tcplog: true
39-
name: tcp-test
40-
service:
41-
name: http-echo
42-
port: 443
43-
services:
44-
- name: http-echo-0
45-
port: 443
46-
- name: http-echo-1
47-
port: 443
9+
- frontend:
10+
acl_list:
11+
- acl_name: switch_be_0
12+
criterion: req_ssl_sni
13+
value: -i backend0.example.com
14+
- acl_name: switch_be_1
15+
criterion: req_ssl_sni
16+
value: -i backend1.example.com
17+
backend_switching_rule_list:
18+
- cond: if
19+
cond_test: switch_be_0
20+
name: e2e-tests-crd-tcp_svc_http-echo-0_https
21+
- cond: if
22+
cond_test: switch_be_1
23+
name: e2e-tests-crd-tcp_svc_http-echo-1_https
24+
binds:
25+
v4:
26+
address: 0.0.0.0
27+
name: v4
28+
port: 32766
29+
log_format: "%{+Q}o %t %s"
30+
name: fe-http-echo
31+
tcp_request_rule_list:
32+
- timeout: 5000
33+
type: inspect-delay
34+
- action: accept
35+
cond: if
36+
cond_test: "{ req_ssl_hello_type 1 }"
37+
type: content
38+
tcplog: true
39+
name: tcp-test
40+
service:
41+
name: http-echo
42+
port: 443
43+
services:
44+
- name: http-echo-0
45+
port: 443
46+
- name: http-echo-1
47+
port: 443

‎deploy/tests/e2e/crd-tcp/config/crd-v3/tcp-cr-backend-switching-rule.yaml‎

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -6,35 +6,35 @@ metadata:
66
creationTimestamp: null
77
name: tcp-1
88
spec:
9-
- frontend:
10-
backend_switching_rule_list:
11-
- cond: if
12-
cond_test: '{ req_ssl_sni -i backend0.example.com }'
13-
name: e2e-tests-crd-tcp_http-echo-0_https
14-
- cond: if
15-
cond_test: '{ req_ssl_sni -i backend1.example.com }'
16-
name: e2e-tests-crd-tcp_http-echo-1_https
17-
binds:
18-
v4:
19-
address: 0.0.0.0
20-
name: v4
21-
port: 32766
22-
log_format: '%{+Q}o %t %s'
23-
name: fe-http-echo
24-
tcp_request_rule_list:
25-
- timeout: 5000
26-
type: inspect-delay
27-
- action: accept
28-
cond: if
29-
cond_test: '{ req_ssl_hello_type 1 }'
30-
type: content
31-
tcplog: true
32-
name: tcp-test
33-
service:
34-
name: http-echo
35-
port: 443
36-
services:
37-
- name: http-echo-0
38-
port: 443
39-
- name: http-echo-1
40-
port: 443
9+
- frontend:
10+
backend_switching_rule_list:
11+
- cond: if
12+
cond_test: "{ req_ssl_sni -i backend0.example.com }"
13+
name: e2e-tests-crd-tcp_svc_http-echo-0_https
14+
- cond: if
15+
cond_test: "{ req_ssl_sni -i backend1.example.com }"
16+
name: e2e-tests-crd-tcp_svc_http-echo-1_https
17+
binds:
18+
v4:
19+
address: 0.0.0.0
20+
name: v4
21+
port: 32766
22+
log_format: "%{+Q}o %t %s"
23+
name: fe-http-echo
24+
tcp_request_rule_list:
25+
- timeout: 5000
26+
type: inspect-delay
27+
- action: accept
28+
cond: if
29+
cond_test: "{ req_ssl_hello_type 1 }"
30+
type: content
31+
tcplog: true
32+
name: tcp-test
33+
service:
34+
name: http-echo
35+
port: 443
36+
services:
37+
- name: http-echo-0
38+
port: 443
39+
- name: http-echo-1
40+
port: 443

‎deploy/tests/e2e/crd-tcp/config/crd-v3/tcp-cr-full.yaml‎

Lines changed: 54 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -6,57 +6,57 @@ metadata:
66
creationTimestamp: null
77
name: tcp-1
88
spec:
9-
- frontend:
10-
acl_list:
11-
- acl_name: switch_be_0
12-
criterion: req_ssl_sni
13-
value: -i backend0.example.com
14-
- acl_name: switch_be_1
15-
criterion: req_ssl_sni
16-
value: -i backend1.example.com
17-
backend_switching_rule_list:
18-
- cond: if
19-
cond_test: switch_be_0
20-
name: e2e-tests-crd-tcp_http-echo-0_https
21-
- cond: if
22-
cond_test: switch_be_1
23-
name: e2e-tests-crd-tcp_http-echo-1_https
24-
binds:
25-
v4:
26-
address: 0.0.0.0
27-
name: v4
28-
port: 32766
29-
capture_list:
30-
- length: 12345
31-
type: request
32-
- length: 54321
33-
type: response
34-
filter_list:
35-
- trace_name: BEFORE-HTTP-COMP
36-
type: trace
37-
- type: compression
38-
- trace_name: AFTER-HTTP-COMP
39-
type: trace
40-
log_format: '%{+Q}o %t %s'
41-
log_target_list:
42-
- address: stdout
43-
facility: daemon
44-
format: raw
45-
name: fe-http-echo
46-
tcp_request_rule_list:
47-
- timeout: 5000
48-
type: inspect-delay
49-
- action: accept
50-
cond: if
51-
cond_test: '{ req_ssl_hello_type 1 }'
52-
type: content
53-
tcplog: true
54-
name: tcp-test
55-
service:
56-
name: http-echo
57-
port: 443
58-
services:
59-
- name: http-echo-0
60-
port: 443
61-
- name: http-echo-1
62-
port: 443
9+
- frontend:
10+
acl_list:
11+
- acl_name: switch_be_0
12+
criterion: req_ssl_sni
13+
value: -i backend0.example.com
14+
- acl_name: switch_be_1
15+
criterion: req_ssl_sni
16+
value: -i backend1.example.com
17+
backend_switching_rule_list:
18+
- cond: if
19+
cond_test: switch_be_0
20+
name: e2e-tests-crd-tcp_svc_http-echo-0_https
21+
- cond: if
22+
cond_test: switch_be_1
23+
name: e2e-tests-crd-tcp_svc_http-echo-1_https
24+
binds:
25+
v4:
26+
address: 0.0.0.0
27+
name: v4
28+
port: 32766
29+
capture_list:
30+
- length: 12345
31+
type: request
32+
- length: 54321
33+
type: response
34+
filter_list:
35+
- trace_name: BEFORE-HTTP-COMP
36+
type: trace
37+
- type: compression
38+
- trace_name: AFTER-HTTP-COMP
39+
type: trace
40+
log_format: "%{+Q}o %t %s"
41+
log_target_list:
42+
- address: stdout
43+
facility: daemon
44+
format: raw
45+
name: fe-http-echo
46+
tcp_request_rule_list:
47+
- timeout: 5000
48+
type: inspect-delay
49+
- action: accept
50+
cond: if
51+
cond_test: "{ req_ssl_hello_type 1 }"
52+
type: content
53+
tcplog: true
54+
name: tcp-test
55+
service:
56+
name: http-echo
57+
port: 443
58+
services:
59+
- name: http-echo-0
60+
port: 443
61+
- name: http-echo-1
62+
port: 443

0 commit comments

Comments
 (0)