Skip to content

Commit 89cfaf9

Browse files
committed
Fix loss of Conditions during RC/RS conversion.
1 parent b4815bd commit 89cfaf9

File tree

2 files changed

+27
-1
lines changed

2 files changed

+27
-1
lines changed

pkg/api/v1/conversion.go

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -254,6 +254,15 @@ func Convert_v1_ReplicationControllerStatus_to_extensions_ReplicaSetStatus(in *v
254254
out.ReadyReplicas = in.ReadyReplicas
255255
out.AvailableReplicas = in.AvailableReplicas
256256
out.ObservedGeneration = in.ObservedGeneration
257+
for _, cond := range in.Conditions {
258+
out.Conditions = append(out.Conditions, extensions.ReplicaSetCondition{
259+
Type: extensions.ReplicaSetConditionType(cond.Type),
260+
Status: api.ConditionStatus(cond.Status),
261+
LastTransitionTime: cond.LastTransitionTime,
262+
Reason: cond.Reason,
263+
Message: cond.Message,
264+
})
265+
}
257266
return nil
258267
}
259268

@@ -296,6 +305,15 @@ func Convert_extensions_ReplicaSetStatus_to_v1_ReplicationControllerStatus(in *e
296305
out.ReadyReplicas = in.ReadyReplicas
297306
out.AvailableReplicas = in.AvailableReplicas
298307
out.ObservedGeneration = in.ObservedGeneration
308+
for _, cond := range in.Conditions {
309+
out.Conditions = append(out.Conditions, v1.ReplicationControllerCondition{
310+
Type: v1.ReplicationControllerConditionType(cond.Type),
311+
Status: v1.ConditionStatus(cond.Status),
312+
LastTransitionTime: cond.LastTransitionTime,
313+
Reason: cond.Reason,
314+
Message: cond.Message,
315+
})
316+
}
299317
return nil
300318
}
301319

pkg/api/v1/conversion_test.go

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,15 @@ func TestReplicationControllerConversion(t *testing.T) {
261261
ReadyReplicas: 3,
262262
AvailableReplicas: 4,
263263
ObservedGeneration: 5,
264-
Conditions: []v1.ReplicationControllerCondition{},
264+
Conditions: []v1.ReplicationControllerCondition{
265+
{
266+
Type: v1.ReplicationControllerReplicaFailure,
267+
Status: v1.ConditionTrue,
268+
LastTransitionTime: metav1.NewTime(time.Unix(123456789, 0)),
269+
Reason: "Reason",
270+
Message: "Message",
271+
},
272+
},
265273
},
266274
}
267275
in = roundTrip(t, in).(*v1.ReplicationController)

0 commit comments

Comments
 (0)