Migrate ListRuntimeObjectsForKind to use dynamic client only

byxorna · Feb 11, 2020 · 666b17e · 666b17e
1 parent 5c47df1
commit 666b17e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 86 deletions.
diff --git a/clusterloader2/pkg/measurement/common/wait_for_controlled_pods.go b/clusterloader2/pkg/measurement/common/wait_for_controlled_pods.go
@@ -368,7 +368,6 @@ func (w *waitForControlledPodsRunningMeasurement) getObjectCountAndMaxVersion()
 	var desiredCount int
 	var maxResourceVersion uint64
 	objects, err := runtimeobjects.ListRuntimeObjectsForKind(
-		w.clusterFramework.GetClientSets().GetClient(),
 		w.clusterFramework.GetDynamicClients().GetClient(),
 		w.gvr, w.kind, w.selector.Namespace, w.selector.LabelSelector, w.selector.FieldSelector)
 	if err != nil {

diff --git a/clusterloader2/pkg/measurement/util/runtimeobjects/runtimeobjects.go b/clusterloader2/pkg/measurement/util/runtimeobjects/runtimeobjects.go
@@ -38,99 +38,23 @@ import (
 )
 
 // ListRuntimeObjectsForKind returns objects of given kind that satisfy given namespace, labelSelector and fieldSelector.
-// TODO(mborsz): Use dynamic client in all cases.
-func ListRuntimeObjectsForKind(c clientset.Interface, d dynamic.Interface, gvr schema.GroupVersionResource, kind, namespace, labelSelector, fieldSelector string) ([]runtime.Object, error) {
+func ListRuntimeObjectsForKind(d dynamic.Interface, gvr schema.GroupVersionResource, kind, namespace, labelSelector, fieldSelector string) ([]runtime.Object, error) {
 	var runtimeObjectsList []runtime.Object
 	var listFunc func() error
 	listOpts := metav1.ListOptions{
 		LabelSelector: labelSelector,
 		FieldSelector: fieldSelector,
 	}
-	switch kind {
-	case "ReplicationController":
-		listFunc = func() error {
-			list, err := c.CoreV1().ReplicationControllers(namespace).List(listOpts)
-			if err != nil {
-				return err
-			}
-			runtimeObjectsList = make([]runtime.Object, len(list.Items))
-			for i := range list.Items {
-				runtimeObjectsList[i] = &list.Items[i]
-			}
-			return nil
-		}
-	case "ReplicaSet":
-		listFunc = func() error {
-			list, err := c.AppsV1().ReplicaSets(namespace).List(listOpts)
-			if err != nil {
-				return err
-			}
-			runtimeObjectsList = make([]runtime.Object, len(list.Items))
-			for i := range list.Items {
-				runtimeObjectsList[i] = &list.Items[i]
-			}
-			return nil
-		}
-	case "Deployment":
-		listFunc = func() error {
-			list, err := c.AppsV1().Deployments(namespace).List(listOpts)
-			if err != nil {
-				return err
-			}
-			runtimeObjectsList = make([]runtime.Object, len(list.Items))
-			for i := range list.Items {
-				runtimeObjectsList[i] = &list.Items[i]
-			}
-			return nil
-		}
-	case "StatefulSet":
-		listFunc = func() error {
-			list, err := c.AppsV1().StatefulSets(namespace).List(listOpts)
-			if err != nil {
-				return err
-			}
-			runtimeObjectsList = make([]runtime.Object, len(list.Items))
-			for i := range list.Items {
-				runtimeObjectsList[i] = &list.Items[i]
-			}
-			return nil
-		}
-	case "DaemonSet":
-		listFunc = func() error {
-			list, err := c.AppsV1().DaemonSets(namespace).List(listOpts)
-			if err != nil {
-				return err
-			}
-			runtimeObjectsList = make([]runtime.Object, len(list.Items))
-			for i := range list.Items {
-				runtimeObjectsList[i] = &list.Items[i]
-			}
-			return nil
-		}
-	case "Job":
-		listFunc = func() error {
-			list, err := c.BatchV1().Jobs(namespace).List(listOpts)
-			if err != nil {
-				return err
-			}
-			runtimeObjectsList = make([]runtime.Object, len(list.Items))
-			for i := range list.Items {
-				runtimeObjectsList[i] = &list.Items[i]
-			}
-			return nil
+	listFunc = func() error {
+		list, err := d.Resource(gvr).List(listOpts)
+		if err != nil {
+			return err
 		}
-	default:
-		listFunc = func() error {
-			list, err := d.Resource(gvr).List(listOpts)
-			if err != nil {
-				return err
-			}
-			runtimeObjectsList = make([]runtime.Object, len(list.Items))
-			for i := range list.Items {
-				runtimeObjectsList[i] = &list.Items[i]
-			}
-			return nil
+		runtimeObjectsList = make([]runtime.Object, len(list.Items))
+		for i := range list.Items {
+			runtimeObjectsList[i] = &list.Items[i]
 		}
+		return nil
 	}
 
 	if err := client.RetryWithExponentialBackOff(client.RetryFunction(listFunc)); err != nil {