Skip to content

Commit f168716

Browse files
committed
fix ingress tests
1 parent fd61b79 commit f168716

File tree

1 file changed

+17
-25
lines changed

1 file changed

+17
-25
lines changed

tests/unit/ingress_test.yaml

Lines changed: 17 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -37,19 +37,16 @@ tests:
3737
- equal: &st2web_rules_host
3838
path: spec.rules[0].host
3939
value: *st2web_hostname
40-
- contains: &one_host_path
40+
- contains:
4141
path: spec.rules[0].http.paths
4242
count: 1
43-
- equal: &host_path_is_root
44-
path: spec.rules[0].http.paths[0].path
45-
value: "/"
43+
content:
44+
path: "/"
45+
backend:
46+
serviceName: st2ha-st2web
47+
servicePort: 80
4648
- isNull:
4749
path: spec.rules[0].http.paths[0].pathType
48-
- equal:
49-
path: spec.rules[0].http.paths[0].backend
50-
value:
51-
serviceName: st2ha-st2web
52-
servicePort: 80
5350

5451
- it: Ingress is present when enabled without hosts (newer k8s)
5552
capabilities:
@@ -74,18 +71,17 @@ tests:
7471
value: Ingress
7572
# no ingress.hosts, so only st2web.hostname
7673
- equal: *st2web_rules_host
77-
- contains: *one_host_path
78-
- equal: *host_path_is_root
79-
- equal:
80-
path: spec.rules[0].http.paths[0].pathType
81-
value: Preix
82-
- equal:
83-
path: spec.rules[0].http.paths[0].backend
84-
value:
85-
service:
86-
name: st2ha-st2web
87-
port:
88-
number: 80
74+
- contains:
75+
path: spec.rules[0].http.paths
76+
count: 1
77+
content:
78+
path: "/"
79+
pathType: Prefix
80+
backend:
81+
service:
82+
name: st2ha-st2web
83+
port:
84+
number: 80
8985

9086
- it: Ingress is present when enabled with hosts (older k8s)
9187
capabilities:
@@ -116,9 +112,6 @@ tests:
116112
value: Ingress
117113
# no ingress.hosts, so only st2web.hostname
118114
- equal: *st2web_rules_host
119-
- contains: &two_host_paths
120-
path: spec.rules[0].http.paths
121-
count: 2
122115
- equal: &host_path_is_root_glob
123116
path: spec.rules[0].http.paths[0].path
124117
value: "/*"
@@ -164,7 +157,6 @@ tests:
164157
value: Ingress
165158
# no ingress.hosts, so only st2web.hostname
166159
- equal: *st2web_rules_host
167-
- contains: *two_host_paths
168160
- equal: *host_path_is_root_glob
169161
- equal:
170162
path: spec.rules[0].http.paths[0].pathType

0 commit comments

Comments
 (0)