github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-21 19:01:49 +00:00
Code Issues Projects Releases Wiki Activity

Replaced 4 kube::test::get_object_assert() calls with 1 call using regex to match all combinations

Browse Source
This commit is contained in:
Brian Pursley 2020-06-09 08:35:54 -04:00
parent 04dec17d5b
commit f5dc5300c6
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
test/cmd/discovery.sh
View File

@ -86,12 +86,9 @@ run_resource_aliasing_tests() {
request="{{range.items}}{{range .metadata.labels}}{{.}}:{{end}}{{end}}" request="{{range.items}}{{range .metadata.labels}}{{.}}:{{end}}{{end}}"
# all 4 cassandra's might not be in the request immediately... # all 4 cassandra's might not be in the request immediately...
# first option with :: suffix is for possible service.kubernetes.io/headless # :? suffix is for possible service.kubernetes.io/headless
# label with "" value # label with "" value
kube::test::get_object_assert "$object" "$request" 'cassandra:cassandra:cassandra:cassandra::' || \ kube::test::get_object_assert "$object" "$request" '(cassandra:){2}(cassandra:(cassandra::?)?)?'
kube::test::get_object_assert "$object" "$request" 'cassandra:cassandra:cassandra:cassandra:' || \
kube::test::get_object_assert "$object" "$request" 'cassandra:cassandra:cassandra:' || \
kube::test::get_object_assert "$object" "$request" 'cassandra:cassandra:'
kubectl delete all -l app=cassandra "${kube_flags[@]}" kubectl delete all -l app=cassandra "${kube_flags[@]}"