e2e code fixes

Author: estroz

example/memcached-operator/memcached_controller.go.tmpl

@@ -10,7 +10,6 @@ import (
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/types"
 	"sigs.k8s.io/controller-runtime/pkg/client"
@@ -144,7 +143,7 @@ func (r *ReconcileMemcached) Reconcile(request reconcile.Request) (reconcile.Res
 	podList := &corev1.PodList{}
 	listOpts := []client.ListOption{
 		client.InNamespace(memcached.Namespace),
-		client.MatchingLabels(labelsForApp(memcached.Name)),
+		client.MatchingLabels(labelsForMemcached(memcached.Name)),
 	}
 	if err = r.client.List(context.TODO(), podList, listOpts...); err != nil {
 		reqLogger.Error(err, "Failed to list pods", "Memcached.Namespace", memcached.Namespace, "Memcached.Name", memcached.Name)

test/e2e/_incluster-test-code/memcached_test.go

@@ -427,7 +427,7 @@ func getMetrics(t *testing.T, f *framework.Framework, labels map[string]string,
 		client.MatchingLabels(labels),
 		client.MatchingField("status.phase", "Running"),
 	}
-	err = f.Client.List(goctx.TODO(), pods, opts...)
+	err := f.Client.List(goctx.TODO(), pods, opts...)
 	if err != nil {
 		return nil, fmt.Errorf("failed to get pods: (%v)", err)
 	}