github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-14 13:45:06 +00:00
Code Issues Projects Releases Wiki Activity

Address review comments

Browse Source
This commit is contained in:
Vaibhav Kamra
2017-09-21 13:44:06 -07:00
parent 1d6a701e76
commit 41dabd7918
1 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -63,6 +63,12 @@ var _ = SIGDescribe("[Serial] Volume metrics", func() {
} }
}) })
AfterEach(func() {
defer func() {
framework.DeletePersistentVolumeClaim(c, pvc.Name, pvc.Namespace)
}()
})
It("should create prometheus metrics for volume provisioning and attach/detach", func() { It("should create prometheus metrics for volume provisioning and attach/detach", func() {
var err error var err error
@@ -74,10 +80,6 @@ var _ = SIGDescribe("[Serial] Volume metrics", func() {
pvc, err = c.CoreV1().PersistentVolumeClaims(pvc.Namespace).Create(pvc) pvc, err = c.CoreV1().PersistentVolumeClaims(pvc.Namespace).Create(pvc)
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
Expect(pvc).ToNot(Equal(nil)) Expect(pvc).ToNot(Equal(nil))
defer func() {
framework.Logf("Deleting claim %q/%q", pvc.Namespace, pvc.Name)
framework.ExpectNoError(c.CoreV1().PersistentVolumeClaims(pvc.Namespace).Delete(pvc.Name, nil))
}()
claims := []*v1.PersistentVolumeClaim{pvc} claims := []*v1.PersistentVolumeClaim{pvc}
@@ -101,15 +103,11 @@ var _ = SIGDescribe("[Serial] Volume metrics", func() {
} }
}) })
It("should create prometheus metrics for volume summary stats", func() { It("should create volume metrics with the correct PVC ref", func() {
var err error var err error
pvc, err = c.CoreV1().PersistentVolumeClaims(pvc.Namespace).Create(pvc) pvc, err = c.CoreV1().PersistentVolumeClaims(pvc.Namespace).Create(pvc)
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
Expect(pvc).ToNot(Equal(nil)) Expect(pvc).ToNot(Equal(nil))
defer func() {
framework.Logf("Deleting claim %q/%q", pvc.Namespace, pvc.Name)
framework.ExpectNoError(c.CoreV1().PersistentVolumeClaims(pvc.Namespace).Delete(pvc.Name, nil))
}()
claims := []*v1.PersistentVolumeClaim{pvc} claims := []*v1.PersistentVolumeClaim{pvc}
pod := framework.MakePod(ns, claims, false, "") pod := framework.MakePod(ns, claims, false, "")
@@ -179,12 +177,19 @@ func getControllerStorageMetrics(ms metrics.ControllerManagerMetrics) map[string
// Verifies the specified metrics are in `kubeletMetrics` // Verifies the specified metrics are in `kubeletMetrics`
func verifyVolumeStatMetric(metricKeyName string, namespace string, pvcName string, kubeletMetrics metrics.KubeletMetrics) { func verifyVolumeStatMetric(metricKeyName string, namespace string, pvcName string, kubeletMetrics metrics.KubeletMetrics) {
found := false found := false
invalidSamples := []string{}
if samples, ok := kubeletMetrics[metricKeyName]; ok { if samples, ok := kubeletMetrics[metricKeyName]; ok {
for _, sample := range samples { for _, sample := range samples {
samplePVC, ok := sample.Metric["persistentvolumeclaim"] samplePVC, ok := sample.Metric["persistentvolumeclaim"]
Expect(ok).To(BeTrue(), "Error getting pvc for %s", metricKeyName) if !ok {
framework.Logf("Error getting pvc for metric %s, sample %s", metricKeyName, sample.String())
invalidSamples = append(invalidSamples, sample.String())
}
sampleNS, ok := sample.Metric["namespace"] sampleNS, ok := sample.Metric["namespace"]
Expect(ok).To(BeTrue(), "Error getting namespace for %s", metricKeyName) if !ok {
framework.Logf("Error getting namespace for metric %s, sample %s", metricKeyName, sample.String())
invalidSamples = append(invalidSamples, sample.String())
}
if string(samplePVC) == pvcName && string(sampleNS) == namespace { if string(samplePVC) == pvcName && string(sampleNS) == namespace {
found = true found = true
@@ -192,5 +197,6 @@ func verifyVolumeStatMetric(metricKeyName string, namespace string, pvcName stri
} }
} }
} }
Expect(invalidSamples).To(HaveLen(0), "Found %d invalid samples", len(invalidSamples))
Expect(found).To(BeTrue(), "PVC %s, Namespace %s not found for %s", pvcName, namespace, metricKeyName) Expect(found).To(BeTrue(), "PVC %s, Namespace %s not found for %s", pvcName, namespace, metricKeyName)
} }