Skip to content

Commit b4815bd

Browse files
committed
Fix loss of MinReadySeconds on RC/RS conversion.
1 parent f290819 commit b4815bd

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

pkg/api/v1/conversion.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -235,6 +235,7 @@ func Convert_v1_ReplicationController_to_extensions_ReplicaSet(in *v1.Replicatio
235235

236236
func Convert_v1_ReplicationControllerSpec_to_extensions_ReplicaSetSpec(in *v1.ReplicationControllerSpec, out *extensions.ReplicaSetSpec, s conversion.Scope) error {
237237
out.Replicas = *in.Replicas
238+
out.MinReadySeconds = in.MinReadySeconds
238239
if in.Selector != nil {
239240
out.Selector = new(metav1.LabelSelector)
240241
metav1.Convert_map_to_unversioned_LabelSelector(&in.Selector, out.Selector, s)

pkg/api/v1/conversion_test.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -238,8 +238,9 @@ func TestReplicationControllerConversion(t *testing.T) {
238238
Namespace: "namespace",
239239
},
240240
Spec: v1.ReplicationControllerSpec{
241-
Replicas: &replicas,
242-
Selector: map[string]string{"foo": "bar", "bar": "foo"},
241+
Replicas: &replicas,
242+
MinReadySeconds: 32,
243+
Selector: map[string]string{"foo": "bar", "bar": "foo"},
243244
Template: &v1.PodTemplateSpec{
244245
ObjectMeta: metav1.ObjectMeta{
245246
Labels: map[string]string{"foo": "bar", "bar": "foo"},

0 commit comments

Comments
 (0)