From 4c7a8c494e8b5095bc4104ffda9e15fc1669a0c0 Mon Sep 17 00:00:00 2001 From: Patrick Ohly Date: Mon, 25 Oct 2021 12:44:58 +0200 Subject: [PATCH] volume e2e: block volume metrics fix The same PVC name handling as for non-block volumes is also needed for block volumes. --- test/e2e/storage/volume_metrics.go | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/test/e2e/storage/volume_metrics.go b/test/e2e/storage/volume_metrics.go index 658f9421b0a..fb9e06f0387 100644 --- a/test/e2e/storage/volume_metrics.go +++ b/test/e2e/storage/volume_metrics.go @@ -304,6 +304,12 @@ var _ = utils.SIGDescribe("[Serial] Volume metrics", func() { } key := volumeStatKeys[0] kubeletKeyName := fmt.Sprintf("%s_%s", kubeletmetrics.KubeletSubsystem, key) + pvcName := pvcBlock.Namespace + pvcNamespace := pvcBlock.Name + if isEphemeral { + pvcName = ephemeral.VolumeClaimName(pod, &pod.Spec.Volumes[0]) + pvcNamespace = pod.Namespace + } // Poll kubelet metrics waiting for the volume to be picked up // by the volume stats collector var kubeMetrics e2emetrics.KubeletMetrics @@ -316,7 +322,7 @@ var _ = utils.SIGDescribe("[Serial] Volume metrics", func() { framework.Logf("Error fetching kubelet metrics") return false, err } - if !findVolumeStatMetric(kubeletKeyName, pvcBlock.Namespace, pvcBlock.Name, kubeMetrics) { + if !findVolumeStatMetric(kubeletKeyName, pvcNamespace, pvcName, kubeMetrics) { return false, nil } return true, nil @@ -325,7 +331,7 @@ var _ = utils.SIGDescribe("[Serial] Volume metrics", func() { for _, key := range volumeStatKeys { kubeletKeyName := fmt.Sprintf("%s_%s", kubeletmetrics.KubeletSubsystem, key) - found := findVolumeStatMetric(kubeletKeyName, pvcBlock.Namespace, pvcBlock.Name, kubeMetrics) + found := findVolumeStatMetric(kubeletKeyName, pvcNamespace, pvcName, kubeMetrics) framework.ExpectEqual(found, true, "PVC %s, Namespace %s not found for %s", pvcBlock.Name, pvcBlock.Namespace, kubeletKeyName) }