Skip to content

Commit 881dde8

Browse files
wojtek-twojtek-t
committed
Remove unnecessary manual conversions
1 parent d52ecd5 commit 881dde8

File tree

4 files changed

+91
-529
lines changed

4 files changed

+91
-529
lines changed

‎pkg/apis/apps/v1/conversion.go‎

Lines changed: 15 additions & 93 deletions
Original file line numberDiff line numberDiff line change
@@ -25,55 +25,19 @@ import (
2525
"k8s.io/apimachinery/pkg/conversion"
2626
"k8s.io/kubernetes/pkg/apis/apps"
2727
"k8s.io/kubernetes/pkg/apis/core"
28-
k8s_api_v1 "k8s.io/kubernetes/pkg/apis/core/v1"
2928
)
3029

31-
func Convert_v1_DeploymentSpec_To_apps_DeploymentSpec(in *appsv1.DeploymentSpec, out *apps.DeploymentSpec, s conversion.Scope) error {
32-
if in.Replicas != nil {
33-
out.Replicas = *in.Replicas
34-
}
35-
out.Selector = in.Selector
36-
if err := k8s_api_v1.Convert_v1_PodTemplateSpec_To_core_PodTemplateSpec(&in.Template, &out.Template, s); err != nil {
37-
return err
38-
}
39-
if err := Convert_v1_DeploymentStrategy_To_apps_DeploymentStrategy(&in.Strategy, &out.Strategy, s); err != nil {
40-
return err
41-
}
42-
out.RevisionHistoryLimit = in.RevisionHistoryLimit
43-
out.MinReadySeconds = in.MinReadySeconds
44-
out.Paused = in.Paused
45-
if in.ProgressDeadlineSeconds != nil {
46-
out.ProgressDeadlineSeconds = new(int32)
47-
*out.ProgressDeadlineSeconds = *in.ProgressDeadlineSeconds
48-
}
49-
return nil
50-
}
51-
30+
// Convert_apps_DeploymentSpec_To_v1_DeploymentSpec is defined here, because public
31+
// conversion is not auto-generated due to existing warnings.
5232
func Convert_apps_DeploymentSpec_To_v1_DeploymentSpec(in *apps.DeploymentSpec, out *appsv1.DeploymentSpec, s conversion.Scope) error {
53-
out.Replicas = &in.Replicas
54-
out.Selector = in.Selector
55-
if err := k8s_api_v1.Convert_core_PodTemplateSpec_To_v1_PodTemplateSpec(&in.Template, &out.Template, s); err != nil {
56-
return err
57-
}
58-
if err := Convert_apps_DeploymentStrategy_To_v1_DeploymentStrategy(&in.Strategy, &out.Strategy, s); err != nil {
33+
if err := autoConvert_apps_DeploymentSpec_To_v1_DeploymentSpec(in, out, s); err != nil {
5934
return err
6035
}
61-
if in.RevisionHistoryLimit != nil {
62-
out.RevisionHistoryLimit = new(int32)
63-
*out.RevisionHistoryLimit = int32(*in.RevisionHistoryLimit)
64-
}
65-
out.MinReadySeconds = int32(in.MinReadySeconds)
66-
out.Paused = in.Paused
67-
if in.ProgressDeadlineSeconds != nil {
68-
out.ProgressDeadlineSeconds = new(int32)
69-
*out.ProgressDeadlineSeconds = *in.ProgressDeadlineSeconds
70-
}
7136
return nil
7237
}
7338

7439
func Convert_v1_Deployment_To_apps_Deployment(in *appsv1.Deployment, out *apps.Deployment, s conversion.Scope) error {
75-
out.ObjectMeta = in.ObjectMeta
76-
if err := Convert_v1_DeploymentSpec_To_apps_DeploymentSpec(&in.Spec, &out.Spec, s); err != nil {
40+
if err := autoConvert_v1_Deployment_To_apps_Deployment(in, out, s); err != nil {
7741
return err
7842
}
7943

@@ -92,20 +56,16 @@ func Convert_v1_Deployment_To_apps_Deployment(in *appsv1.Deployment, out *apps.D
9256
out.Spec.RollbackTo = nil
9357
}
9458

95-
if err := Convert_v1_DeploymentStatus_To_apps_DeploymentStatus(&in.Status, &out.Status, s); err != nil {
96-
return err
97-
}
9859
return nil
9960
}
10061

10162
func Convert_apps_Deployment_To_v1_Deployment(in *apps.Deployment, out *appsv1.Deployment, s conversion.Scope) error {
102-
out.ObjectMeta = in.ObjectMeta
103-
out.Annotations = deepCopyStringMap(out.Annotations) // deep copy because we modify it below
104-
105-
if err := Convert_apps_DeploymentSpec_To_v1_DeploymentSpec(&in.Spec, &out.Spec, s); err != nil {
63+
if err := autoConvert_apps_Deployment_To_v1_Deployment(in, out, s); err != nil {
10664
return err
10765
}
10866

67+
out.Annotations = deepCopyStringMap(out.Annotations) // deep copy because we modify it below
68+
10969
// Copy deprecated rollbackTo field to annotation for roundtrip
11070
// TODO: remove this conversion after we delete extensions/v1beta1 and apps/v1beta1 Deployment
11171
if in.Spec.RollbackTo != nil {
@@ -117,47 +77,30 @@ func Convert_apps_Deployment_To_v1_Deployment(in *apps.Deployment, out *appsv1.D
11777
delete(out.Annotations, appsv1.DeprecatedRollbackTo)
11878
}
11979

120-
if err := Convert_apps_DeploymentStatus_To_v1_DeploymentStatus(&in.Status, &out.Status, s); err != nil {
121-
return err
122-
}
12380
return nil
12481
}
12582

12683
func Convert_apps_DaemonSet_To_v1_DaemonSet(in *apps.DaemonSet, out *appsv1.DaemonSet, s conversion.Scope) error {
127-
out.ObjectMeta = in.ObjectMeta
128-
out.Annotations = deepCopyStringMap(out.Annotations) // deep copy annotations because we change them below
129-
130-
out.Annotations[appsv1.DeprecatedTemplateGeneration] = strconv.FormatInt(in.Spec.TemplateGeneration, 10)
131-
if err := Convert_apps_DaemonSetSpec_To_v1_DaemonSetSpec(&in.Spec, &out.Spec, s); err != nil {
132-
return err
133-
}
134-
if err := s.Convert(&in.Status, &out.Status, 0); err != nil {
84+
if err := autoConvert_apps_DaemonSet_To_v1_DaemonSet(in, out, s); err != nil {
13585
return err
13686
}
87+
88+
out.Annotations = deepCopyStringMap(out.Annotations) // deep copy annotations because we change them below
89+
out.Annotations[appsv1.DeprecatedTemplateGeneration] = strconv.FormatInt(in.Spec.TemplateGeneration, 10)
13790
return nil
13891
}
13992

93+
// Convert_apps_DaemonSetSpec_To_v1_DaemonSetSpec is defined here, because public
94+
// conversion is not auto-generated due to existing warnings.
14095
func Convert_apps_DaemonSetSpec_To_v1_DaemonSetSpec(in *apps.DaemonSetSpec, out *appsv1.DaemonSetSpec, s conversion.Scope) error {
141-
out.Selector = in.Selector
142-
if err := k8s_api_v1.Convert_core_PodTemplateSpec_To_v1_PodTemplateSpec(&in.Template, &out.Template, s); err != nil {
143-
return err
144-
}
145-
if err := Convert_apps_DaemonSetUpdateStrategy_To_v1_DaemonSetUpdateStrategy(&in.UpdateStrategy, &out.UpdateStrategy, s); err != nil {
96+
if err := autoConvert_apps_DaemonSetSpec_To_v1_DaemonSetSpec(in, out, s); err != nil {
14697
return err
14798
}
148-
out.MinReadySeconds = int32(in.MinReadySeconds)
149-
if in.RevisionHistoryLimit != nil {
150-
out.RevisionHistoryLimit = new(int32)
151-
*out.RevisionHistoryLimit = *in.RevisionHistoryLimit
152-
} else {
153-
out.RevisionHistoryLimit = nil
154-
}
15599
return nil
156100
}
157101

158102
func Convert_v1_DaemonSet_To_apps_DaemonSet(in *appsv1.DaemonSet, out *apps.DaemonSet, s conversion.Scope) error {
159-
out.ObjectMeta = in.ObjectMeta
160-
if err := Convert_v1_DaemonSetSpec_To_apps_DaemonSetSpec(&in.Spec, &out.Spec, s); err != nil {
103+
if err := autoConvert_v1_DaemonSet_To_apps_DaemonSet(in, out, s); err != nil {
161104
return err
162105
}
163106
if value, ok := in.Annotations[appsv1.DeprecatedTemplateGeneration]; ok {
@@ -169,27 +112,6 @@ func Convert_v1_DaemonSet_To_apps_DaemonSet(in *appsv1.DaemonSet, out *apps.Daem
169112
delete(out.Annotations, appsv1.DeprecatedTemplateGeneration)
170113
}
171114
}
172-
if err := s.Convert(&in.Status, &out.Status, 0); err != nil {
173-
return err
174-
}
175-
return nil
176-
}
177-
178-
func Convert_v1_DaemonSetSpec_To_apps_DaemonSetSpec(in *appsv1.DaemonSetSpec, out *apps.DaemonSetSpec, s conversion.Scope) error {
179-
out.Selector = in.Selector
180-
if err := k8s_api_v1.Convert_v1_PodTemplateSpec_To_core_PodTemplateSpec(&in.Template, &out.Template, s); err != nil {
181-
return err
182-
}
183-
if err := Convert_v1_DaemonSetUpdateStrategy_To_apps_DaemonSetUpdateStrategy(&in.UpdateStrategy, &out.UpdateStrategy, s); err != nil {
184-
return err
185-
}
186-
if in.RevisionHistoryLimit != nil {
187-
out.RevisionHistoryLimit = new(int32)
188-
*out.RevisionHistoryLimit = *in.RevisionHistoryLimit
189-
} else {
190-
out.RevisionHistoryLimit = nil
191-
}
192-
out.MinReadySeconds = in.MinReadySeconds
193115
return nil
194116
}
195117

‎pkg/apis/apps/v1beta2/conversion.go‎

Lines changed: 15 additions & 91 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ import (
2929
"k8s.io/kubernetes/pkg/apis/apps"
3030
autoscaling "k8s.io/kubernetes/pkg/apis/autoscaling"
3131
"k8s.io/kubernetes/pkg/apis/core"
32-
k8s_api_v1 "k8s.io/kubernetes/pkg/apis/core/v1"
3332
)
3433

3534
func addConversionFuncs(scheme *runtime.Scheme) error {
@@ -86,52 +85,17 @@ func Convert_v1beta2_ScaleStatus_To_autoscaling_ScaleStatus(in *appsv1beta2.Scal
8685
return nil
8786
}
8887

89-
func Convert_v1beta2_DeploymentSpec_To_apps_DeploymentSpec(in *appsv1beta2.DeploymentSpec, out *apps.DeploymentSpec, s conversion.Scope) error {
90-
if in.Replicas != nil {
91-
out.Replicas = *in.Replicas
92-
}
93-
out.Selector = in.Selector
94-
if err := k8s_api_v1.Convert_v1_PodTemplateSpec_To_core_PodTemplateSpec(&in.Template, &out.Template, s); err != nil {
95-
return err
96-
}
97-
if err := Convert_v1beta2_DeploymentStrategy_To_apps_DeploymentStrategy(&in.Strategy, &out.Strategy, s); err != nil {
98-
return err
99-
}
100-
out.RevisionHistoryLimit = in.RevisionHistoryLimit
101-
out.MinReadySeconds = in.MinReadySeconds
102-
out.Paused = in.Paused
103-
if in.ProgressDeadlineSeconds != nil {
104-
out.ProgressDeadlineSeconds = new(int32)
105-
*out.ProgressDeadlineSeconds = *in.ProgressDeadlineSeconds
106-
}
107-
return nil
108-
}
109-
88+
// Convert_apps_DeploymentSpec_To_v1beta2_DeploymentSpec is defined here, because public
89+
// conversion is not auto-generated due to existing warnings.
11090
func Convert_apps_DeploymentSpec_To_v1beta2_DeploymentSpec(in *apps.DeploymentSpec, out *appsv1beta2.DeploymentSpec, s conversion.Scope) error {
111-
out.Replicas = &in.Replicas
112-
out.Selector = in.Selector
113-
if err := k8s_api_v1.Convert_core_PodTemplateSpec_To_v1_PodTemplateSpec(&in.Template, &out.Template, s); err != nil {
114-
return err
115-
}
116-
if err := Convert_apps_DeploymentStrategy_To_v1beta2_DeploymentStrategy(&in.Strategy, &out.Strategy, s); err != nil {
91+
if err := autoConvert_apps_DeploymentSpec_To_v1beta2_DeploymentSpec(in, out, s); err != nil {
11792
return err
11893
}
119-
if in.RevisionHistoryLimit != nil {
120-
out.RevisionHistoryLimit = new(int32)
121-
*out.RevisionHistoryLimit = int32(*in.RevisionHistoryLimit)
122-
}
123-
out.MinReadySeconds = int32(in.MinReadySeconds)
124-
out.Paused = in.Paused
125-
if in.ProgressDeadlineSeconds != nil {
126-
out.ProgressDeadlineSeconds = new(int32)
127-
*out.ProgressDeadlineSeconds = *in.ProgressDeadlineSeconds
128-
}
12994
return nil
13095
}
13196

13297
func Convert_v1beta2_Deployment_To_apps_Deployment(in *appsv1beta2.Deployment, out *apps.Deployment, s conversion.Scope) error {
133-
out.ObjectMeta = in.ObjectMeta
134-
if err := Convert_v1beta2_DeploymentSpec_To_apps_DeploymentSpec(&in.Spec, &out.Spec, s); err != nil {
98+
if err := autoConvert_v1beta2_Deployment_To_apps_Deployment(in, out, s); err != nil {
13599
return err
136100
}
137101

@@ -150,20 +114,15 @@ func Convert_v1beta2_Deployment_To_apps_Deployment(in *appsv1beta2.Deployment, o
150114
out.Spec.RollbackTo = nil
151115
}
152116

153-
if err := Convert_v1beta2_DeploymentStatus_To_apps_DeploymentStatus(&in.Status, &out.Status, s); err != nil {
154-
return err
155-
}
156117
return nil
157118
}
158119

159120
func Convert_apps_Deployment_To_v1beta2_Deployment(in *apps.Deployment, out *appsv1beta2.Deployment, s conversion.Scope) error {
160-
out.ObjectMeta = in.ObjectMeta
161-
out.Annotations = deepCopyStringMap(out.Annotations) // deep copy because we modify annotations below
162-
163-
if err := Convert_apps_DeploymentSpec_To_v1beta2_DeploymentSpec(&in.Spec, &out.Spec, s); err != nil {
121+
if err := autoConvert_apps_Deployment_To_v1beta2_Deployment(in, out, s); err != nil {
164122
return err
165123
}
166124

125+
out.Annotations = deepCopyStringMap(out.Annotations) // deep copy because we modify annotations below
167126
// Copy deprecated rollbackTo field to annotation for roundtrip
168127
// TODO: remove this conversion after we delete extensions/v1beta1 and apps/v1beta1 Deployment
169128
if in.Spec.RollbackTo != nil {
@@ -175,48 +134,33 @@ func Convert_apps_Deployment_To_v1beta2_Deployment(in *apps.Deployment, out *app
175134
delete(out.Annotations, appsv1beta2.DeprecatedRollbackTo)
176135
}
177136

178-
if err := Convert_apps_DeploymentStatus_To_v1beta2_DeploymentStatus(&in.Status, &out.Status, s); err != nil {
179-
return err
180-
}
181137
return nil
182138
}
183139

184140
func Convert_apps_DaemonSet_To_v1beta2_DaemonSet(in *apps.DaemonSet, out *appsv1beta2.DaemonSet, s conversion.Scope) error {
185-
out.ObjectMeta = in.ObjectMeta
186-
out.Annotations = deepCopyStringMap(out.Annotations)
187-
out.Annotations[appsv1beta2.DeprecatedTemplateGeneration] = strconv.FormatInt(in.Spec.TemplateGeneration, 10)
188-
if err := Convert_apps_DaemonSetSpec_To_v1beta2_DaemonSetSpec(&in.Spec, &out.Spec, s); err != nil {
189-
return err
190-
}
191-
if err := s.Convert(&in.Status, &out.Status, 0); err != nil {
141+
if err := autoConvert_apps_DaemonSet_To_v1beta2_DaemonSet(in, out, s); err != nil {
192142
return err
193143
}
144+
145+
out.Annotations = deepCopyStringMap(out.Annotations)
146+
out.Annotations[appsv1beta2.DeprecatedTemplateGeneration] = strconv.FormatInt(in.Spec.TemplateGeneration, 10)
194147
return nil
195148
}
196149

150+
// Convert_apps_DaemonSetSpec_To_v1beta2_DaemonSetSpec is defined here, because public
151+
// conversion is not auto-generated due to existing warnings.
197152
func Convert_apps_DaemonSetSpec_To_v1beta2_DaemonSetSpec(in *apps.DaemonSetSpec, out *appsv1beta2.DaemonSetSpec, s conversion.Scope) error {
198-
out.Selector = in.Selector
199-
if err := k8s_api_v1.Convert_core_PodTemplateSpec_To_v1_PodTemplateSpec(&in.Template, &out.Template, s); err != nil {
153+
if err := autoConvert_apps_DaemonSetSpec_To_v1beta2_DaemonSetSpec(in, out, s); err != nil {
200154
return err
201155
}
202-
if err := Convert_apps_DaemonSetUpdateStrategy_To_v1beta2_DaemonSetUpdateStrategy(&in.UpdateStrategy, &out.UpdateStrategy, s); err != nil {
203-
return err
204-
}
205-
out.MinReadySeconds = int32(in.MinReadySeconds)
206-
if in.RevisionHistoryLimit != nil {
207-
out.RevisionHistoryLimit = new(int32)
208-
*out.RevisionHistoryLimit = *in.RevisionHistoryLimit
209-
} else {
210-
out.RevisionHistoryLimit = nil
211-
}
212156
return nil
213157
}
214158

215159
func Convert_v1beta2_DaemonSet_To_apps_DaemonSet(in *appsv1beta2.DaemonSet, out *apps.DaemonSet, s conversion.Scope) error {
216-
out.ObjectMeta = in.ObjectMeta
217-
if err := Convert_v1beta2_DaemonSetSpec_To_apps_DaemonSetSpec(&in.Spec, &out.Spec, s); err != nil {
160+
if err := autoConvert_v1beta2_DaemonSet_To_apps_DaemonSet(in, out, s); err != nil {
218161
return err
219162
}
163+
220164
if value, ok := in.Annotations[appsv1beta2.DeprecatedTemplateGeneration]; ok {
221165
if value64, err := strconv.ParseInt(value, 10, 64); err != nil {
222166
return err
@@ -226,27 +170,7 @@ func Convert_v1beta2_DaemonSet_To_apps_DaemonSet(in *appsv1beta2.DaemonSet, out
226170
delete(out.Annotations, appsv1beta2.DeprecatedTemplateGeneration)
227171
}
228172
}
229-
if err := s.Convert(&in.Status, &out.Status, 0); err != nil {
230-
return err
231-
}
232-
return nil
233-
}
234173

235-
func Convert_v1beta2_DaemonSetSpec_To_apps_DaemonSetSpec(in *appsv1beta2.DaemonSetSpec, out *apps.DaemonSetSpec, s conversion.Scope) error {
236-
out.Selector = in.Selector
237-
if err := k8s_api_v1.Convert_v1_PodTemplateSpec_To_core_PodTemplateSpec(&in.Template, &out.Template, s); err != nil {
238-
return err
239-
}
240-
if err := Convert_v1beta2_DaemonSetUpdateStrategy_To_apps_DaemonSetUpdateStrategy(&in.UpdateStrategy, &out.UpdateStrategy, s); err != nil {
241-
return err
242-
}
243-
if in.RevisionHistoryLimit != nil {
244-
out.RevisionHistoryLimit = new(int32)
245-
*out.RevisionHistoryLimit = *in.RevisionHistoryLimit
246-
} else {
247-
out.RevisionHistoryLimit = nil
248-
}
249-
out.MinReadySeconds = in.MinReadySeconds
250174
return nil
251175
}
252176

‎pkg/apis/core/v1/conversion.go‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -506,6 +506,26 @@ func dropInitContainerAnnotations(oldAnnotations map[string]string) map[string]s
506506
return newAnnotations
507507
}
508508

509+
// Convert_core_LoadBalancerStatus_To_v1_LoadBalancerStatus is defined outside the autogenerated file for use by other API packages
510+
func Convert_core_LoadBalancerStatus_To_v1_LoadBalancerStatus(in *core.LoadBalancerStatus, out *v1.LoadBalancerStatus, s conversion.Scope) error {
511+
return autoConvert_core_LoadBalancerStatus_To_v1_LoadBalancerStatus(in, out, s)
512+
}
513+
514+
// Convert_v1_LoadBalancerStatus_To_core_LoadBalancerStatus is defined outside the autogenerated file for use by other API packages
515+
func Convert_v1_LoadBalancerStatus_To_core_LoadBalancerStatus(in *v1.LoadBalancerStatus, out *core.LoadBalancerStatus, s conversion.Scope) error {
516+
return autoConvert_v1_LoadBalancerStatus_To_core_LoadBalancerStatus(in, out, s)
517+
}
518+
519+
// Convert_core_Volume_To_v1_Volume is defined outside the autogenerated file for use by other API packages
520+
func Convert_core_Volume_To_v1_Volume(in *core.Volume, out *v1.Volume, s conversion.Scope) error {
521+
return autoConvert_core_Volume_To_v1_Volume(in, out, s)
522+
}
523+
524+
// Convert_v1_Volume_To_core_Volume is defined outside the autogenerated file for use by other API packages
525+
func Convert_v1_Volume_To_core_Volume(in *v1.Volume, out *core.Volume, s conversion.Scope) error {
526+
return autoConvert_v1_Volume_To_core_Volume(in, out, s)
527+
}
528+
509529
// Convert_core_PersistentVolumeSpec_To_v1_PersistentVolumeSpec is defined outside the autogenerated file for use by other API packages
510530
func Convert_core_PersistentVolumeSpec_To_v1_PersistentVolumeSpec(in *core.PersistentVolumeSpec, out *v1.PersistentVolumeSpec, s conversion.Scope) error {
511531
return autoConvert_core_PersistentVolumeSpec_To_v1_PersistentVolumeSpec(in, out, s)

0 commit comments

Comments
 (0)