From 784ba187703bc315299762850075ade38d58bb01 Mon Sep 17 00:00:00 2001 From: "Dr. Jan-Philip Gehrcke" Date: Thu, 16 Oct 2025 17:30:44 +0000 Subject: [PATCH] tests: construct ResourceClaim differently on v1 Signed-off-by: Dr. Jan-Philip Gehrcke --- tests/bats/setup_suite.bash | 7 +++++++ tests/bats/specs/rc-opaque-cfg-unknown-field.yaml.tmpl | 6 ++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/tests/bats/setup_suite.bash b/tests/bats/setup_suite.bash index fb05d4494..bf586c08c 100644 --- a/tests/bats/setup_suite.bash +++ b/tests/bats/setup_suite.bash @@ -47,6 +47,13 @@ validate_prerequisites() { # Examples: v1, or v1beta1 export TEST_K8S_RESOURCE_API_VERSION + + # For resource.k8s.io API versions before v1, a ResourceClaim spec looks + # slightly differently. Use flow-style YAML. + export TEST_DEVCLASSNAME_CD_CHANNEL="exactly: {deviceClassName: compute-domain-default-channel.nvidia.com}" + if [[ "${TEST_K8S_RESOURCE_API_VERSION}" != "v1" ]]; then + export TEST_DEVCLASSNAME_CD_CHANNEL="deviceClassName: compute-domain-default-channel.nvidia.com" + fi } diff --git a/tests/bats/specs/rc-opaque-cfg-unknown-field.yaml.tmpl b/tests/bats/specs/rc-opaque-cfg-unknown-field.yaml.tmpl index 82b9727cd..7ab52a7f9 100644 --- a/tests/bats/specs/rc-opaque-cfg-unknown-field.yaml.tmpl +++ b/tests/bats/specs/rc-opaque-cfg-unknown-field.yaml.tmpl @@ -5,8 +5,10 @@ metadata: spec: devices: requests: - - deviceClassName: compute-domain-default-channel.nvidia.com - name: chan + - name: chan + # This part of the ResourceClaim spec changed in + # resource.k8s.io/v1 compared to previous API versions. + ${TEST_DEVCLASSNAME_CD_CHANNEL} config: - opaque: driver: compute-domain.nvidia.com