Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Operator refactor - validation and import cleanup #1356

Merged
merged 5 commits into from
Aug 13, 2020
Merged

Operator refactor - validation and import cleanup #1356

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
15c6fce
move types to types.go and add initial comments for exported fields
Aug 3, 2020
51d5032
create reporting operator interface and move the internal type to une…
Aug 3, 2020
3bfd918
move validation to it's own file, add validation tests for configurat…
Aug 3, 2020
7e4015b
rename cb* imports to remove chargeback references
Aug 4, 2020
74d6ce9
updates from validation review
Aug 11, 2020
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
4 changes: 2 additions & 2 deletions pkg/operator/datasources.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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{})
Expand Down
8 changes: 4 additions & 4 deletions pkg/operator/operator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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)
}
Expand Down Expand Up @@ -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))
Expand Down
4 changes: 2 additions & 2 deletions pkg/operator/storage.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down