From f2e421dababef0a253192e5734dfbf9ec9b653e8 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Wed, 13 Aug 2025 13:50:57 -0400 Subject: [PATCH] fix: ensure tests properly fetch data from json output Without this pathing update, the fetched data would sometimes also pull in containerStatus info for newer k8s versions. --- tests/unit/scheduler-k3s-2.bats | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/tests/unit/scheduler-k3s-2.bats b/tests/unit/scheduler-k3s-2.bats index 60734ad07..b1c47e881 100644 --- a/tests/unit/scheduler-k3s-2.bats +++ b/tests/unit/scheduler-k3s-2.bats @@ -17,7 +17,7 @@ teardown_() { uninstall_k3s || true } -@test "(scheduler-k3s) deploy traefik [resource] [autoscaling]" { +@test "(scheduler-k3s) deploy traefik [resource] [autoscaling1]" { if [[ -z "$DOCKERHUB_USERNAME" ]] || [[ -z "$DOCKERHUB_TOKEN" ]]; then skip "skipping due to missing docker.io credentials DOCKERHUB_USERNAME:DOCKERHUB_TOKEN" fi @@ -84,25 +84,25 @@ teardown_() { assert_output "asdfghjkl" # include resource tests - run /bin/bash -c "kubectl get pods -o=jsonpath='{.items[*]..resources.requests.cpu}'" + run /bin/bash -c "kubectl get pods -o=jsonpath='{.items[*].spec.containers[*].resources.requests.cpu}'" echo "output: $output" echo "status: $status" assert_success assert_output "100m" - run /bin/bash -c "kubectl get pods -o=jsonpath='{.items[*]..resources.requests.memory}'" + run /bin/bash -c "kubectl get pods -o=jsonpath='{.items[*].spec.containers[*].resources.requests.memory}'" echo "output: $output" echo "status: $status" assert_success assert_output "128Mi" - run /bin/bash -c "kubectl get pods -o=jsonpath='{.items[*]..resources.limits.cpu}'" + run /bin/bash -c "kubectl get pods -o=jsonpath='{.items[*].spec.containers[*].resources.limits.cpu}'" echo "output: $output" echo "status: $status" assert_success assert_output "" - run /bin/bash -c "kubectl get pods -o=jsonpath='{.items[*]..resources.limits.memory}'" + run /bin/bash -c "kubectl get pods -o=jsonpath='{.items[*].spec.containers[*].resources.limits.memory}'" echo "output: $output" echo "status: $status" assert_success @@ -125,25 +125,25 @@ teardown_() { assert_http_localhost_response "http" "$TEST_APP.dokku.me" "80" "" "python/http.server" - run /bin/bash -c "kubectl get pods -o=jsonpath='{.items[*]..resources.requests.cpu}'" + run /bin/bash -c "kubectl get pods -o=jsonpath='{.items[*].spec.containers[*].resources.requests.cpu}'" echo "output: $output" echo "status: $status" assert_success assert_output "" - run /bin/bash -c "kubectl get pods -o=jsonpath='{.items[*]..resources.requests.memory}'" + run /bin/bash -c "kubectl get pods -o=jsonpath='{.items[*].spec.containers[*].resources.requests.memory}'" echo "output: $output" echo "status: $status" assert_success assert_output "300Mi" - run /bin/bash -c "kubectl get pods -o=jsonpath='{.items[*]..resources.limits.cpu}'" + run /bin/bash -c "kubectl get pods -o=jsonpath='{.items[*].spec.containers[*].resources.limits.cpu}'" echo "output: $output" echo "status: $status" assert_success assert_output "" - run /bin/bash -c "kubectl get pods -o=jsonpath='{.items[*]..resources.limits.memory}'" + run /bin/bash -c "kubectl get pods -o=jsonpath='{.items[*].spec.containers[*].resources.limits.memory}'" echo "output: $output" echo "status: $status" assert_success