Merge pull request #685 from jgehrcke/jp/tests-v1-exactly

tests: construct ResourceClaim differently on v1

Author: jgehrcke

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
 }
 
 

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