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
55e968de
Commit
55e968de
authored
Jul 17, 2017
by
foxish
Committed by
Anirudh
Jul 25, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
DS: Add conversion functions
parent
af32aeeb
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
21 additions
and
1 deletion
+21
-1
conversion.go
pkg/apis/apps/v1beta2/conversion.go
+20
-1
defaults_test.go
pkg/apis/apps/v1beta2/defaults_test.go
+1
-0
No files found.
pkg/apis/apps/v1beta2/conversion.go
View file @
55e968de
...
@@ -41,9 +41,11 @@ func addConversionFuncs(scheme *runtime.Scheme) error {
...
@@ -41,9 +41,11 @@ func addConversionFuncs(scheme *runtime.Scheme) error {
Convert_apps_StatefulSetSpec_To_v1beta2_StatefulSetSpec
,
Convert_apps_StatefulSetSpec_To_v1beta2_StatefulSetSpec
,
Convert_v1beta2_StatefulSetUpdateStrategy_To_apps_StatefulSetUpdateStrategy
,
Convert_v1beta2_StatefulSetUpdateStrategy_To_apps_StatefulSetUpdateStrategy
,
Convert_apps_StatefulSetUpdateStrategy_To_v1beta2_StatefulSetUpdateStrategy
,
Convert_apps_StatefulSetUpdateStrategy_To_v1beta2_StatefulSetUpdateStrategy
,
Convert_extensions_RollingUpdateDaemonSet_To_v1beta2_RollingUpdateDaemonSet
,
Convert_v1beta2_RollingUpdateDaemonSet_To_extensions_RollingUpdateDaemonSet
,
// extensions
// extensions
// TODO: below conversions should be dropped in favor of auto-generated
// TODO: below conversions should be dropped in favor of auto-generated
// ones, see https://github.com/kubernetes/kubernete
xtensions
ssues/39865
// ones, see https://github.com/kubernetes/kubernete
s/i
ssues/39865
Convert_v1beta2_ScaleStatus_To_extensions_ScaleStatus
,
Convert_v1beta2_ScaleStatus_To_extensions_ScaleStatus
,
Convert_extensions_ScaleStatus_To_v1beta2_ScaleStatus
,
Convert_extensions_ScaleStatus_To_v1beta2_ScaleStatus
,
Convert_v1beta2_DeploymentSpec_To_extensions_DeploymentSpec
,
Convert_v1beta2_DeploymentSpec_To_extensions_DeploymentSpec
,
...
@@ -86,6 +88,23 @@ func addConversionFuncs(scheme *runtime.Scheme) error {
...
@@ -86,6 +88,23 @@ func addConversionFuncs(scheme *runtime.Scheme) error {
return
nil
return
nil
}
}
func
Convert_apps_RollingUpdateDaemonSet_To_v1beta2_RollingUpdateDaemonSet
(
in
*
apps
.
RollingUpdateDaemonSet
,
out
*
appsv1beta2
.
RollingUpdateDaemonSet
,
s
conversion
.
Scope
)
error
{
if
out
.
MaxUnavailable
==
nil
{
out
.
MaxUnavailable
=
&
intstr
.
IntOrString
{}
}
if
err
:=
s
.
Convert
(
&
in
.
MaxUnavailable
,
out
.
MaxUnavailable
,
0
);
err
!=
nil
{
return
err
}
return
nil
}
func
Convert_v1beta2_RollingUpdateDaemonSet_To_apps_RollingUpdateDaemonSet
(
in
*
appsv1beta2
.
RollingUpdateDaemonSet
,
out
*
apps
.
RollingUpdateDaemonSet
,
s
conversion
.
Scope
)
error
{
if
err
:=
s
.
Convert
(
in
.
MaxUnavailable
,
&
out
.
MaxUnavailable
,
0
);
err
!=
nil
{
return
err
}
return
nil
}
func
Convert_v1beta2_StatefulSetSpec_To_apps_StatefulSetSpec
(
in
*
appsv1beta2
.
StatefulSetSpec
,
out
*
apps
.
StatefulSetSpec
,
s
conversion
.
Scope
)
error
{
func
Convert_v1beta2_StatefulSetSpec_To_apps_StatefulSetSpec
(
in
*
appsv1beta2
.
StatefulSetSpec
,
out
*
apps
.
StatefulSetSpec
,
s
conversion
.
Scope
)
error
{
if
in
.
Replicas
!=
nil
{
if
in
.
Replicas
!=
nil
{
out
.
Replicas
=
*
in
.
Replicas
out
.
Replicas
=
*
in
.
Replicas
...
...
pkg/apis/apps/v1beta2/defaults_test.go
View file @
55e968de
...
@@ -24,6 +24,7 @@ import (
...
@@ -24,6 +24,7 @@ import (
"k8s.io/api/core/v1"
"k8s.io/api/core/v1"
apiequality
"k8s.io/apimachinery/pkg/api/equality"
apiequality
"k8s.io/apimachinery/pkg/api/equality"
metav1
"k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/util/intstr"
"k8s.io/apimachinery/pkg/util/intstr"
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api"
...
...
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