Final fixes

Signed-off-by: William Yao <william2000yao@gmail.com>

Author: willie-yao

README.md

@@ -247,7 +247,7 @@ select and configure resources in various ways:
 kubectl apply --filename=demo/basic-resourceclaimtemplate.yaml \
   --filename=demo/basic-multiple-requests.yaml \
   --filename=demo/basic-shared-claim-across-containers.yaml \
-  --filename=demo/shared-claim-across-pods.yaml \
+  --filename=demo/basic-shared-claim-across-pods.yaml \
   --filename=demo/basic-resourceclaim-opaque-config.yaml
 ```
 
@@ -261,21 +261,18 @@ basic-resourceclaimtemplate            pod1   0/1     Pending             0
 basic-multiple-requests                pod0   0/2     Pending             0          2s
 basic-shared-claim-across-containers   pod0   0/1     ContainerCreating   0          2s
 basic-shared-claim-across-containers   pod1   0/1     ContainerCreating   0          2s
-shared-claim-across-pods               pod0   0/1     Pending             0          2s
+basic-shared-claim-across-pods         pod0   0/1     Pending             0          2s
 basic-resourceclaim-opaque-config      pod0   0/4     Pending             0          2s
 ...
 ```
 
 Use your favorite editor to look through each of the `basic-*.yaml`
-files and see what they are doing. The semantics of each match the figure
-below:
-
-![Demo Apps Figure](demo/demo-apps.png?raw=true "Semantics of the applications requesting resources from the example DRA resource driver.")
+files and see what they are doing.
 
 Then dump the logs of each app to verify that GPUs were allocated to them
 according to these semantics:
 ```bash
-for ns in basic-resourceclaimtemplate basic-multiple-requests basic-shared-claim-across-containers shared-claim-across-pods basic-resourceclaim-opaque-config; do \
+for ns in basic-resourceclaimtemplate basic-multiple-requests basic-shared-claim-across-containers basic-shared-claim-across-pods basic-resourceclaim-opaque-config; do \
   echo "${ns}:"
   for pod in $(kubectl get pod -n ${ns} --output=jsonpath='{.items[*].metadata.name}'); do \
     for ctr in $(kubectl get pod -n ${ns} ${pod} -o jsonpath='{.spec.containers[*].name}'); do \
@@ -310,7 +307,7 @@ declare -x GPU_DEVICE_2="gpu-2"
 declare -x GPU_DEVICE_2_SHARING_STRATEGY="TimeSlicing"
 declare -x GPU_DEVICE_2_TIMESLICE_INTERVAL="Default"
 
-shared-claim-across-pods:
+basic-shared-claim-across-pods:
 pod0 ctr0:
 declare -x GPU_DEVICE_3="gpu-3"
 declare -x GPU_DEVICE_3_SHARING_STRATEGY="TimeSlicing"
@@ -402,7 +399,7 @@ example apps:
 kubectl delete --wait=false --filename=demo/basic-resourceclaimtemplate.yaml \
   --filename=demo/basic-multiple-requests.yaml \
   --filename=demo/basic-shared-claim-across-containers.yaml \
-  --filename=demo/shared-claim-across-pods.yaml \
+  --filename=demo/basic-shared-claim-across-pods.yaml \
   --filename=demo/basic-resourceclaim-opaque-config.yaml \
   --filename=demo/admin-access.yaml
 ```
@@ -417,7 +414,7 @@ basic-resourceclaimtemplate            pod1   1/1     Terminating   0          3
 basic-multiple-requests                pod0   2/2     Terminating   0          31m
 basic-shared-claim-across-containers   pod0   1/1     Terminating   0          31m
 basic-shared-claim-across-containers   pod1   1/1     Terminating   0          31m
-shared-claim-across-pods               pod0   1/1     Terminating   0          31m
+basic-shared-claim-across-pods         pod0   1/1     Terminating   0          31m
 basic-resourceclaim-opaque-config      pod0   4/4     Terminating   0          31m
 admin-access                           pod0   1/1     Terminating   0          31m
 ...

demo/shared-claim-across-pods.yaml demo/basic-shared-claim-across-pods.yamldemo/shared-claim-across-pods.yaml renamed to demo/basic-shared-claim-across-pods.yaml

@@ -7,8 +7,8 @@
 # object that multiple pods can reference by name.
 #
 # Expected: Both pods see the same GPU. Check with:
-#   kubectl logs -n shared-claim-across-pods pod0 -c ctr0 | grep GPU_DEVICE
-#   kubectl logs -n shared-claim-across-pods pod1 -c ctr0 | grep GPU_DEVICE
+#   kubectl logs -n basic-shared-claim-across-pods pod0 -c ctr0 | grep GPU_DEVICE
+#   kubectl logs -n basic-shared-claim-across-pods pod1 -c ctr0 | grep GPU_DEVICE
 # Both pods should show the same GPU ID.
 #
 # Driver requirements:
@@ -22,13 +22,13 @@
 apiVersion: v1
 kind: Namespace
 metadata:
-  name: shared-claim-across-pods
+  name: basic-shared-claim-across-pods
 
 ---
 apiVersion: resource.k8s.io/v1
 kind: ResourceClaim
 metadata:
-  namespace: shared-claim-across-pods
+  namespace: basic-shared-claim-across-pods
   name: single-gpu
 spec:
     devices:
@@ -41,7 +41,7 @@ spec:
 apiVersion: v1
 kind: Pod
 metadata:
-  namespace: shared-claim-across-pods
+  namespace: basic-shared-claim-across-pods
   name: pod0
   labels:
     app: pod
@@ -62,7 +62,7 @@ spec:
 apiVersion: v1
 kind: Pod
 metadata:
-  namespace: shared-claim-across-pods
+  namespace: basic-shared-claim-across-pods
   name: pod1
   labels:
     app: pod

test/e2e/e2e_setup_test.go

@@ -50,7 +50,7 @@ var demoFiles = []string{
 	"basic-multiple-requests.yaml",
 	"basic-shared-claim-across-containers.yaml",
 	"admin-access.yaml", // deploying this earlier to ensure the pod can access in-use devices and does not block future allocations of the same devices
-	"shared-claim-across-pods.yaml",
+	"basic-shared-claim-across-pods.yaml",
 	"basic-resourceclaim-opaque-config.yaml",
 	"initcontainer-shared-gpu.yaml",
 	"cel-selector.yaml",

test/e2e/e2e_test.go

@@ -91,7 +91,7 @@ var _ = Describe("Test GPU allocation", func() {
 		})
 	})
 	Context("Two pods sharing a global ResourceClaim with TimeSlicing and Default interval", func() {
-		namespace := "shared-claim-across-pods"
+		namespace := "basic-shared-claim-across-pods"
 		pods := []string{"pod0", "pod1"}
 		containers := []string{"ctr0"}
 		expectedGPUCount := 1