mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-23 11:50:44 +00:00
node: topology-mgr: e2e: changes to validate admission latency metrics
The component was previously incorrect. This patch updates to the correct component name. Signed-off-by: Swati Sehgal <swsehgal@redhat.com>
This commit is contained in:
parent
bc941633c1
commit
cf21dcef51
@ -23,6 +23,7 @@ import (
|
|||||||
"github.com/onsi/ginkgo/v2"
|
"github.com/onsi/ginkgo/v2"
|
||||||
"github.com/onsi/gomega"
|
"github.com/onsi/gomega"
|
||||||
"github.com/onsi/gomega/gstruct"
|
"github.com/onsi/gomega/gstruct"
|
||||||
|
"github.com/onsi/gomega/types"
|
||||||
|
|
||||||
v1 "k8s.io/api/core/v1"
|
v1 "k8s.io/api/core/v1"
|
||||||
kubeletconfig "k8s.io/kubernetes/pkg/kubelet/apis/config"
|
kubeletconfig "k8s.io/kubernetes/pkg/kubelet/apis/config"
|
||||||
@ -85,6 +86,9 @@ var _ = SIGDescribe("Topology Manager Metrics [Serial][Feature:TopologyManager]"
|
|||||||
"kubelet_topology_manager_admission_errors_total": gstruct.MatchAllElements(nodeID, gstruct.Elements{
|
"kubelet_topology_manager_admission_errors_total": gstruct.MatchAllElements(nodeID, gstruct.Elements{
|
||||||
"": timelessSample(0),
|
"": timelessSample(0),
|
||||||
}),
|
}),
|
||||||
|
"kubelet_topology_manager_admission_duration_ms_count": gstruct.MatchElements(nodeID, gstruct.IgnoreExtras, gstruct.Elements{
|
||||||
|
"": timelessSample(0),
|
||||||
|
}),
|
||||||
})
|
})
|
||||||
|
|
||||||
ginkgo.By("Giving the Kubelet time to start up and produce metrics")
|
ginkgo.By("Giving the Kubelet time to start up and produce metrics")
|
||||||
@ -108,6 +112,9 @@ var _ = SIGDescribe("Topology Manager Metrics [Serial][Feature:TopologyManager]"
|
|||||||
"kubelet_topology_manager_admission_errors_total": gstruct.MatchAllElements(nodeID, gstruct.Elements{
|
"kubelet_topology_manager_admission_errors_total": gstruct.MatchAllElements(nodeID, gstruct.Elements{
|
||||||
"": timelessSample(1),
|
"": timelessSample(1),
|
||||||
}),
|
}),
|
||||||
|
"kubelet_topology_manager_admission_duration_ms_count": gstruct.MatchElements(nodeID, gstruct.IgnoreExtras, gstruct.Elements{
|
||||||
|
"": checkMetricValueGreaterThan(0),
|
||||||
|
}),
|
||||||
})
|
})
|
||||||
|
|
||||||
ginkgo.By("Giving the Kubelet time to start up and produce metrics")
|
ginkgo.By("Giving the Kubelet time to start up and produce metrics")
|
||||||
@ -122,7 +129,7 @@ var _ = SIGDescribe("Topology Manager Metrics [Serial][Feature:TopologyManager]"
|
|||||||
|
|
||||||
// we updated the kubelet config in BeforeEach, so we can assume we start fresh.
|
// we updated the kubelet config in BeforeEach, so we can assume we start fresh.
|
||||||
// being [Serial], we can also assume noone else but us is running pods.
|
// being [Serial], we can also assume noone else but us is running pods.
|
||||||
ginkgo.By("Checking the cpumanager metrics right after the kubelet restart, with pod should be admitted")
|
ginkgo.By("Checking the topologymanager metrics right after the kubelet restart, with pod should be admitted")
|
||||||
|
|
||||||
matchResourceMetrics := gstruct.MatchKeys(gstruct.IgnoreExtras, gstruct.Keys{
|
matchResourceMetrics := gstruct.MatchKeys(gstruct.IgnoreExtras, gstruct.Keys{
|
||||||
"kubelet_topology_manager_admission_requests_total": gstruct.MatchAllElements(nodeID, gstruct.Elements{
|
"kubelet_topology_manager_admission_requests_total": gstruct.MatchAllElements(nodeID, gstruct.Elements{
|
||||||
@ -131,6 +138,9 @@ var _ = SIGDescribe("Topology Manager Metrics [Serial][Feature:TopologyManager]"
|
|||||||
"kubelet_topology_manager_admission_errors_total": gstruct.MatchAllElements(nodeID, gstruct.Elements{
|
"kubelet_topology_manager_admission_errors_total": gstruct.MatchAllElements(nodeID, gstruct.Elements{
|
||||||
"": timelessSample(0),
|
"": timelessSample(0),
|
||||||
}),
|
}),
|
||||||
|
"kubelet_topology_manager_admission_duration_ms_count": gstruct.MatchElements(nodeID, gstruct.IgnoreExtras, gstruct.Elements{
|
||||||
|
"": checkMetricValueGreaterThan(0),
|
||||||
|
}),
|
||||||
})
|
})
|
||||||
|
|
||||||
ginkgo.By("Giving the Kubelet time to start up and produce metrics")
|
ginkgo.By("Giving the Kubelet time to start up and produce metrics")
|
||||||
@ -157,3 +167,12 @@ func hostCheck() (int, int) {
|
|||||||
|
|
||||||
return numaNodes, coreCount
|
return numaNodes, coreCount
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func checkMetricValueGreaterThan(value interface{}) types.GomegaMatcher {
|
||||||
|
return gstruct.PointTo(gstruct.MatchAllFields(gstruct.Fields{
|
||||||
|
// We already check Metric when matching the Id
|
||||||
|
"Metric": gstruct.Ignore(),
|
||||||
|
"Value": gomega.BeNumerically(">", value),
|
||||||
|
"Timestamp": gstruct.Ignore(),
|
||||||
|
}))
|
||||||
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user