github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-02 08:17:26 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #17986 from derekwaynecarr/fix_field_selector

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot 2015-12-18 13:18:54 -08:00
commit 464397e27b
1 changed files with 27 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
pkg/api/v1/conversion.go
View File

@ -91,6 +91,7 @@ func addConversionFuncs() {
func(label, value string) (string, string, error) { func(label, value string) (string, string, error) {
switch label { switch label {
case "metadata.name", case "metadata.name",
"metadata.namespace",
"status.replicas": "status.replicas":
return label, value, nil return label, value, nil
default: default:
@ -113,7 +114,9 @@ func addConversionFuncs() {
"involvedObject.fieldPath", "involvedObject.fieldPath",
"reason", "reason",
"source", "source",
"type": "type",
"metadata.namespace",
"metadata.name":
return label, value, nil return label, value, nil
default: default:
return "", "", fmt.Errorf("field label not supported: %s", label) return "", "", fmt.Errorf("field label not supported: %s", label)
@ -126,7 +129,8 @@ func addConversionFuncs() {
err = api.Scheme.AddFieldLabelConversionFunc("v1", "Namespace", err = api.Scheme.AddFieldLabelConversionFunc("v1", "Namespace",
func(label, value string) (string, string, error) { func(label, value string) (string, string, error) {
switch label { switch label {
case "status.phase": case "status.phase",
"metadata.name":
return label, value, nil return label, value, nil
default: default:
return "", "", fmt.Errorf("field label not supported: %s", label) return "", "", fmt.Errorf("field label not supported: %s", label)
@ -139,7 +143,9 @@ func addConversionFuncs() {
err = api.Scheme.AddFieldLabelConversionFunc("v1", "Secret", err = api.Scheme.AddFieldLabelConversionFunc("v1", "Secret",
func(label, value string) (string, string, error) { func(label, value string) (string, string, error) {
switch label { switch label {
case "type": case "type",
"metadata.namespace",
"metadata.name":
return label, value, nil return label, value, nil
default: default:
return "", "", fmt.Errorf("field label not supported: %s", label) return "", "", fmt.Errorf("field label not supported: %s", label)
@ -152,7 +158,8 @@ func addConversionFuncs() {
err = api.Scheme.AddFieldLabelConversionFunc("v1", "ServiceAccount", err = api.Scheme.AddFieldLabelConversionFunc("v1", "ServiceAccount",
func(label, value string) (string, string, error) { func(label, value string) (string, string, error) {
switch label { switch label {
case "metadata.name": case "metadata.name",
"metadata.namespace":
return label, value, nil return label, value, nil
default: default:
return "", "", fmt.Errorf("field label not supported: %s", label) return "", "", fmt.Errorf("field label not supported: %s", label)
@ -165,7 +172,22 @@ func addConversionFuncs() {
err = api.Scheme.AddFieldLabelConversionFunc("v1", "Endpoints", err = api.Scheme.AddFieldLabelConversionFunc("v1", "Endpoints",
func(label, value string) (string, string, error) { func(label, value string) (string, string, error) {
switch label { switch label {
case "metadata.name": case "metadata.namespace",
"metadata.name":
return label, value, nil
default:
return "", "", fmt.Errorf("field label not supported: %s", label)
}
})
if err != nil {
// If one of the conversion functions is malformed, detect it immediately.
panic(err)
}
err = api.Scheme.AddFieldLabelConversionFunc("v1", "Service",
func(label, value string) (string, string, error) {
switch label {
case "metadata.namespace",
"metadata.name":
return label, value, nil return label, value, nil
default: default:
return "", "", fmt.Errorf("field label not supported: %s", label) return "", "", fmt.Errorf("field label not supported: %s", label)