Rename variables

Signed-off-by: Yann Liu <yannliu@redhat.com>

pilot/pkg/config/kube/ior/ior_test.go

@@ -250,7 +250,7 @@ func TestCreate(t *testing.T) {
 	defer func() { close(stop) }()
 	store, k8sClient, routerClient := initClients(t, stop)
 
-	k8sClient.GetActualClient().OsRouteInformer().SetNamespaces([]string{controlPlaneNs})
+	k8sClient.GetActualClient().RouteInformer().SetNamespaces([]string{controlPlaneNs})
 
 	createIngressGateway(t, k8sClient.GetActualClient(), controlPlaneNs, map[string]string{"istio": "ingressgateway"})
 

pilot/pkg/config/kube/ior/route.go

@@ -78,8 +78,8 @@ func newRoute(
 		podLister:     kubeClient.GetActualClient().KubeInformer().Core().V1().Pods().Lister(),
 		serviceLister: kubeClient.GetActualClient().KubeInformer().Core().V1().Services().Lister(),
 
-		routeClient: kubeClient.GetActualClient().OsRoute(),
-		routeLister: kubeClient.GetActualClient().OsRouteInformer().Route().V1().Routes().Lister(),
+		routeClient: kubeClient.GetActualClient().Route(),
+		routeLister: kubeClient.GetActualClient().RouteInformer().Route().V1().Routes().Lister(),
 	}
 
 	return r

pkg/kube/client.go

@@ -32,10 +32,10 @@ import (
 	gatewayapiinformer "github.com/maistra/xns-informer/pkg/generated/gatewayapi"
 	istioinformer "github.com/maistra/xns-informer/pkg/generated/istio"
 	kubeinformer "github.com/maistra/xns-informer/pkg/generated/kube"
-	osrouteinformer "github.com/maistra/xns-informer/pkg/generated/openshift/route"
+	routeinformer "github.com/maistra/xns-informer/pkg/generated/openshift/route"
 	xnsinformers "github.com/maistra/xns-informer/pkg/informers"
-	osrouteclient "github.com/openshift/client-go/route/clientset/versioned"
-	osroutefake "github.com/openshift/client-go/route/clientset/versioned/fake"
+	routeclient "github.com/openshift/client-go/route/clientset/versioned"
+	routefake "github.com/openshift/client-go/route/clientset/versioned/fake"
 	"go.uber.org/atomic"
 	"golang.org/x/sync/errgroup"
 	"google.golang.org/grpc/credentials"
@@ -128,7 +128,7 @@ type Client interface {
 	// Istio returns the Istio kube client.
 	Istio() istioclient.Interface
 
-	OsRoute() osrouteclient.Interface
+	Route() routeclient.Interface
 
 	// GatewayAPI returns the gateway-api kube client.
 	GatewayAPI() gatewayapiclient.Interface
@@ -145,7 +145,7 @@ type Client interface {
 	// IstioInformer returns an informer for the istio client
 	IstioInformer() istioinformer.SharedInformerFactory
 
-	OsRouteInformer() osrouteinformer.SharedInformerFactory
+	RouteInformer() routeinformer.SharedInformerFactory
 
 	// GatewayAPIInformer returns an informer for the gateway-api client
 	GatewayAPIInformer() gatewayapiinformer.SharedInformerFactory
@@ -270,8 +270,8 @@ func NewFakeClient(objects ...runtime.Object) CLIClient {
 	c.istio = istiofake.NewSimpleClientset()
 	c.istioInformer = istioinformer.NewSharedInformerFactoryWithOptions(c.istio, resyncInterval)
 
-	c.osRoute = osroutefake.NewSimpleClientset()
-	c.osRouteInformer = osrouteinformer.NewSharedInformerFactory(c.osRoute, resyncInterval)
+	c.route = routefake.NewSimpleClientset()
+	c.routeInformer = routeinformer.NewSharedInformerFactory(c.route, resyncInterval)
 
 	c.gatewayapi = gatewayapifake.NewSimpleClientset()
 	c.gatewayapiInformer = gatewayapiinformer.NewSharedInformerFactory(c.gatewayapi, resyncInterval)
@@ -362,8 +362,8 @@ type client struct {
 	istio         istioclient.Interface
 	istioInformer istioinformer.SharedInformerFactory
 
-	osRoute         osrouteclient.Interface
-	osRouteInformer osrouteinformer.SharedInformerFactory
+	route         routeclient.Interface
+	routeInformer routeinformer.SharedInformerFactory
 
 	gatewayapi         gatewayapiclient.Interface
 	gatewayapiInformer gatewayapiinformer.SharedInformerFactory
@@ -451,12 +451,12 @@ func newClientInternal(clientFactory *clientFactory, revision string) (*client,
 		resyncInterval,
 	)
 
-	c.osRoute, err = osrouteclient.NewForConfig(c.config)
+	c.route, err = routeclient.NewForConfig(c.config)
 	if err != nil {
 		return nil, err
 	}
-	c.osRouteInformer = osrouteinformer.NewSharedInformerFactoryWithOptions(
-		c.osRoute,
+	c.routeInformer = routeinformer.NewSharedInformerFactoryWithOptions(
+		c.route,
 		resyncInterval,
 	)
 
@@ -541,8 +541,8 @@ func (c *client) Istio() istioclient.Interface {
 	return c.istio
 }
 
-func (c *client) OsRoute() osrouteclient.Interface {
-	return c.osRoute
+func (c *client) Route() routeclient.Interface {
+	return c.route
 }
 
 func (c *client) GatewayAPI() gatewayapiclient.Interface {
@@ -565,8 +565,8 @@ func (c *client) IstioInformer() istioinformer.SharedInformerFactory {
 	return c.istioInformer
 }
 
-func (c *client) OsRouteInformer() osrouteinformer.SharedInformerFactory {
-	return c.osRouteInformer
+func (c *client) RouteInformer() routeinformer.SharedInformerFactory {
+	return c.routeInformer
 }
 
 func (c *client) GatewayAPIInformer() gatewayapiinformer.SharedInformerFactory {
@@ -589,7 +589,7 @@ func (c *client) AddMemberRoll(namespace, memberRollName string) (err error) {
 
 	c.memberRoll.Register(c.kubeInformer, "kubernetes-informers")
 	c.memberRoll.Register(c.istioInformer, "istio-informers")
-	c.memberRoll.Register(c.osRouteInformer, "openshift-route-informers")
+	c.memberRoll.Register(c.routeInformer, "openshift-route-informers")
 	c.memberRoll.Register(c.dynamicInformer, "dynamic-informers")
 	if features.EnableGatewayAPI {
 		c.memberRoll.Register(c.gatewayapiInformer, "service-apis-informers")
@@ -620,7 +620,7 @@ func (c *client) RunAndWait(stop <-chan struct{}) {
 		fastWaitForCacheSyncDynamic(stop, c.dynamicInformer)
 		fastWaitForCacheSyncDynamic(stop, c.metadataInformer)
 		fastWaitForCacheSync(stop, c.istioInformer)
-		fastWaitForCacheSync(stop, c.osRouteInformer)
+		fastWaitForCacheSync(stop, c.routeInformer)
 		if features.EnableGatewayAPI {
 			fastWaitForCacheSync(stop, c.gatewayapiInformer)
 		}
@@ -641,7 +641,7 @@ func (c *client) RunAndWait(stop <-chan struct{}) {
 		c.dynamicInformer.WaitForCacheSync(stop)
 		c.metadataInformer.WaitForCacheSync(stop)
 		c.istioInformer.WaitForCacheSync(stop)
-		c.osRouteInformer.WaitForCacheSync(stop)
+		c.routeInformer.WaitForCacheSync(stop)
 		if features.EnableGatewayAPI {
 			c.gatewayapiInformer.WaitForCacheSync(stop)
 		}
@@ -654,7 +654,7 @@ func (c *client) startInformer(stop <-chan struct{}) {
 	c.dynamicInformer.Start(stop)
 	c.metadataInformer.Start(stop)
 	c.istioInformer.Start(stop)
-	c.osRouteInformer.Start(stop)
+	c.routeInformer.Start(stop)
 	if features.EnableGatewayAPI {
 		c.gatewayapiInformer.Start(stop)
 	}

pkg/kube/mock_client.go

@@ -22,9 +22,9 @@ import (
 	gatewayapiinformer "github.com/maistra/xns-informer/pkg/generated/gatewayapi"
 	istioinformer "github.com/maistra/xns-informer/pkg/generated/istio"
 	kubeinformer "github.com/maistra/xns-informer/pkg/generated/kube"
-	osrouteinformer "github.com/maistra/xns-informer/pkg/generated/openshift/route"
+	routeinformer "github.com/maistra/xns-informer/pkg/generated/openshift/route"
 	xnsinformers "github.com/maistra/xns-informer/pkg/informers"
-	osrouteclient "github.com/openshift/client-go/route/clientset/versioned"
+	routeclient "github.com/openshift/client-go/route/clientset/versioned"
 	"google.golang.org/grpc/credentials"
 	v1 "k8s.io/api/core/v1"
 	"k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset"
@@ -98,7 +98,7 @@ func (c MockClient) Istio() istioclient.Interface {
 	panic("not used in mock")
 }
 
-func (c MockClient) OsRoute() osrouteclient.Interface {
+func (c MockClient) Route() routeclient.Interface {
 	panic("not used in mock")
 }
 
@@ -114,7 +114,7 @@ func (c MockClient) IstioInformer() istioinformer.SharedInformerFactory {
 	panic("not used in mock")
 }
 
-func (c MockClient) OsRouteInformer() osrouteinformer.SharedInformerFactory {
+func (c MockClient) RouteInformer() routeinformer.SharedInformerFactory {
 	panic("not used in mock")
 }