use KubernetesInterface to list pods instead of Lister in currentPod method

Signed-off-by: akihikokuroda <[email protected]>

Author: akihikokuroda

pkg/controller/registry/reconciler/configmap.go

@@ -214,28 +214,36 @@ func (c *ConfigMapRegistryReconciler) currentRoleBinding(source configMapCatalog
 
 func (c *ConfigMapRegistryReconciler) currentPods(source configMapCatalogSourceDecorator, image string) []*v1.Pod {
 	podName := source.Pod(image).GetName()
-	pods, err := c.Lister.CoreV1().PodLister().Pods(source.GetNamespace()).List(labels.SelectorFromSet(source.Selector()))
+	pods, err := c.OpClient.KubernetesInterface().CoreV1().Pods(source.GetNamespace()).List(context.TODO(), metav1.ListOptions{LabelSelector: labels.SelectorFromSet(source.Selector()).String()})
 	if err != nil {
 		logrus.WithField("pod", podName).WithError(err).Debug("couldn't find pod in cache")
 		return nil
 	}
-	if len(pods) > 1 {
+	if len(pods.Items) > 1 {
 		logrus.WithField("selector", source.Selector()).Debug("multiple pods found for selector")
 	}
-	return pods
+	ret := make([]*v1.Pod, len(pods.Items))
+	for i, pod :=range pods.Items {
+		ret[i] = &pod
+	}
+	return ret
 }
 
 func (c *ConfigMapRegistryReconciler) currentPodsWithCorrectResourceVersion(source configMapCatalogSourceDecorator, image string) []*v1.Pod {
 	podName := source.Pod(image).GetName()
-	pods, err := c.Lister.CoreV1().PodLister().Pods(source.GetNamespace()).List(labels.SelectorFromValidatedSet(source.Labels()))
+	pods, err := c.OpClient.KubernetesInterface().CoreV1().Pods(source.GetNamespace()).List(context.TODO(), metav1.ListOptions{LabelSelector: labels.SelectorFromValidatedSet(source.Labels()).String()})
 	if err != nil {
 		logrus.WithField("pod", podName).WithError(err).Debug("couldn't find pod in cache")
 		return nil
 	}
-	if len(pods) > 1 {
+	if len(pods.Items) > 1 {
 		logrus.WithField("selector", source.Labels()).Debug("multiple pods found for selector")
 	}
-	return pods
+	ret := make([]*v1.Pod, len(pods.Items))
+	for i, pod :=range pods.Items {
+		ret[i] = &pod
+	}
+	return ret
 }
 
 // EnsureRegistryServer ensures that all components of registry server are up to date.