github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

volume e2e: block volume metrics fix, II

Browse Source 
Copying from pvcBlock swapped name and namespace (breaking the PVC test case)
and some references to the pvcBlock variable were left unchanged (incorrect
annotations for test failures).
This commit is contained in:
Patrick Ohly
2021-10-26 17:32:59 +02:00
parent 4c7a8c494e
commit 194b31019d
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -304,8 +304,8 @@ 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 pvcName := pvcBlock.Name
pvcNamespace := pvcBlock.Name pvcNamespace := pvcBlock.Namespace
if isEphemeral { if isEphemeral {
pvcName = ephemeral.VolumeClaimName(pod, &pod.Spec.Volumes[0]) pvcName = ephemeral.VolumeClaimName(pod, &pod.Spec.Volumes[0])
pvcNamespace = pod.Namespace pvcNamespace = pod.Namespace
@@ -327,12 +327,12 @@ var _ = utils.SIGDescribe("[Serial] Volume metrics", func() {
} }
return true, nil return true, nil
}) })
framework.ExpectNoError(waitErr, "Unable to find metric %s for PVC %s/%s", kubeletKeyName, pvcBlock.Namespace, pvcBlock.Name) framework.ExpectNoError(waitErr, "Unable to find metric %s for PVC %s/%s", kubeletKeyName, pvcNamespace, pvcName)
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, pvcNamespace, pvcName, 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", pvcName, pvcNamespace, kubeletKeyName)
} }
framework.Logf("Deleting pod %q/%q", pod.Namespace, pod.Name) framework.Logf("Deleting pod %q/%q", pod.Namespace, pod.Name)