Merge pull request #3389 from jwtty/support-cluster-scoped

feat: support cluster-scoped objs in wait_for_generic_k8s_object

Author: k8s-ci-robot

clusterloader2/pkg/measurement/common/wait_for_generic_k8s_object.go

@@ -133,6 +133,12 @@ func getGroupVersionResource(params map[string]interface{}) (schema.GroupVersion
 func getNamespaces(namespacesPrefix string, params map[string]interface{}) (measurementutil.NamespacesRange, error) {
 	namespaceRange, err := util.GetMap(params, "namespaceRange")
 	if err != nil {
+		if util.IsErrKeyNotFound(err) {
+			// If not provided, assume waiting for cluster-scoped objects.
+			return measurementutil.NamespacesRange{
+				Prefix: "",
+			}, nil
+		}
 		return measurementutil.NamespacesRange{}, err
 	}
 	minParam, err := util.GetInt(namespaceRange, "min")

clusterloader2/pkg/measurement/util/wait_for_conditions.go

@@ -65,12 +65,19 @@ func (o *WaitForGenericK8sObjectsOptions) Summary() string {
 
 // String returns printable representation of the namespaces range.
 func (nr *NamespacesRange) String() string {
+	if nr.Prefix == "" {
+		return ""
+	}
 	return fmt.Sprintf("%s-(%d-%d)", nr.Prefix, nr.Min, nr.Max)
 }
 
 // getMap returns a map with namespaces which should be queried.
 func (nr *NamespacesRange) getMap() map[string]bool {
 	result := map[string]bool{}
+	if nr.Prefix == "" {
+		result[""] = true // Cluster-scoped objects.
+		return result
+	}
 	for i := nr.Min; i <= nr.Max; i++ {
 		result[fmt.Sprintf("%s-%d", nr.Prefix, i)] = true
 	}