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

Fix MetricsGrabber test: only check for the master pods if the master node is registered

Browse Source
This commit is contained in:
David Ashpole 2021-02-10 10:58:31 -08:00
parent dcec526c80
commit 0272980ab1
1 changed files with 9 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
test/e2e/instrumentation/monitoring/metrics_grabber.go
View File

@ -37,17 +37,25 @@ var _ = instrumentation.SIGDescribe("MetricsGrabber", func() {
f := framework.NewDefaultFramework("metrics-grabber") f := framework.NewDefaultFramework("metrics-grabber")
var c, ec clientset.Interface var c, ec clientset.Interface
var grabber *e2emetrics.Grabber var grabber *e2emetrics.Grabber
var masterRegistered bool
ginkgo.BeforeEach(func() { ginkgo.BeforeEach(func() {
var err error var err error
c = f.ClientSet c = f.ClientSet
ec = f.KubemarkExternalClusterClientSet ec = f.KubemarkExternalClusterClientSet
// Check if master Node is registered
nodes, err := c.CoreV1().Nodes().List(context.TODO(), metav1.ListOptions{})
framework.ExpectNoError(err) framework.ExpectNoError(err)
for _, node := range nodes.Items {
if strings.HasSuffix(node.Name, "master") {
masterRegistered = true
}
}
gomega.Eventually(func() error { gomega.Eventually(func() error {
grabber, err = e2emetrics.NewMetricsGrabber(c, ec, true, true, true, true, true) grabber, err = e2emetrics.NewMetricsGrabber(c, ec, true, true, true, true, true)
if err != nil { if err != nil {
return fmt.Errorf("failed to create metrics grabber: %v", err) return fmt.Errorf("failed to create metrics grabber: %v", err)
} }
if !grabber.HasControlPlanePods() { if masterRegistered && !grabber.HasControlPlanePods() {
return fmt.Errorf("unable to get find control plane pods") return fmt.Errorf("unable to get find control plane pods")
} }
return nil return nil
@ -72,16 +80,6 @@ var _ = instrumentation.SIGDescribe("MetricsGrabber", func() {
ginkgo.It("should grab all metrics from a Scheduler.", func() { ginkgo.It("should grab all metrics from a Scheduler.", func() {
ginkgo.By("Proxying to Pod through the API server") ginkgo.By("Proxying to Pod through the API server")
// Check if master Node is registered
nodes, err := c.CoreV1().Nodes().List(context.TODO(), metav1.ListOptions{})
framework.ExpectNoError(err)
var masterRegistered = false
for _, node := range nodes.Items {
if strings.HasSuffix(node.Name, "master") {
masterRegistered = true
}
}
if !masterRegistered { if !masterRegistered {
framework.Logf("Master is node api.Registry. Skipping testing Scheduler metrics.") framework.Logf("Master is node api.Registry. Skipping testing Scheduler metrics.")
return return
@ -93,16 +91,6 @@ var _ = instrumentation.SIGDescribe("MetricsGrabber", func() {
ginkgo.It("should grab all metrics from a ControllerManager.", func() { ginkgo.It("should grab all metrics from a ControllerManager.", func() {
ginkgo.By("Proxying to Pod through the API server") ginkgo.By("Proxying to Pod through the API server")
// Check if master Node is registered
nodes, err := c.CoreV1().Nodes().List(context.TODO(), metav1.ListOptions{})
framework.ExpectNoError(err)
var masterRegistered = false
for _, node := range nodes.Items {
if strings.HasSuffix(node.Name, "master") {
masterRegistered = true
}
}
if !masterRegistered { if !masterRegistered {
framework.Logf("Master is node api.Registry. Skipping testing ControllerManager metrics.") framework.Logf("Master is node api.Registry. Skipping testing ControllerManager metrics.")
return return