From b4815bd4cb7483351dcfe08bbcc3aa92dfb07387 Mon Sep 17 00:00:00 2001 From: Anthony Yeh Date: Wed, 27 Sep 2017 15:22:05 -0700 Subject: [PATCH] Fix loss of MinReadySeconds on RC/RS conversion. --- pkg/api/v1/conversion.go | 1 + pkg/api/v1/conversion_test.go | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkg/api/v1/conversion.go b/pkg/api/v1/conversion.go index d356e094a26..2c6a635eb9c 100644 --- a/pkg/api/v1/conversion.go +++ b/pkg/api/v1/conversion.go @@ -235,6 +235,7 @@ func Convert_v1_ReplicationController_to_extensions_ReplicaSet(in *v1.Replicatio func Convert_v1_ReplicationControllerSpec_to_extensions_ReplicaSetSpec(in *v1.ReplicationControllerSpec, out *extensions.ReplicaSetSpec, s conversion.Scope) error { out.Replicas = *in.Replicas + out.MinReadySeconds = in.MinReadySeconds if in.Selector != nil { out.Selector = new(metav1.LabelSelector) metav1.Convert_map_to_unversioned_LabelSelector(&in.Selector, out.Selector, s) diff --git a/pkg/api/v1/conversion_test.go b/pkg/api/v1/conversion_test.go index 72c1c0bf95b..18f5c9aabf0 100644 --- a/pkg/api/v1/conversion_test.go +++ b/pkg/api/v1/conversion_test.go @@ -238,8 +238,9 @@ func TestReplicationControllerConversion(t *testing.T) { Namespace: "namespace", }, Spec: v1.ReplicationControllerSpec{ - Replicas: &replicas, - Selector: map[string]string{"foo": "bar", "bar": "foo"}, + Replicas: &replicas, + MinReadySeconds: 32, + Selector: map[string]string{"foo": "bar", "bar": "foo"}, Template: &v1.PodTemplateSpec{ ObjectMeta: metav1.ObjectMeta{ Labels: map[string]string{"foo": "bar", "bar": "foo"},