mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-11-25 15:33:33 +00:00
61d45f5900
Automatic merge from submit-queue (batch tested with PRs 40645, 40541, 40769)
Fix sorting printer when sorting by a missing field
**What this PR does / why we need it**:
When calling `kubectl get` with the `--sort-by` flag, the command will error out if the field used for sorting is not present in at least one of the objects returned in the list, *even if it is a field valid in the object's model*.
For example, taking a list of `ReplicationController` where one of them has `status: { replicas: 0 }` (so nothing in `status.availableReplicas`, even that being a valid object in the model and present in every other object of the list) :
```
$ oc get rc --sort-by=status.availableReplicas
error: availableReplicas is not found
```
This PR now traverses the entire list of objects to be sorted and, if at least one has the field provided in `--sort-by`, we sort correctly and consider the field empty in every other object where the field is not present. If none of the objects has the field, we error out (that will catch really invalid fields, and valid ones but not present in any object in the list, which is acceptable). No swagger validation here.
**Release note**:
```release-note
Fixed an issue where 'kubectl get --sort-by=' would return an error when the specified field were not present in at least one of the returned objects, even that being a valid field in the object model.
```
210 lines
8.3 KiB
Python
210 lines
8.3 KiB
Python
package(default_visibility = ["//visibility:public"])
|
|
|
|
licenses(["notice"])
|
|
|
|
load(
|
|
"@io_bazel_rules_go//go:def.bzl",
|
|
"go_library",
|
|
"go_test",
|
|
)
|
|
|
|
go_library(
|
|
name = "go_default_library",
|
|
srcs = [
|
|
"apply.go",
|
|
"autoscale.go",
|
|
"bash_comp_utils.go",
|
|
"cluster.go",
|
|
"clusterrolebinding.go",
|
|
"configmap.go",
|
|
"custom_column_printer.go",
|
|
"deployment.go",
|
|
"describe.go",
|
|
"doc.go",
|
|
"explain.go",
|
|
"generate.go",
|
|
"history.go",
|
|
"interfaces.go",
|
|
"kubectl.go",
|
|
"namespace.go",
|
|
"pdb.go",
|
|
"proxy_server.go",
|
|
"quota.go",
|
|
"resource_filter.go",
|
|
"resource_printer.go",
|
|
"rolebinding.go",
|
|
"rollback.go",
|
|
"rolling_updater.go",
|
|
"rollout_status.go",
|
|
"run.go",
|
|
"scale.go",
|
|
"secret.go",
|
|
"secret_for_docker_registry.go",
|
|
"secret_for_tls.go",
|
|
"service.go",
|
|
"service_basic.go",
|
|
"serviceaccount.go",
|
|
"sorted_resource_name_list.go",
|
|
"sorting_printer.go",
|
|
"stop.go",
|
|
"versioned_client.go",
|
|
],
|
|
tags = ["automanaged"],
|
|
deps = [
|
|
"//federation/apis/federation:go_default_library",
|
|
"//federation/apis/federation/v1beta1:go_default_library",
|
|
"//federation/client/clientset_generated/federation_internalclientset:go_default_library",
|
|
"//pkg/api:go_default_library",
|
|
"//pkg/api/annotations:go_default_library",
|
|
"//pkg/api/events:go_default_library",
|
|
"//pkg/api/util:go_default_library",
|
|
"//pkg/api/v1:go_default_library",
|
|
"//pkg/apis/apps:go_default_library",
|
|
"//pkg/apis/autoscaling:go_default_library",
|
|
"//pkg/apis/batch:go_default_library",
|
|
"//pkg/apis/certificates:go_default_library",
|
|
"//pkg/apis/extensions:go_default_library",
|
|
"//pkg/apis/extensions/v1beta1:go_default_library",
|
|
"//pkg/apis/policy:go_default_library",
|
|
"//pkg/apis/rbac:go_default_library",
|
|
"//pkg/apis/storage:go_default_library",
|
|
"//pkg/apis/storage/util:go_default_library",
|
|
"//pkg/client/clientset_generated/clientset:go_default_library",
|
|
"//pkg/client/clientset_generated/clientset/typed/core/v1:go_default_library",
|
|
"//pkg/client/clientset_generated/clientset/typed/extensions/v1beta1:go_default_library",
|
|
"//pkg/client/clientset_generated/internalclientset:go_default_library",
|
|
"//pkg/client/clientset_generated/internalclientset/typed/apps/internalversion:go_default_library",
|
|
"//pkg/client/clientset_generated/internalclientset/typed/batch/internalversion:go_default_library",
|
|
"//pkg/client/clientset_generated/internalclientset/typed/core/internalversion:go_default_library",
|
|
"//pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion:go_default_library",
|
|
"//pkg/client/retry:go_default_library",
|
|
"//pkg/client/unversioned:go_default_library",
|
|
"//pkg/controller/deployment/util:go_default_library",
|
|
"//pkg/credentialprovider:go_default_library",
|
|
"//pkg/fieldpath:go_default_library",
|
|
"//pkg/kubectl/resource:go_default_library",
|
|
"//pkg/kubelet/qos:go_default_library",
|
|
"//pkg/util:go_default_library",
|
|
"//pkg/util/node:go_default_library",
|
|
"//pkg/util/slice:go_default_library",
|
|
"//vendor:github.com/emicklei/go-restful/swagger",
|
|
"//vendor:github.com/ghodss/yaml",
|
|
"//vendor:github.com/golang/glog",
|
|
"//vendor:github.com/spf13/cobra",
|
|
"//vendor:github.com/spf13/pflag",
|
|
"//vendor:k8s.io/apimachinery/pkg/api/errors",
|
|
"//vendor:k8s.io/apimachinery/pkg/api/meta",
|
|
"//vendor:k8s.io/apimachinery/pkg/api/resource",
|
|
"//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
|
|
"//vendor:k8s.io/apimachinery/pkg/apis/meta/v1/unstructured",
|
|
"//vendor:k8s.io/apimachinery/pkg/fields",
|
|
"//vendor:k8s.io/apimachinery/pkg/labels",
|
|
"//vendor:k8s.io/apimachinery/pkg/runtime",
|
|
"//vendor:k8s.io/apimachinery/pkg/runtime/schema",
|
|
"//vendor:k8s.io/apimachinery/pkg/types",
|
|
"//vendor:k8s.io/apimachinery/pkg/util/errors",
|
|
"//vendor:k8s.io/apimachinery/pkg/util/intstr",
|
|
"//vendor:k8s.io/apimachinery/pkg/util/sets",
|
|
"//vendor:k8s.io/apimachinery/pkg/util/uuid",
|
|
"//vendor:k8s.io/apimachinery/pkg/util/validation",
|
|
"//vendor:k8s.io/apimachinery/pkg/util/wait",
|
|
"//vendor:k8s.io/apimachinery/pkg/watch",
|
|
"//vendor:k8s.io/client-go/dynamic",
|
|
"//vendor:k8s.io/client-go/rest",
|
|
"//vendor:k8s.io/client-go/util/integer",
|
|
"//vendor:k8s.io/client-go/util/jsonpath",
|
|
],
|
|
)
|
|
|
|
go_test(
|
|
name = "go_default_test",
|
|
srcs = [
|
|
"cluster_test.go",
|
|
"configmap_test.go",
|
|
"custom_column_printer_test.go",
|
|
"deployment_test.go",
|
|
"describe_test.go",
|
|
"generate_test.go",
|
|
"kubectl_test.go",
|
|
"namespace_test.go",
|
|
"proxy_server_test.go",
|
|
"quota_test.go",
|
|
"resource_printer_test.go",
|
|
"rolling_updater_test.go",
|
|
"rollout_status_test.go",
|
|
"run_test.go",
|
|
"scale_test.go",
|
|
"secret_for_docker_registry_test.go",
|
|
"secret_for_tls_test.go",
|
|
"secret_test.go",
|
|
"service_basic_test.go",
|
|
"service_test.go",
|
|
"serviceaccount_test.go",
|
|
"sorted_resource_name_list_test.go",
|
|
"sorting_printer_test.go",
|
|
"stop_test.go",
|
|
],
|
|
library = ":go_default_library",
|
|
tags = ["automanaged"],
|
|
deps = [
|
|
"//federation/apis/federation:go_default_library",
|
|
"//federation/apis/federation/v1beta1:go_default_library",
|
|
"//federation/client/clientset_generated/federation_internalclientset/fake:go_default_library",
|
|
"//pkg/api:go_default_library",
|
|
"//pkg/api/testapi:go_default_library",
|
|
"//pkg/api/testing:go_default_library",
|
|
"//pkg/api/v1:go_default_library",
|
|
"//pkg/apis/batch:go_default_library",
|
|
"//pkg/apis/extensions:go_default_library",
|
|
"//pkg/apis/extensions/v1beta1:go_default_library",
|
|
"//pkg/apis/policy:go_default_library",
|
|
"//pkg/apis/storage:go_default_library",
|
|
"//pkg/client/clientset_generated/clientset/fake:go_default_library",
|
|
"//pkg/client/clientset_generated/internalclientset:go_default_library",
|
|
"//pkg/client/clientset_generated/internalclientset/fake:go_default_library",
|
|
"//pkg/client/clientset_generated/internalclientset/typed/batch/internalversion:go_default_library",
|
|
"//pkg/client/clientset_generated/internalclientset/typed/core/internalversion:go_default_library",
|
|
"//pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion:go_default_library",
|
|
"//pkg/controller/deployment/util:go_default_library",
|
|
"//pkg/kubectl/testing:go_default_library",
|
|
"//pkg/util:go_default_library",
|
|
"//vendor:github.com/ghodss/yaml",
|
|
"//vendor:github.com/spf13/cobra",
|
|
"//vendor:k8s.io/apimachinery/pkg/api/equality",
|
|
"//vendor:k8s.io/apimachinery/pkg/api/errors",
|
|
"//vendor:k8s.io/apimachinery/pkg/api/resource",
|
|
"//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
|
|
"//vendor:k8s.io/apimachinery/pkg/apis/meta/v1/unstructured",
|
|
"//vendor:k8s.io/apimachinery/pkg/runtime",
|
|
"//vendor:k8s.io/apimachinery/pkg/runtime/schema",
|
|
"//vendor:k8s.io/apimachinery/pkg/runtime/serializer/yaml",
|
|
"//vendor:k8s.io/apimachinery/pkg/util/diff",
|
|
"//vendor:k8s.io/apimachinery/pkg/util/intstr",
|
|
"//vendor:k8s.io/apimachinery/pkg/util/sets",
|
|
"//vendor:k8s.io/apimachinery/pkg/watch",
|
|
"//vendor:k8s.io/client-go/rest",
|
|
"//vendor:k8s.io/client-go/rest/fake",
|
|
"//vendor:k8s.io/client-go/testing",
|
|
"//vendor:k8s.io/client-go/util/testing",
|
|
],
|
|
)
|
|
|
|
filegroup(
|
|
name = "package-srcs",
|
|
srcs = glob(["**"]),
|
|
tags = ["automanaged"],
|
|
visibility = ["//visibility:private"],
|
|
)
|
|
|
|
filegroup(
|
|
name = "all-srcs",
|
|
srcs = [
|
|
":package-srcs",
|
|
"//pkg/kubectl/cmd:all-srcs",
|
|
"//pkg/kubectl/metricsutil:all-srcs",
|
|
"//pkg/kubectl/resource:all-srcs",
|
|
"//pkg/kubectl/testing:all-srcs",
|
|
],
|
|
tags = ["automanaged"],
|
|
)
|