Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
ddfc37ed
Commit
ddfc37ed
authored
May 06, 2015
by
Maxwell Forbes
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #7838 from pmorie/fix
Fix v1beta1 typos in v1beta2 conversions
parents
390f2692
5bcdecbb
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
conversion.go
pkg/api/v1beta2/conversion.go
+3
-3
No files found.
pkg/api/v1beta2/conversion.go
View file @
ddfc37ed
...
@@ -309,7 +309,7 @@ func init() {
...
@@ -309,7 +309,7 @@ func init() {
}
}
return
nil
return
nil
},
},
// Converts internal Container to v1beta
1
.Container.
// Converts internal Container to v1beta
2
.Container.
// Fields 'CPU' and 'Memory' are not present in the internal Container object.
// Fields 'CPU' and 'Memory' are not present in the internal Container object.
// Hence the need for a custom conversion function.
// Hence the need for a custom conversion function.
func
(
in
*
newer
.
Container
,
out
*
Container
,
s
conversion
.
Scope
)
error
{
func
(
in
*
newer
.
Container
,
out
*
Container
,
s
conversion
.
Scope
)
error
{
...
@@ -402,7 +402,7 @@ func init() {
...
@@ -402,7 +402,7 @@ func init() {
return
nil
return
nil
},
},
// Converts v1beta
1
.Container to internal newer.Container.
// Converts v1beta
2
.Container to internal newer.Container.
// Fields 'CPU' and 'Memory' are not present in the internal newer.Container object.
// Fields 'CPU' and 'Memory' are not present in the internal newer.Container object.
// Hence the need for a custom conversion function.
// Hence the need for a custom conversion function.
func
(
in
*
Container
,
out
*
newer
.
Container
,
s
conversion
.
Scope
)
error
{
func
(
in
*
Container
,
out
*
newer
.
Container
,
s
conversion
.
Scope
)
error
{
...
@@ -1575,7 +1575,7 @@ func init() {
...
@@ -1575,7 +1575,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
(
"v1beta
1
"
,
"Namespace"
,
err
=
newer
.
Scheme
.
AddFieldLabelConversionFunc
(
"v1beta
2
"
,
"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"
:
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment