github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-28 05:57:25 +00:00
Code Issues Projects Releases Wiki Activity

Fix loss of MinReadySeconds on RC/RS conversion.

Browse Source
This commit is contained in:
Anthony Yeh 2017-09-27 15:22:05 -07:00
parent f290819f75
commit b4815bd4cb
No known key found for this signature in database
GPG Key ID: 339F46A383E6ED08
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/api/v1/conversion.go
View File

@ -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)

5
pkg/api/v1/conversion_test.go
View File

@ -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"},