rename cb* imports to remove chargeback references

kube-reporting · Aug 4, 2020 · 7e4015b · 7e4015b
1 parent 3bfd918
commit 7e4015b
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/pkg/operator/datasources.go b/pkg/operator/datasources.go
@@ -17,7 +17,7 @@ import (
 
 	metering "github.com/kube-reporting/metering-operator/pkg/apis/metering/v1"
 	"github.com/kube-reporting/metering-operator/pkg/aws"
-	cbInterfaces "github.com/kube-reporting/metering-operator/pkg/generated/clientset/versioned/typed/metering/v1"
+	clientset "github.com/kube-reporting/metering-operator/pkg/generated/clientset/versioned/typed/metering/v1"
 	"github.com/kube-reporting/metering-operator/pkg/hive"
 	"github.com/kube-reporting/metering-operator/pkg/operator/prestostore"
 	"github.com/kube-reporting/metering-operator/pkg/operator/reporting"
@@ -752,7 +752,7 @@ func (op *defaultReportingOperator) queueDependentReportsForDataSource(dataSourc
 	return nil
 }
 
-func updateReportDataSource(dsClient cbInterfaces.ReportDataSourceInterface, dsName string, updateFunc func(*metering.ReportDataSource)) (*metering.ReportDataSource, error) {
+func updateReportDataSource(dsClient clientset.ReportDataSourceInterface, dsName string, updateFunc func(*metering.ReportDataSource)) (*metering.ReportDataSource, error) {
 	var ds *metering.ReportDataSource
 	if err := retry.RetryOnConflict(retry.DefaultBackoff, func() error {
 		newDS, err := dsClient.Get(context.TODO(), dsName, metav1.GetOptions{})

diff --git a/pkg/operator/operator.go b/pkg/operator/operator.go
@@ -14,7 +14,7 @@ import (
 	"time"
 
 	"github.com/kube-reporting/metering-operator/pkg/db"
-	cbClientset "github.com/kube-reporting/metering-operator/pkg/generated/clientset/versioned"
+	clientset "github.com/kube-reporting/metering-operator/pkg/generated/clientset/versioned"
 	meteringv1scheme "github.com/kube-reporting/metering-operator/pkg/generated/clientset/versioned/scheme"
 	factory "github.com/kube-reporting/metering-operator/pkg/generated/informers/externalversions"
 	listers "github.com/kube-reporting/metering-operator/pkg/generated/listers/metering/v1"
@@ -57,7 +57,7 @@ type defaultReportingOperator struct {
 
 	kubeClient        corev1.CoreV1Interface
 	coordinatorClient coordinatorv1.CoordinationV1Interface
-	meteringClient    cbClientset.Interface
+	meteringClient    clientset.Interface
 	eventRecorder     record.EventRecorder
 
 	informerFactory factory.SharedInformerFactory
@@ -149,7 +149,7 @@ func New(logger log.FieldLogger, cfg Config) (ReportingOperator, error) {
 	}
 
 	logger.Debugf("setting up Metering client...")
-	meteringClient, err := cbClientset.NewForConfig(kubeConfig)
+	meteringClient, err := clientset.NewForConfig(kubeConfig)
 	if err != nil {
 		return nil, fmt.Errorf("Unable to create Metering client: %v", err)
 	}
@@ -177,7 +177,7 @@ func newReportingOperator(
 	kubeConfig *rest.Config,
 	kubeClient corev1.CoreV1Interface,
 	coordinatorClient coordinatorv1.CoordinationV1Interface,
-	meteringClient cbClientset.Interface,
+	meteringClient clientset.Interface,
 	informerNamespace string,
 ) ReportingOperator {
 	informerFactory := factory.NewSharedInformerFactoryWithOptions(meteringClient, defaultResyncPeriod, factory.WithNamespace(informerNamespace), factory.WithTweakListOptions(nil))

diff --git a/pkg/operator/storage.go b/pkg/operator/storage.go
@@ -4,11 +4,11 @@ import (
 	"fmt"
 
 	metering "github.com/kube-reporting/metering-operator/pkg/apis/metering/v1"
-	cbListers "github.com/kube-reporting/metering-operator/pkg/generated/listers/metering/v1"
+	listers "github.com/kube-reporting/metering-operator/pkg/generated/listers/metering/v1"
 	"k8s.io/apimachinery/pkg/labels"
 )
 
-func (op *defaultReportingOperator) getDefaultStorageLocation(lister cbListers.StorageLocationLister, namespace string) (*metering.StorageLocation, error) {
+func (op *defaultReportingOperator) getDefaultStorageLocation(lister listers.StorageLocationLister, namespace string) (*metering.StorageLocation, error) {
 	storageLocations, err := lister.StorageLocations(namespace).List(labels.Everything())
 	if err != nil {
 		return nil, err