github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-04 01:40:07 +00:00
Code Issues Projects Releases Wiki Activity

fix apps DeploymentSpec conversion issue

Browse Source
This commit is contained in:
Di Xu 2017-07-27 21:34:38 +08:00
parent 3a0d8f8fea
commit 4ef86754f1
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/apis/apps/v1beta1/conversion.go
View File

@ -99,7 +99,7 @@ func Convert_v1beta1_StatefulSetSpec_To_apps_StatefulSetSpec(in *appsv1beta1.Sta
} else { } else {
out.Selector = nil out.Selector = nil
} }
if err := s.Convert(&in.Template, &out.Template, 0); err != nil { if err := k8s_api_v1.Convert_v1_PodTemplateSpec_To_api_PodTemplateSpec(&in.Template, &out.Template, s); err != nil {
return err return err
} }
if in.VolumeClaimTemplates != nil { if in.VolumeClaimTemplates != nil {
@ -139,7 +139,7 @@ func Convert_apps_StatefulSetSpec_To_v1beta1_StatefulSetSpec(in *apps.StatefulSe
} else { } else {
out.Selector = nil out.Selector = nil
} }
if err := s.Convert(&in.Template, &out.Template, 0); err != nil { if err := k8s_api_v1.Convert_api_PodTemplateSpec_To_v1_PodTemplateSpec(&in.Template, &out.Template, s); err != nil {
return err return err
} }
if in.VolumeClaimTemplates != nil { if in.VolumeClaimTemplates != nil {

4
pkg/apis/apps/v1beta2/conversion.go
View File

@ -118,7 +118,7 @@ func Convert_v1beta2_StatefulSetSpec_To_apps_StatefulSetSpec(in *appsv1beta2.Sta
} else { } else {
out.Selector = nil out.Selector = nil
} }
if err := s.Convert(&in.Template, &out.Template, 0); err != nil { if err := k8s_api_v1.Convert_v1_PodTemplateSpec_To_api_PodTemplateSpec(&in.Template, &out.Template, s); err != nil {
return err return err
} }
if in.VolumeClaimTemplates != nil { if in.VolumeClaimTemplates != nil {
@ -158,7 +158,7 @@ func Convert_apps_StatefulSetSpec_To_v1beta2_StatefulSetSpec(in *apps.StatefulSe
} else { } else {
out.Selector = nil out.Selector = nil
} }
if err := s.Convert(&in.Template, &out.Template, 0); err != nil { if err := k8s_api_v1.Convert_api_PodTemplateSpec_To_v1_PodTemplateSpec(&in.Template, &out.Template, s); err != nil {
return err return err
} }
if in.VolumeClaimTemplates != nil { if in.VolumeClaimTemplates != nil {