use client.MatchingFields{} directly

operator-framework · Aug 23, 2019 · 4959d45 · 4959d45
1 parent 7e6925f
commit 4959d45
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/doc/user/client.md b/doc/user/client.md
@@ -159,7 +159,7 @@ func (r *ReconcileApp) Reconcile(request reconcile.Request) (reconcile.Result, e
 	opts := []client.ListOption{
 		client.InNamespace(request.NamespacedName.Namespace),
 		client.MatchingLabels{"app", request.NamespacedName.Name},
-		client.MatchingField("status.phase", "Running"),
+		client.MatchingFields{"status.phase", "Running"},
 	}
 	ctx := context.TODO()
 	err := r.client.List(ctx, podList, opts...)

diff --git a/internal/util/k8sutil/options.go b/internal/util/k8sutil/options.go
@@ -19,6 +19,10 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 )
 
+// NOTE: use controller-runtime's version of MatchingFields if the following
+// issue is accepted as a feature:
+// https://github.com/kubernetes-sigs/controller-runtime/issues/576
+
 // MatchingFields implements the client.ListOption and client.DeleteAllOfOption
 // interfaces so fields.Selector can be used directly in client.List and
 // client.DeleteAllOf.

diff --git a/test/e2e/_incluster-test-code/memcached_test.go b/test/e2e/_incluster-test-code/memcached_test.go
@@ -141,7 +141,7 @@ func verifyLeader(t *testing.T, namespace string, f *framework.Framework, labels
 	opts := []client.ListOption{
 		client.InNamespace(namespace),
 		client.MatchingLabels(labels),
-		client.MatchingField("status.phase", "Running"),
+		client.MatchingFields{"status.phase", "Running"},
 	}
 	err = f.Client.List(goctx.TODO(), pods, opts...)
 	if err != nil {
@@ -425,7 +425,7 @@ func getMetrics(t *testing.T, f *framework.Framework, labels map[string]string,
 	opts := []client.ListOption{
 		client.InNamespace(ns),
 		client.MatchingLabels(labels),
-		client.MatchingField("status.phase", "Running"),
+		client.MatchingFields{"status.phase", "Running"},
 	}
 	err := f.Client.List(goctx.TODO(), pods, opts...)
 	if err != nil {