scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-04 04:08:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7838 from pmorie/fix

Browse Source 
Fix v1beta1 typos in v1beta2 conversions
This commit is contained in:
Maxwell Forbes
2015-05-06 09:03:46 -07:00
parent 390f269272 5bcdecbb6b
commit ddfc37eddc
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -309,7 +309,7 @@ func init() {
}
return nil
},
// Converts internal Container to v1beta1.Container.
// Converts internal Container to v1beta2.Container.
// Fields 'CPU' and 'Memory' are not present in the internal Container object.
// Hence the need for a custom conversion function.
func(in *newer.Container, out *Container, s conversion.Scope) error {
@@ -402,7 +402,7 @@ func init() {
return nil
},
// Converts v1beta1.Container to internal newer.Container.
// Converts v1beta2.Container to internal newer.Container.
// Fields 'CPU' and 'Memory' are not present in the internal newer.Container object.
// Hence the need for a custom conversion function.
func(in *Container, out *newer.Container, s conversion.Scope) error {
@@ -1575,7 +1575,7 @@ func init() {
// If one of the conversion functions is malformed, detect it immediately.
panic(err)
}
err = newer.Scheme.AddFieldLabelConversionFunc("v1beta1", "Namespace",
err = newer.Scheme.AddFieldLabelConversionFunc("v1beta2", "Namespace",
func(label, value string) (string, string, error) {
switch label {
case "status.phase":