github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 19:56:01 +00:00
Code Issues Projects Releases Wiki Activity

volume e2e: block volume metrics fix

Browse Source 
The same PVC name handling as for non-block volumes is also needed for block
volumes.
This commit is contained in:
Patrick Ohly 2021-10-25 12:44:58 +02:00
parent 89dd275dde
commit 4c7a8c494e
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
test/e2e/storage/volume_metrics.go
View File

@ -304,6 +304,12 @@ var _ = utils.SIGDescribe("[Serial] Volume metrics", func() {
} }
key := volumeStatKeys[0] key := volumeStatKeys[0]
kubeletKeyName := fmt.Sprintf("%s_%s", kubeletmetrics.KubeletSubsystem, key) 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 // Poll kubelet metrics waiting for the volume to be picked up
// by the volume stats collector // by the volume stats collector
var kubeMetrics e2emetrics.KubeletMetrics var kubeMetrics e2emetrics.KubeletMetrics
@ -316,7 +322,7 @@ var _ = utils.SIGDescribe("[Serial] Volume metrics", func() {
framework.Logf("Error fetching kubelet metrics") framework.Logf("Error fetching kubelet metrics")
return false, err return false, err
} }
if !findVolumeStatMetric(kubeletKeyName, pvcBlock.Namespace, pvcBlock.Name, kubeMetrics) { if !findVolumeStatMetric(kubeletKeyName, pvcNamespace, pvcName, kubeMetrics) {
return false, nil return false, nil
} }
return true, nil return true, nil
@ -325,7 +331,7 @@ var _ = utils.SIGDescribe("[Serial] Volume metrics", func() {
for _, key := range volumeStatKeys { for _, key := range volumeStatKeys {
kubeletKeyName := fmt.Sprintf("%s_%s", kubeletmetrics.KubeletSubsystem, key) 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) framework.ExpectEqual(found, true, "PVC %s, Namespace %s not found for %s", pvcBlock.Name, pvcBlock.Namespace, kubeletKeyName)
} }