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
138eeaef
Commit
138eeaef
authored
Oct 09, 2015
by
Chao Xu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
v1alpa1->v1beta1
parent
347d53ff
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
16 additions
and
16 deletions
+16
-16
conversion.go
pkg/apis/extensions/v1beta1/conversion.go
+16
-16
conversion_generated.go
pkg/apis/extensions/v1beta1/conversion_generated.go
+0
-0
deep_copy_generated.go
pkg/apis/extensions/v1beta1/deep_copy_generated.go
+0
-0
No files found.
pkg/apis/extensions/v1beta1/conversion.go
View file @
138eeaef
...
...
@@ -31,12 +31,12 @@ func addConversionFuncs() {
err
:=
api
.
Scheme
.
AddConversionFuncs
(
convert_api_PodSpec_To_v1_PodSpec
,
convert_v1_PodSpec_To_api_PodSpec
,
convert_experimental_DeploymentSpec_To_v1
alph
a1_DeploymentSpec
,
convert_v1
alph
a1_DeploymentSpec_To_experimental_DeploymentSpec
,
convert_experimental_DeploymentStrategy_To_v1
alph
a1_DeploymentStrategy
,
convert_v1
alph
a1_DeploymentStrategy_To_experimental_DeploymentStrategy
,
convert_experimental_RollingUpdateDeployment_To_v1
alph
a1_RollingUpdateDeployment
,
convert_v1
alph
a1_RollingUpdateDeployment_To_experimental_RollingUpdateDeployment
,
convert_experimental_DeploymentSpec_To_v1
bet
a1_DeploymentSpec
,
convert_v1
bet
a1_DeploymentSpec_To_experimental_DeploymentSpec
,
convert_experimental_DeploymentStrategy_To_v1
bet
a1_DeploymentStrategy
,
convert_v1
bet
a1_DeploymentStrategy_To_experimental_DeploymentStrategy
,
convert_experimental_RollingUpdateDeployment_To_v1
bet
a1_RollingUpdateDeployment
,
convert_v1
bet
a1_RollingUpdateDeployment_To_experimental_RollingUpdateDeployment
,
)
if
err
!=
nil
{
// If one of the conversion functions is malformed, detect it immediately.
...
...
@@ -199,7 +199,7 @@ func convert_v1_PodSpec_To_api_PodSpec(in *v1.PodSpec, out *api.PodSpec, s conve
return
nil
}
func
convert_experimental_DeploymentSpec_To_v1
alph
a1_DeploymentSpec
(
in
*
experimental
.
DeploymentSpec
,
out
*
DeploymentSpec
,
s
conversion
.
Scope
)
error
{
func
convert_experimental_DeploymentSpec_To_v1
bet
a1_DeploymentSpec
(
in
*
experimental
.
DeploymentSpec
,
out
*
DeploymentSpec
,
s
conversion
.
Scope
)
error
{
if
defaulting
,
found
:=
s
.
DefaultingInterface
(
reflect
.
TypeOf
(
*
in
));
found
{
defaulting
.
(
func
(
*
experimental
.
DeploymentSpec
))(
in
)
}
...
...
@@ -221,7 +221,7 @@ func convert_experimental_DeploymentSpec_To_v1alpha1_DeploymentSpec(in *experime
}
else
{
out
.
Template
=
nil
}
if
err
:=
convert_experimental_DeploymentStrategy_To_v1
alph
a1_DeploymentStrategy
(
&
in
.
Strategy
,
&
out
.
Strategy
,
s
);
err
!=
nil
{
if
err
:=
convert_experimental_DeploymentStrategy_To_v1
bet
a1_DeploymentStrategy
(
&
in
.
Strategy
,
&
out
.
Strategy
,
s
);
err
!=
nil
{
return
err
}
out
.
UniqueLabelKey
=
new
(
string
)
...
...
@@ -229,7 +229,7 @@ func convert_experimental_DeploymentSpec_To_v1alpha1_DeploymentSpec(in *experime
return
nil
}
func
convert_v1
alph
a1_DeploymentSpec_To_experimental_DeploymentSpec
(
in
*
DeploymentSpec
,
out
*
experimental
.
DeploymentSpec
,
s
conversion
.
Scope
)
error
{
func
convert_v1
bet
a1_DeploymentSpec_To_experimental_DeploymentSpec
(
in
*
DeploymentSpec
,
out
*
experimental
.
DeploymentSpec
,
s
conversion
.
Scope
)
error
{
if
defaulting
,
found
:=
s
.
DefaultingInterface
(
reflect
.
TypeOf
(
*
in
));
found
{
defaulting
.
(
func
(
*
DeploymentSpec
))(
in
)
}
...
...
@@ -252,7 +252,7 @@ func convert_v1alpha1_DeploymentSpec_To_experimental_DeploymentSpec(in *Deployme
}
else
{
out
.
Template
=
nil
}
if
err
:=
convert_v1
alph
a1_DeploymentStrategy_To_experimental_DeploymentStrategy
(
&
in
.
Strategy
,
&
out
.
Strategy
,
s
);
err
!=
nil
{
if
err
:=
convert_v1
bet
a1_DeploymentStrategy_To_experimental_DeploymentStrategy
(
&
in
.
Strategy
,
&
out
.
Strategy
,
s
);
err
!=
nil
{
return
err
}
if
in
.
UniqueLabelKey
!=
nil
{
...
...
@@ -261,14 +261,14 @@ func convert_v1alpha1_DeploymentSpec_To_experimental_DeploymentSpec(in *Deployme
return
nil
}
func
convert_experimental_DeploymentStrategy_To_v1
alph
a1_DeploymentStrategy
(
in
*
experimental
.
DeploymentStrategy
,
out
*
DeploymentStrategy
,
s
conversion
.
Scope
)
error
{
func
convert_experimental_DeploymentStrategy_To_v1
bet
a1_DeploymentStrategy
(
in
*
experimental
.
DeploymentStrategy
,
out
*
DeploymentStrategy
,
s
conversion
.
Scope
)
error
{
if
defaulting
,
found
:=
s
.
DefaultingInterface
(
reflect
.
TypeOf
(
*
in
));
found
{
defaulting
.
(
func
(
*
experimental
.
DeploymentStrategy
))(
in
)
}
out
.
Type
=
DeploymentStrategyType
(
in
.
Type
)
if
in
.
RollingUpdate
!=
nil
{
out
.
RollingUpdate
=
new
(
RollingUpdateDeployment
)
if
err
:=
convert_experimental_RollingUpdateDeployment_To_v1
alph
a1_RollingUpdateDeployment
(
in
.
RollingUpdate
,
out
.
RollingUpdate
,
s
);
err
!=
nil
{
if
err
:=
convert_experimental_RollingUpdateDeployment_To_v1
bet
a1_RollingUpdateDeployment
(
in
.
RollingUpdate
,
out
.
RollingUpdate
,
s
);
err
!=
nil
{
return
err
}
}
else
{
...
...
@@ -277,14 +277,14 @@ func convert_experimental_DeploymentStrategy_To_v1alpha1_DeploymentStrategy(in *
return
nil
}
func
convert_v1
alph
a1_DeploymentStrategy_To_experimental_DeploymentStrategy
(
in
*
DeploymentStrategy
,
out
*
experimental
.
DeploymentStrategy
,
s
conversion
.
Scope
)
error
{
func
convert_v1
bet
a1_DeploymentStrategy_To_experimental_DeploymentStrategy
(
in
*
DeploymentStrategy
,
out
*
experimental
.
DeploymentStrategy
,
s
conversion
.
Scope
)
error
{
if
defaulting
,
found
:=
s
.
DefaultingInterface
(
reflect
.
TypeOf
(
*
in
));
found
{
defaulting
.
(
func
(
*
DeploymentStrategy
))(
in
)
}
out
.
Type
=
experimental
.
DeploymentStrategyType
(
in
.
Type
)
if
in
.
RollingUpdate
!=
nil
{
out
.
RollingUpdate
=
new
(
experimental
.
RollingUpdateDeployment
)
if
err
:=
convert_v1
alph
a1_RollingUpdateDeployment_To_experimental_RollingUpdateDeployment
(
in
.
RollingUpdate
,
out
.
RollingUpdate
,
s
);
err
!=
nil
{
if
err
:=
convert_v1
bet
a1_RollingUpdateDeployment_To_experimental_RollingUpdateDeployment
(
in
.
RollingUpdate
,
out
.
RollingUpdate
,
s
);
err
!=
nil
{
return
err
}
}
else
{
...
...
@@ -293,7 +293,7 @@ func convert_v1alpha1_DeploymentStrategy_To_experimental_DeploymentStrategy(in *
return
nil
}
func
convert_experimental_RollingUpdateDeployment_To_v1
alph
a1_RollingUpdateDeployment
(
in
*
experimental
.
RollingUpdateDeployment
,
out
*
RollingUpdateDeployment
,
s
conversion
.
Scope
)
error
{
func
convert_experimental_RollingUpdateDeployment_To_v1
bet
a1_RollingUpdateDeployment
(
in
*
experimental
.
RollingUpdateDeployment
,
out
*
RollingUpdateDeployment
,
s
conversion
.
Scope
)
error
{
if
defaulting
,
found
:=
s
.
DefaultingInterface
(
reflect
.
TypeOf
(
*
in
));
found
{
defaulting
.
(
func
(
*
experimental
.
RollingUpdateDeployment
))(
in
)
}
...
...
@@ -313,7 +313,7 @@ func convert_experimental_RollingUpdateDeployment_To_v1alpha1_RollingUpdateDeplo
return
nil
}
func
convert_v1
alph
a1_RollingUpdateDeployment_To_experimental_RollingUpdateDeployment
(
in
*
RollingUpdateDeployment
,
out
*
experimental
.
RollingUpdateDeployment
,
s
conversion
.
Scope
)
error
{
func
convert_v1
bet
a1_RollingUpdateDeployment_To_experimental_RollingUpdateDeployment
(
in
*
RollingUpdateDeployment
,
out
*
experimental
.
RollingUpdateDeployment
,
s
conversion
.
Scope
)
error
{
if
defaulting
,
found
:=
s
.
DefaultingInterface
(
reflect
.
TypeOf
(
*
in
));
found
{
defaulting
.
(
func
(
*
RollingUpdateDeployment
))(
in
)
}
...
...
pkg/apis/extensions/v1beta1/conversion_generated.go
View file @
138eeaef
This source diff could not be displayed because it is too large. You can
view the blob
instead.
pkg/apis/extensions/v1beta1/deep_copy_generated.go
View file @
138eeaef
This diff is collapsed.
Click to expand it.
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