sort typeSpecificIndexedFields lexicographically (#437)

rancher · Jan 11, 2025 · e70d03d · e70d03d
1 parent 8666ce1
commit e70d03d
Showing 1 changed file with 22 additions and 22 deletions.
diff --git a/pkg/stores/sqlproxy/proxy_store.go b/pkg/stores/sqlproxy/proxy_store.go
@@ -60,6 +60,8 @@ var (
 	paramScheme               = runtime.NewScheme()
 	paramCodec                = runtime.NewParameterCodec(paramScheme)
 	typeSpecificIndexedFields = map[string][][]string{
+		gvkKey("", "v1", "ConfigMap"): {
+			{"metadata", "labels[harvesterhci.io/cloud-init-template]"}},
 		gvkKey("", "v1", "Event"): {
 			{"_type"},
 			{"involvedObject", "kind"},
@@ -71,30 +73,18 @@ var (
 		gvkKey("", "v1", "Node"): {
 			{"status", "nodeInfo", "kubeletVersion"},
 			{"status", "nodeInfo", "operatingSystem"}},
-		gvkKey("", "v1", "Pod"): {
-			{"spec", "containers", "image"},
-			{"spec", "nodeName"}},
-		gvkKey("", "v1", "Service"): {
-			{"spec", "clusterIP"},
-			{"spec", "type"},
-		},
-		gvkKey("networking.k8s.io", "v1", "Ingress"): {
-			{"spec", "rules", "host"},
-			{"spec", "ingressClassName"},
-		},
-		gvkKey("", "v1", "ConfigMap"): {
-			{"metadata", "labels[harvesterhci.io/cloud-init-template]"}},
 		gvkKey("", "v1", "PersistentVolume"): {
 			{"status", "reason"},
 			{"spec", "persistentVolumeReclaimPolicy"},
 		},
 		gvkKey("", "v1", "PersistentVolumeClaim"): {
 			{"spec", "volumeName"}},
-		gvkKey("autoscaling", "v2", "HorizontalPodAutoscaler"): {
-			{"spec", "scaleTargetRef", "name"},
-			{"spec", "minReplicas"},
-			{"spec", "maxReplicas"},
-			{"status", "currentReplicas"},
+		gvkKey("", "v1", "Pod"): {
+			{"spec", "containers", "image"},
+			{"spec", "nodeName"}},
+		gvkKey("", "v1", "Service"): {
+			{"spec", "clusterIP"},
+			{"spec", "type"},
 		},
 		gvkKey("apps", "v1", "DaemonSet"): {
 			{"metadata", "annotations[field.cattle.io/publicEndpoints]"},
@@ -105,16 +95,18 @@ var (
 		gvkKey("apps", "v1", "StatefulSet"): {
 			{"metadata", "annotations[field.cattle.io/publicEndpoints]"},
 		},
+		gvkKey("autoscaling", "v2", "HorizontalPodAutoscaler"): {
+			{"spec", "scaleTargetRef", "name"},
+			{"spec", "minReplicas"},
+			{"spec", "maxReplicas"},
+			{"status", "currentReplicas"},
+		},
 		gvkKey("batch", "v1", "CronJob"): {
 			{"metadata", "annotations[field.cattle.io/publicEndpoints]"},
 		},
 		gvkKey("batch", "v1", "Job"): {
 			{"metadata", "annotations[field.cattle.io/publicEndpoints]"},
 		},
-		gvkKey("storage.k8s.io", "v1", "StorageClass"): {
-			{"provisioner"},
-			{"metadata", "annotations[storageclass.kubernetes.io/is-default-class]"},
-		},
 		gvkKey("catalog.cattle.io", "v1", "App"): {
 			{"spec", "chart", "metadata", "name"},
 		},
@@ -142,11 +134,19 @@ var (
 			{"spec", "clusterName"}},
 		gvkKey("management.cattle.io", "v3", "NodeTemplate"): {
 			{"spec", "clusterName"}},
+		gvkKey("networking.k8s.io", "v1", "Ingress"): {
+			{"spec", "rules", "host"},
+			{"spec", "ingressClassName"},
+		},
 		gvkKey("provisioning.cattle.io", "v1", "Cluster"): {
 			{"metadata", "labels[provider.cattle.io]"},
 			{"status", "clusterName"},
 			{"status", "provider"},
 		},
+		gvkKey("storage.k8s.io", "v1", "StorageClass"): {
+			{"provisioner"},
+			{"metadata", "annotations[storageclass.kubernetes.io/is-default-class]"},
+		},
 	}
 	commonIndexFields = [][]string{
 		{`id`},