mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-08-03 09:22:44 +00:00
Merge pull request #125477 from my-git9/namespaceformat
Modify some error words
This commit is contained in:
commit
c6ad6fa951
@ -21984,15 +21984,15 @@ func TestCrossNamespaceSource(t *testing.T) {
|
|||||||
expectedFail: true,
|
expectedFail: true,
|
||||||
claimSpec: pvcSpecWithCrossNamespaceSource(nil, "UnsupportedKind", &goodNS, goodName, false),
|
claimSpec: pvcSpecWithCrossNamespaceSource(nil, "UnsupportedKind", &goodNS, goodName, false),
|
||||||
}, {
|
}, {
|
||||||
testName: "Feature gate enabled and xns DataSourceRef with invalid namspace specified",
|
testName: "Feature gate enabled and xns DataSourceRef with invalid namespace specified",
|
||||||
expectedFail: true,
|
expectedFail: true,
|
||||||
claimSpec: pvcSpecWithCrossNamespaceSource(&snapAPIGroup, snapKind, &badNS, goodName, false),
|
claimSpec: pvcSpecWithCrossNamespaceSource(&snapAPIGroup, snapKind, &badNS, goodName, false),
|
||||||
}, {
|
}, {
|
||||||
testName: "Feature gate enabled and xns DataSourceRef with nil namspace specified",
|
testName: "Feature gate enabled and xns DataSourceRef with nil namespace specified",
|
||||||
expectedFail: false,
|
expectedFail: false,
|
||||||
claimSpec: pvcSpecWithCrossNamespaceSource(&snapAPIGroup, snapKind, nil, goodName, false),
|
claimSpec: pvcSpecWithCrossNamespaceSource(&snapAPIGroup, snapKind, nil, goodName, false),
|
||||||
}, {
|
}, {
|
||||||
testName: "Feature gate enabled and xns DataSourceRef with empty namspace specified",
|
testName: "Feature gate enabled and xns DataSourceRef with empty namespace specified",
|
||||||
expectedFail: false,
|
expectedFail: false,
|
||||||
claimSpec: pvcSpecWithCrossNamespaceSource(&snapAPIGroup, snapKind, &emptyNS, goodName, false),
|
claimSpec: pvcSpecWithCrossNamespaceSource(&snapAPIGroup, snapKind, &emptyNS, goodName, false),
|
||||||
}, {
|
}, {
|
||||||
|
@ -1315,7 +1315,7 @@ func teardownSampleDevicePluginOrFail(ctx context.Context, f *framework.Framewor
|
|||||||
ginkgo.By(fmt.Sprintf("Delete sample device plugin pod %s/%s", pod.Namespace, pod.Name))
|
ginkgo.By(fmt.Sprintf("Delete sample device plugin pod %s/%s", pod.Namespace, pod.Name))
|
||||||
err := f.ClientSet.CoreV1().Pods(pod.Namespace).Delete(ctx, pod.Name, deleteOptions)
|
err := f.ClientSet.CoreV1().Pods(pod.Namespace).Delete(ctx, pod.Name, deleteOptions)
|
||||||
|
|
||||||
framework.ExpectNoError(err, "Failed to delete Pod %v in Namspace %v", pod.Name, pod.Namespace)
|
framework.ExpectNoError(err, "Failed to delete Pod %v in Namespace %v", pod.Name, pod.Namespace)
|
||||||
waitForAllContainerRemoval(ctx, pod.Name, pod.Namespace)
|
waitForAllContainerRemoval(ctx, pod.Name, pod.Namespace)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user