Skip to content
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
add e2e to check that metrics is accessible
  • Loading branch information
sallyom committed Jan 28, 2020
commit ef77c9b8279a251ce8f202e16d20f86a2c6485cf
64 changes: 64 additions & 0 deletions test/e2e/scheduler_test.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package e2e

import (
"context"
"fmt"
"os"
"strings"
Expand All @@ -12,12 +13,18 @@ import (
configv1client "github.com/openshift/client-go/config/clientset/versioned"
operatorversionedclient "github.com/openshift/client-go/operator/clientset/versioned"
operatorclientv1 "github.com/openshift/client-go/operator/clientset/versioned/typed/operator/v1"
routeclient "github.com/openshift/client-go/route/clientset/versioned"
"github.com/openshift/library-go/pkg/operator/v1helpers"
"github.com/openshift/library-go/test/library/metrics"

"github.com/prometheus/common/model"

appsv1 "k8s.io/api/apps/v1"
corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/util/wait"
"k8s.io/apiserver/pkg/storage/names"
k8sclient "k8s.io/client-go/kubernetes"
"k8s.io/client-go/tools/clientcmd"
"k8s.io/klog"
Expand Down Expand Up @@ -64,6 +71,19 @@ func getOpenShiftOperatorConfigClient() (*operatorversionedclient.Clientset, err
return operatorClient, nil
}

func getOpenShiftRouteClient() (*routeclient.Clientset, error) {
kubeconfig := os.Getenv("KUBECONFIG")
config, err := clientcmd.BuildConfigFromFlags("", kubeconfig)
if err != nil {
return nil, err
}
routeClient, err := routeclient.NewForConfig(config)
if err != nil {
return nil, err
}
return routeClient, nil
}

func waitForOperator(kclient *k8sclient.Clientset) error {
return wait.PollImmediate(1*time.Second, 10*time.Minute, func() (bool, error) {
d, err := kclient.AppsV1().Deployments("openshift-kube-scheduler-operator").Get("openshift-kube-scheduler-operator", metav1.GetOptions{})
Expand Down Expand Up @@ -254,6 +274,50 @@ func TestPolicyConfigMapUpdate(t *testing.T) {
}
}

func TestMetricsAccessible(t *testing.T) {
kClient, err := getKubeClient()
if err != nil {
t.Fatalf("failed to get kubeclient with error %v", err)
}
routeClient, err := getOpenShiftRouteClient()
if err != nil {
t.Fatalf("failed to get routeclient with error %v", err)
}
name := names.SimpleNameGenerator.GenerateName("ksotest-metrics-")
_, err = kClient.CoreV1().Namespaces().Create(&corev1.Namespace{
ObjectMeta: metav1.ObjectMeta{
Name: name,
},
})
if err != nil {
t.Fatalf("could not create test namespace: %v", err)
}
defer kClient.CoreV1().Namespaces().Delete(name, &metav1.DeleteOptions{})

// Now verify kso metrics are accessible
prometheusClient, err := metrics.NewPrometheusClient(kClient, routeClient)
if err != nil {
t.Fatalf("error creating route client for prometheus: %v", err)
}
var response model.Value
err = wait.PollImmediate(time.Second*1, time.Second*30, func() (bool, error) {
response, _, err = prometheusClient.Query(context.Background(), `scheduler_scheduling_duration_seconds_sum`, time.Now())
if err != nil {
return false, fmt.Errorf("error querying prometheus: %v", err)
}
if len(response.String()) == 0 {
return false, nil
}
return true, nil
})
if err != nil {
t.Fatalf("prometheus returned unexpected results: %v", err)
}

// do something with result, eventually this will be tested b4 and after rotation to ensure values differ
t.Logf("result from prometheus query `scheduler_scheduling_duration_seconds_sum`: %v", response)
}

func waitForPolicyConfigMapCreation(kclient *k8sclient.Clientset, cm *corev1.ConfigMap) (*corev1.ConfigMap, error) {
var policyCM *corev1.ConfigMap
err := wait.PollImmediate(1*time.Second, 5*time.Minute, func() (bool, error) {
Expand Down