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

Avoid DeprecatedMightBeMasterNode() in e2e metrics

Browse Source 
As its name, DeprecatedMightBeMasterNode is deprecated.
In e2e metrics, the function was used for knowing master node name to
get metrics from kube-scheduler and kube-controller-manager pods.
This make e2e metrics get these metrics directly by getting those pod
names without calling DeprecatedMightBeMasterNode().
This commit is contained in:
Kenichi Omichi
2020-06-24 19:58:43 +00:00
parent b0967edfd7
commit 176c8e219f
4 changed files with 46 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -100,7 +100,7 @@ var _ = utils.SIGDescribe("[Serial] Volume metrics", func() {
ginkgo.It("should create prometheus metrics for volume provisioning and attach/detach", func() {
var err error
if !metricsGrabber.HasRegisteredMaster() {
if !metricsGrabber.HasControlPlanePods() {
e2eskipper.Skipf("Environment does not support getting controller-manager metrics - skipping")
}
@@ -146,7 +146,7 @@ var _ = utils.SIGDescribe("[Serial] Volume metrics", func() {
ginkgo.It("should create prometheus metrics for volume provisioning errors [Slow]", func() {
var err error
if !metricsGrabber.HasRegisteredMaster() {
if !metricsGrabber.HasControlPlanePods() {
e2eskipper.Skipf("Environment does not support getting controller-manager metrics - skipping")
}
@@ -446,7 +446,7 @@ var _ = utils.SIGDescribe("[Serial] Volume metrics", func() {
}
ginkgo.BeforeEach(func() {
if !metricsGrabber.HasRegisteredMaster() {
if !metricsGrabber.HasControlPlanePods() {
e2eskipper.Skipf("Environment does not support getting controller-manager metrics - skipping")
}