Merge pull request #105824 from pohly/generic-ephemeral-volume-test

storage e2e: fix volume metric test for PVC
This commit is contained in:
Kubernetes Prow Robot 2021-10-21 12:41:56 -07:00 committed by GitHub
commit 14c0f84654
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -213,7 +213,6 @@ var _ = utils.SIGDescribe("[Serial] Volume metrics", func() {
}
filesystemMode := func(isEphemeral bool) {
pvcName := pvc.Name
if !isEphemeral {
pvc, err = c.CoreV1().PersistentVolumeClaims(pvc.Namespace).Create(context.TODO(), pvc, metav1.CreateOptions{})
framework.ExpectNoError(err)
@ -230,6 +229,7 @@ var _ = utils.SIGDescribe("[Serial] Volume metrics", func() {
pod, err = c.CoreV1().Pods(ns).Get(context.TODO(), pod.Name, metav1.GetOptions{})
framework.ExpectNoError(err)
pvcName := pvc.Name
if isEphemeral {
pvcName = ephemeral.VolumeClaimName(pod, &pod.Spec.Volumes[0])
}