Merge remote-tracking branch 'origin/master' into release-1.26

openshift · Nov 18, 2022 · b7d2e09 · b7d2e09
2 parents 2b09d01 + 57eb5d6
commit b7d2e09
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/test/e2e/dra/test-driver/README.md b/test/e2e/dra/test-driver/README.md
@@ -55,7 +55,7 @@ kubelet<->dynamic resource allocation plugin interaction.
 
 To try out the feature, build Kubernetes, then in one console run:
 ```console
-FEATURE_GATES=DynamicResourceAllocation=true ALLOW_PRIVILEGED=1 ./hack/local-up-cluster.sh -O
+RUNTIME_CONFIG="resource.k8s.io/v1alpha1" FEATURE_GATES=DynamicResourceAllocation=true ALLOW_PRIVILEGED=1 ./hack/local-up-cluster.sh -O
 ```
 
 In another:

diff --git a/test/e2e/dra/test-driver/deploy/example/pod-inline.yaml b/test/e2e/dra/test-driver/deploy/example/pod-inline.yaml
@@ -3,7 +3,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: inline-claim-parameters
+  name: test-inline-claim-parameters
   namespace: default
 data:
   a: b
@@ -21,7 +21,7 @@ spec:
     resourceClassName: example
     parametersRef:
       kind: ConfigMap
-      name: pause-claim-parameters
+      name: test-inline-claim-parameters
 ---
 apiVersion: v1
 kind: Pod