Enable ComponentSLIs as beta feature

staging/src/k8s.io/apiserver/pkg/server/config_test.go

@@ -170,6 +170,7 @@ func TestNewWithDelegate(t *testing.T) {
 		"/livez/poststarthook/storage-object-count-tracker-hook",
 		"/livez/poststarthook/wrapping-post-start-hook",
 		"/metrics",
+		"/metrics/slis",
 		"/readyz",
 		"/readyz/delegate-health",
 		"/readyz/informer-sync",

staging/src/k8s.io/component-base/metrics/features/kube_features.go

@@ -29,7 +29,7 @@ const (
 
 func featureGates() map[featuregate.Feature]featuregate.FeatureSpec {
 	return map[featuregate.Feature]featuregate.FeatureSpec{
-		ComponentSLIs: {Default: false, PreRelease: featuregate.Alpha},
+		ComponentSLIs: {Default: true, PreRelease: featuregate.Beta},
 	}
 }
 

test/e2e/framework/metrics/OWNERS

@@ -0,0 +1,14 @@
+# See the OWNERS docs at https://go.k8s.io/owners
+
+approvers:
+  - sig-instrumentation-approvers
+emeritus_approvers:
+  - fabxc
+  - piosz
+  - fgrzadkowski
+  - kawych
+  - x13n
+reviewers:
+  - sig-instrumentation-reviewers
+labels:
+  - sig/instrumentation

test/e2e/framework/metrics/api_server_metrics.go

@@ -17,8 +17,6 @@ limitations under the License.
 package metrics
 
 import (
-	"context"
-
 	"k8s.io/component-base/metrics/testutil"
 )
 
@@ -42,19 +40,3 @@ func parseAPIServerMetrics(data string) (APIServerMetrics, error) {
 	}
 	return result, nil
 }
-
-func (g *Grabber) getMetricsFromAPIServer(ctx context.Context) (string, error) {
-	rawOutput, err := g.client.CoreV1().RESTClient().Get().RequestURI("/metrics").Do(ctx).Raw()
-	if err != nil {
-		return "", err
-	}
-	return string(rawOutput), nil
-}
-
-func (g *Grabber) getMetricsSLIsFromAPIServer(ctx context.Context) (string, error) {
-	rawOutput, err := g.client.CoreV1().RESTClient().Get().RequestURI("/metrics/slis").Do(ctx).Raw()
-	if err != nil {
-		return "", err
-	}
-	return string(rawOutput), nil
-}

test/e2e/framework/metrics/kubelet_metrics.go

@@ -93,31 +93,6 @@ func parseKubeletMetrics(data string) (KubeletMetrics, error) {
 	return result, nil
 }
 
-func (g *Grabber) getMetricsFromNode(ctx context.Context, nodeName string, kubeletPort int) (string, error) {
-	// There's a problem with timing out during proxy. Wrapping this in a goroutine to prevent deadlock.
-	finished := make(chan struct{}, 1)
-	var err error
-	var rawOutput []byte
-	go func() {
-		rawOutput, err = g.client.CoreV1().RESTClient().Get().
-			Resource("nodes").
-			SubResource("proxy").
-			Name(fmt.Sprintf("%v:%v", nodeName, kubeletPort)).
-			Suffix("metrics").
-			Do(ctx).Raw()
-		finished <- struct{}{}
-	}()
-	select {
-	case <-time.After(proxyTimeout):
-		return "", fmt.Errorf("Timed out when waiting for proxy to gather metrics from %v", nodeName)
-	case <-finished:
-		if err != nil {
-			return "", err
-		}
-		return string(rawOutput), nil
-	}
-}
-
 // KubeletLatencyMetric stores metrics scraped from the kubelet server's /metric endpoint.
 // TODO: Get some more structure around the metrics and this type
 type KubeletLatencyMetric struct {

test/e2e/framework/metrics/metrics_grabber.go

@@ -195,6 +195,31 @@ func (g *Grabber) grabFromKubeletInternal(ctx context.Context, nodeName string,
 	return parseKubeletMetrics(output)
 }
 
+func (g *Grabber) getMetricsFromNode(ctx context.Context, nodeName string, kubeletPort int) (string, error) {
+	// There's a problem with timing out during proxy. Wrapping this in a goroutine to prevent deadlock.
+	finished := make(chan struct{}, 1)
+	var err error
+	var rawOutput []byte
+	go func() {
+		rawOutput, err = g.client.CoreV1().RESTClient().Get().
+			Resource("nodes").
+			SubResource("proxy").
+			Name(fmt.Sprintf("%v:%v", nodeName, kubeletPort)).
+			Suffix("metrics").
+			Do(ctx).Raw()
+		finished <- struct{}{}
+	}()
+	select {
+	case <-time.After(proxyTimeout):
+		return "", fmt.Errorf("Timed out when waiting for proxy to gather metrics from %v", nodeName)
+	case <-finished:
+		if err != nil {
+			return "", err
+		}
+		return string(rawOutput), nil
+	}
+}
+
 // GrabFromScheduler returns metrics from scheduler
 func (g *Grabber) GrabFromScheduler(ctx context.Context) (SchedulerMetrics, error) {
 	if !g.grabFromScheduler {
@@ -333,6 +358,22 @@ func (g *Grabber) GrabMetricsSLIsFromAPIServer(ctx context.Context) (APIServerMe
 	return parseAPIServerMetrics(output)
 }
 
+func (g *Grabber) getMetricsFromAPIServer(ctx context.Context) (string, error) {
+	rawOutput, err := g.client.CoreV1().RESTClient().Get().RequestURI("/metrics").Do(ctx).Raw()
+	if err != nil {
+		return "", err
+	}
+	return string(rawOutput), nil
+}
+
+func (g *Grabber) getMetricsSLIsFromAPIServer(ctx context.Context) (string, error) {
+	rawOutput, err := g.client.CoreV1().RESTClient().Get().RequestURI("/metrics/slis").Do(ctx).Raw()
+	if err != nil {
+		return "", err
+	}
+	return string(rawOutput), nil
+}
+
 // Grab returns metrics from corresponding component
 func (g *Grabber) Grab(ctx context.Context) (Collection, error) {
 	result := Collection{}
@@ -344,6 +385,12 @@ func (g *Grabber) Grab(ctx context.Context) (Collection, error) {
 		} else {
 			result.APIServerMetrics = metrics
 		}
+		metrics, err = g.GrabMetricsSLIsFromAPIServer(ctx)
+		if err != nil {
+			errs = append(errs, err)
+		} else {
+			result.APIServerMetricsSLIs = metrics
+		}
 	}
 	if g.grabFromScheduler {
 		metrics, err := g.GrabFromScheduler(ctx)
@@ -393,14 +440,6 @@ func (g *Grabber) Grab(ctx context.Context) (Collection, error) {
 			}
 		}
 	}
-	if g.grabFromAPIServer {
-		metrics, err := g.GrabMetricsSLIsFromAPIServer(ctx)
-		if err != nil {
-			errs = append(errs, err)
-		} else {
-			result.APIServerMetricsSLIs = metrics
-		}
-	}
 	if len(errs) > 0 {
 		return result, fmt.Errorf("Errors while grabbing metrics: %v", errs)
 	}