Fix loss of MinReadySeconds on RC/RS conversion.

parent f290819f
...@@ -235,6 +235,7 @@ func Convert_v1_ReplicationController_to_extensions_ReplicaSet(in *v1.Replicatio ...@@ -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 { func Convert_v1_ReplicationControllerSpec_to_extensions_ReplicaSetSpec(in *v1.ReplicationControllerSpec, out *extensions.ReplicaSetSpec, s conversion.Scope) error {
out.Replicas = *in.Replicas out.Replicas = *in.Replicas
out.MinReadySeconds = in.MinReadySeconds
if in.Selector != nil { if in.Selector != nil {
out.Selector = new(metav1.LabelSelector) out.Selector = new(metav1.LabelSelector)
metav1.Convert_map_to_unversioned_LabelSelector(&in.Selector, out.Selector, s) metav1.Convert_map_to_unversioned_LabelSelector(&in.Selector, out.Selector, s)
......
...@@ -238,8 +238,9 @@ func TestReplicationControllerConversion(t *testing.T) { ...@@ -238,8 +238,9 @@ func TestReplicationControllerConversion(t *testing.T) {
Namespace: "namespace", Namespace: "namespace",
}, },
Spec: v1.ReplicationControllerSpec{ Spec: v1.ReplicationControllerSpec{
Replicas: &replicas, Replicas: &replicas,
Selector: map[string]string{"foo": "bar", "bar": "foo"}, MinReadySeconds: 32,
Selector: map[string]string{"foo": "bar", "bar": "foo"},
Template: &v1.PodTemplateSpec{ Template: &v1.PodTemplateSpec{
ObjectMeta: metav1.ObjectMeta{ ObjectMeta: metav1.ObjectMeta{
Labels: map[string]string{"foo": "bar", "bar": "foo"}, Labels: map[string]string{"foo": "bar", "bar": "foo"},
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment