ToSquash: Add integration test for NewAlertGetter

Author: hongkailiu

pkg/alert/alerts.go

@@ -10,6 +10,7 @@ import (
 	"k8s.io/client-go/rest"
 
 	routev1 "github.com/openshift/api/route/v1"
+	routeclientset "github.com/openshift/client-go/route/clientset/versioned"
 	routev1client "github.com/openshift/client-go/route/clientset/versioned/typed/route/v1"
 )
 
@@ -51,14 +52,13 @@ type Getter interface {
 	Get(ctx context.Context) (*DataAndStatus, error)
 }
 
-func NewAlertGetterOrDie(c *rest.Config) Getter {
-	client := routev1client.NewForConfigOrDie(c)
-	return &ocAlertGetter{config: c, routeClient: client}
+func NewAlertGetter(c *rest.Config, routeClient routeclientset.Interface) Getter {
+	return &ocAlertGetter{config: c, routesGetter: routeClient.RouteV1()}
 }
 
 type ocAlertGetter struct {
-	config      *rest.Config
-	routeClient *routev1client.RouteV1Client
+	config       *rest.Config
+	routesGetter routev1client.RoutesGetter
 }
 
 func (o *ocAlertGetter) Get(ctx context.Context) (*DataAndStatus, error) {
@@ -68,7 +68,7 @@ func (o *ocAlertGetter) Get(ctx context.Context) (*DataAndStatus, error) {
 	}
 
 	routeGetter := func(ctx context.Context, namespace string, name string, opts metav1.GetOptions) (*routev1.Route, error) {
-		return o.routeClient.Routes(namespace).Get(ctx, name, opts)
+		return o.routesGetter.Routes(namespace).Get(ctx, name, opts)
 	}
 	alertsBytes, err := GetAlerts(ctx, roundTripper, routeGetter)
 	if err != nil {

pkg/start/start.go

@@ -37,6 +37,7 @@ import (
 	configinformers "github.com/openshift/client-go/config/informers/externalversions"
 	operatorclientset "github.com/openshift/client-go/operator/clientset/versioned"
 	operatorinformers "github.com/openshift/client-go/operator/informers/externalversions"
+	routeclientset "github.com/openshift/client-go/route/clientset/versioned"
 	"github.com/openshift/library-go/pkg/config/clusterstatus"
 	libgoleaderelection "github.com/openshift/library-go/pkg/config/leaderelection"
 
@@ -506,6 +507,10 @@ func (cb *ClientBuilder) OperatorClientOrDie(name string, configFns ...func(*res
 	return operatorclientset.NewForConfigOrDie(rest.AddUserAgent(cb.RestConfig(configFns...), name))
 }
 
+func (cb *ClientBuilder) RouteClientOrDie(name string, configFns ...func(*rest.Config)) routeclientset.Interface {
+	return routeclientset.NewForConfigOrDie(rest.AddUserAgent(cb.RestConfig(configFns...), name))
+}
+
 func newClientBuilder(kubeconfig string) (*ClientBuilder, error) {
 	clientCfg := clientcmd.NewDefaultClientConfigLoadingRules()
 	clientCfg.ExplicitPath = kubeconfig
@@ -603,6 +608,8 @@ func (o *Options) NewControllerContext(
 	cvoKubeClient := cb.KubeClientOrDie(o.Namespace, useProtobuf)
 	o.PromQLTarget.KubeClient = cvoKubeClient
 
+	routeClient := cb.RouteClientOrDie("route-client")
+
 	cvo, err := cvo.New(
 		o.NodeName,
 		o.Namespace, o.Name,
@@ -629,7 +636,7 @@ func (o *Options) NewControllerContext(
 		startingFeatureSet,
 		startingCvoGates,
 		startingEnabledManifestFeatureGates,
-		alert.NewAlertGetterOrDie(cb.config),
+		alert.NewAlertGetter(cb.RestConfig(), routeClient),
 	)
 	if err != nil {
 		return nil, err

pkg/start/start_integration_test.go

@@ -32,6 +32,7 @@ import (
 	clientset "github.com/openshift/client-go/config/clientset/versioned"
 
 	"github.com/openshift/cluster-version-operator/lib/resourcemerge"
+	"github.com/openshift/cluster-version-operator/pkg/alert"
 	"github.com/openshift/cluster-version-operator/pkg/cvo"
 	"github.com/openshift/cluster-version-operator/pkg/internal"
 	"github.com/openshift/cluster-version-operator/pkg/payload"
@@ -122,6 +123,14 @@ func TestIntegrationCVO_initializeAndUpgrade(t *testing.T) {
 	kc := cb.KubeClientOrDie("integration-test")
 	client := cb.ClientOrDie("integration-test")
 
+	routeClient := cb.RouteClientOrDie("integration-test")
+	alertGetter := alert.NewAlertGetter(cb.RestConfig(), routeClient)
+	data, err := alertGetter.Get(ctx)
+	if err != nil {
+		t.Fatal(err)
+	}
+	t.Logf("alertGetter got data: %v", data)
+
 	ns := fmt.Sprintf("e2e-cvo-%s", randutil.String(4))
 
 	if _, err := kc.CoreV1().Namespaces().Create(

vendor/github.com/openshift/client-go/route/clientset/versioned/clientset.go

@@ -235,6 +235,7 @@ github.com/openshift/client-go/operator/listers/operator/v1
 github.com/openshift/client-go/operator/listers/operator/v1alpha1
 github.com/openshift/client-go/route/applyconfigurations/internal
 github.com/openshift/client-go/route/applyconfigurations/route/v1
+github.com/openshift/client-go/route/clientset/versioned
 github.com/openshift/client-go/route/clientset/versioned/scheme
 github.com/openshift/client-go/route/clientset/versioned/typed/route/v1
 github.com/openshift/client-go/security/applyconfigurations