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

Jump to bottom

Replaced client.List with reader.List #937

Merged
merged 1 commit into from
Mar 2, 2020
Merged

Replaced client.List with reader.List #937

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion pkg/controller/deployment/deployment_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ func (r *ReconcileDeployment) Reconcile(request reconcile.Request) (reconcile.Re
opts = append(opts, client.InNamespace(viper.GetString(v1.ConfigWatchNamespace)))
}

if err := r.client.List(ctx, jaegers, opts...); err != nil {
if err := r.rClient.List(ctx, jaegers, opts...); err != nil {
log.WithError(err).Error("failed to get the available Jaeger pods")
return reconcile.Result{}, tracing.HandleError(err, span)
}
Expand Down
2 changes: 1 addition & 1 deletion pkg/controller/jaeger/account.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ func (r *ReconcileJaeger) applyAccounts(ctx context.Context, jaeger v1.Jaeger, d
}),
}
list := &corev1.ServiceAccountList{}
if err := r.client.List(ctx, list, opts...); err != nil {
if err := r.rClient.List(ctx, list, opts...); err != nil {
return tracing.HandleError(err, span)
}

Expand Down
2 changes: 1 addition & 1 deletion pkg/controller/jaeger/clusterrolebinding.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ func (r *ReconcileJaeger) applyClusterRoleBindingBindings(ctx context.Context, j
"app.kubernetes.io/managed-by": "jaeger-operator",
})
list := &rbac.ClusterRoleBindingList{}
if err := r.client.List(ctx, list, opts); err != nil {
if err := r.rClient.List(ctx, list, opts); err != nil {
return tracing.HandleError(err, span)
}

Expand Down
2 changes: 1 addition & 1 deletion pkg/controller/jaeger/configmap.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ func (r *ReconcileJaeger) applyConfigMaps(ctx context.Context, jaeger v1.Jaeger,
}),
}
list := &corev1.ConfigMapList{}
if err := r.client.List(ctx, list, opts...); err != nil {
if err := r.rClient.List(ctx, list, opts...); err != nil {
return tracing.HandleError(err, span)
}

Expand Down
2 changes: 1 addition & 1 deletion pkg/controller/jaeger/cronjob.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ func (r *ReconcileJaeger) applyCronJobs(ctx context.Context, jaeger v1.Jaeger, d
}),
}
list := &batchv1beta1.CronJobList{}
if err := r.client.List(ctx, list, opts...); err != nil {
if err := r.rClient.List(ctx, list, opts...); err != nil {
return tracing.HandleError(err, span)
}

Expand Down
2 changes: 1 addition & 1 deletion pkg/controller/jaeger/daemonset.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ func (r *ReconcileJaeger) applyDaemonSets(ctx context.Context, jaeger v1.Jaeger,
}),
}
list := &appsv1.DaemonSetList{}
if err := r.client.List(ctx, list, opts...); err != nil {
if err := r.rClient.List(ctx, list, opts...); err != nil {
return tracing.HandleError(err, span)
}

Expand Down
2 changes: 1 addition & 1 deletion pkg/controller/jaeger/deployment.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ func (r *ReconcileJaeger) applyDeployments(ctx context.Context, jaeger v1.Jaeger
}),
}
depList := &appsv1.DeploymentList{}
if err := r.client.List(ctx, depList, opts...); err != nil {
if err := r.rClient.List(ctx, depList, opts...); err != nil {
return tracing.HandleError(err, span)
}

Expand Down
2 changes: 1 addition & 1 deletion pkg/controller/jaeger/elasticsearch.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ func (r *ReconcileJaeger) applyElasticsearches(ctx context.Context, jaeger v1.Ja
}),
}
list := &esv1.ElasticsearchList{}
if err := r.client.List(ctx, list, opts...); err != nil {
if err := r.rClient.List(ctx, list, opts...); err != nil {
return tracing.HandleError(err, span)
}

Expand Down
2 changes: 1 addition & 1 deletion pkg/controller/jaeger/horizontalpodautoscaler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ func (r *ReconcileJaeger) applyHorizontalPodAutoscalers(ctx context.Context, jae
}),
}
hpaList := &autoscalingv2beta2.HorizontalPodAutoscalerList{}
if err := r.client.List(ctx, hpaList, opts...); err != nil {
if err := r.rClient.List(ctx, hpaList, opts...); err != nil {
return tracing.HandleError(err, span)
}

Expand Down
2 changes: 1 addition & 1 deletion pkg/controller/jaeger/ingress.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ func (r *ReconcileJaeger) applyIngresses(ctx context.Context, jaeger v1.Jaeger,
}),
}
list := &v1beta1.IngressList{}
if err := r.client.List(ctx, list, opts...); err != nil {
if err := r.rClient.List(ctx, list, opts...); err != nil {
return tracing.HandleError(err, span)
}

Expand Down
5 changes: 3 additions & 2 deletions pkg/controller/jaeger/jaeger_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ func Add(mgr manager.Manager) error {

// newReconciler returns a new reconcile.Reconciler
func newReconciler(mgr manager.Manager) reconcile.Reconciler {
return &ReconcileJaeger{client: mgr.GetClient(), scheme: mgr.GetScheme()}
return &ReconcileJaeger{client: mgr.GetClient(), scheme: mgr.GetScheme(), rClient: mgr.GetAPIReader()}
}

// add adds a new Controller to mgr with r as the reconcile.Reconciler
Expand Down Expand Up @@ -71,6 +71,7 @@ type ReconcileJaeger struct {
// This client, initialized using mgr.Client() above, is a split client
// that reads objects from the cache and writes to the apiserver
client client.Client
rClient client.Reader
scheme *runtime.Scheme
strategyChooser func(context.Context, *v1.Jaeger) strategy.S
}
Expand Down Expand Up @@ -244,7 +245,7 @@ func (r *ReconcileJaeger) apply(ctx context.Context, jaeger v1.Jaeger, str strat
"app.kubernetes.io/managed-by": "jaeger-operator",
})
secrets := &corev1.SecretList{}
if err := r.client.List(ctx, secrets, opts); err != nil {
if err := r.rClient.List(ctx, secrets, opts); err != nil {
jaeger.Status.Phase = v1.JaegerPhaseFailed
if err := r.client.Status().Update(ctx, &jaeger); err != nil {
// we let it return the real error later
Expand Down
4 changes: 2 additions & 2 deletions pkg/controller/jaeger/jaeger_controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ func TestSetOwnerOnNewInstance(t *testing.T) {
s := scheme.Scheme
s.AddKnownTypes(v1.SchemeGroupVersion, jaeger)
cl := fake.NewFakeClient(jaeger)
r := &ReconcileJaeger{client: cl, scheme: s}
r := &ReconcileJaeger{client: cl, scheme: s, rClient: cl}
req := reconcile.Request{NamespacedName: nsn}

// test
Expand Down Expand Up @@ -165,5 +165,5 @@ func getReconciler(objs []runtime.Object) (*ReconcileJaeger, client.Client) {
s.AddKnownTypes(v1beta1.SchemeGroupVersion, &v1beta1.Kafka{}, &v1beta1.KafkaList{}, &v1beta1.KafkaUser{}, &v1beta1.KafkaUserList{})

cl := fake.NewFakeClient(objs...)
return &ReconcileJaeger{client: cl, scheme: s}, cl
return &ReconcileJaeger{client: cl, scheme: s, rClient: cl}, cl
}
2 changes: 1 addition & 1 deletion pkg/controller/jaeger/kafka.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ func (r *ReconcileJaeger) applyKafkas(ctx context.Context, jaeger v1.Jaeger, des
}),
}
list := &kafkav1beta1.KafkaList{}
if err := r.client.List(ctx, list, opts...); err != nil {
if err := r.rClient.List(ctx, list, opts...); err != nil {
return tracing.HandleError(err, span)
}

Expand Down
2 changes: 1 addition & 1 deletion pkg/controller/jaeger/kafkauser.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ func (r *ReconcileJaeger) applyKafkaUsers(ctx context.Context, jaeger v1.Jaeger,
}),
}
list := &kafkav1beta1.KafkaUserList{}
if err := r.client.List(ctx, list, opts...); err != nil {
if err := r.rClient.List(ctx, list, opts...); err != nil {
return tracing.HandleError(err, span)
}

Expand Down
2 changes: 1 addition & 1 deletion pkg/controller/jaeger/route.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ func (r *ReconcileJaeger) applyRoutes(ctx context.Context, jaeger v1.Jaeger, des
}),
}
list := &osv1.RouteList{}
if err := r.client.List(ctx, list, opts...); err != nil {
if err := r.rClient.List(ctx, list, opts...); err != nil {
return tracing.HandleError(err, span)
}

Expand Down
2 changes: 1 addition & 1 deletion pkg/controller/jaeger/secret.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ func (r *ReconcileJaeger) applySecrets(ctx context.Context, jaeger v1.Jaeger, de
}),
}
list := &corev1.SecretList{}
if err := r.client.List(ctx, list, opts...); err != nil {
if err := r.rClient.List(ctx, list, opts...); err != nil {
return tracing.HandleError(err, span)
}

Expand Down
2 changes: 1 addition & 1 deletion pkg/controller/jaeger/service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ func (r *ReconcileJaeger) applyServices(ctx context.Context, jaeger v1.Jaeger, d
}),
}
list := &corev1.ServiceList{}
if err := r.client.List(ctx, list, opts...); err != nil {
if err := r.rClient.List(ctx, list, opts...); err != nil {
return tracing.HandleError(err, span)
}

Expand Down
4 changes: 2 additions & 2 deletions pkg/controller/namespace/namespace_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ func (r *ReconcileNamespace) Reconcile(request reconcile.Request) (reconcile.Res

// Fetch the Deployment instance
deps := &appsv1.DeploymentList{}
err = r.client.List(ctx, deps, opts...)
err = r.rClient.List(ctx, deps, opts...)
if err != nil {
if errors.IsNotFound(err) {
// Request object not found, could have been deleted after reconcile request.
Expand All @@ -132,7 +132,7 @@ func (r *ReconcileNamespace) Reconcile(request reconcile.Request) (reconcile.Res
opts = append(opts, client.InNamespace(viper.GetString(v1.ConfigWatchNamespace)))
}

if err := r.client.List(ctx, jaegers, opts...); err != nil {
if err := r.rClient.List(ctx, jaegers, opts...); err != nil {
log.WithError(err).Error("failed to get the available Jaeger pods")
return reconcile.Result{}, tracing.HandleError(err, span)
}
Expand Down