github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #6401 from bprashanth/minion_watch

Browse Source 
Unbreak minion watch on kubelet
This commit is contained in:
Clayton Coleman
2015-04-02 22:06:41 -04:00
parent de67b96ff7 5903f6ff39
commit e912d5204c
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/api/v1beta1/conversion.go
View File

@@ -1550,7 +1550,7 @@ func init() {
// If one of the conversion functions is malformed, detect it immediately. // If one of the conversion functions is malformed, detect it immediately.
panic(err) panic(err)
} }
err = newer.Scheme.AddFieldLabelConversionFunc("v1beta1", "Minion", err = newer.Scheme.AddFieldLabelConversionFunc("v1beta1", "Node",
func(label, value string) (string, string, error) { func(label, value string) (string, string, error) {
switch label { switch label {
case "name": case "name":

2
pkg/api/v1beta2/conversion.go
View File

@@ -1475,7 +1475,7 @@ func init() {
// If one of the conversion functions is malformed, detect it immediately. // If one of the conversion functions is malformed, detect it immediately.
panic(err) panic(err)
} }
err = newer.Scheme.AddFieldLabelConversionFunc("v1beta2", "Minion", err = newer.Scheme.AddFieldLabelConversionFunc("v1beta2", "Node",
func(label, value string) (string, string, error) { func(label, value string) (string, string, error) {
switch label { switch label {
case "name": case "name":

2
pkg/api/v1beta3/conversion.go
View File

@@ -39,7 +39,7 @@ func init() {
// If one of the conversion functions is malformed, detect it immediately. // If one of the conversion functions is malformed, detect it immediately.
panic(err) panic(err)
} }
err = newer.Scheme.AddFieldLabelConversionFunc("v1beta3", "Minion", err = newer.Scheme.AddFieldLabelConversionFunc("v1beta3", "Node",
func(label, value string) (string, string, error) { func(label, value string) (string, string, error) {
switch label { switch label {
case "name": case "name":