github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-26 21:17:23 +00:00
Code Issues Projects Releases Wiki Activity

Fix loss of Conditions during RC/RS conversion.

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

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

@ -254,6 +254,15 @@ func Convert_v1_ReplicationControllerStatus_to_extensions_ReplicaSetStatus(in *v
out.ReadyReplicas = in.ReadyReplicas out.ReadyReplicas = in.ReadyReplicas
out.AvailableReplicas = in.AvailableReplicas out.AvailableReplicas = in.AvailableReplicas
out.ObservedGeneration = in.ObservedGeneration out.ObservedGeneration = in.ObservedGeneration
for _, cond := range in.Conditions {
out.Conditions = append(out.Conditions, extensions.ReplicaSetCondition{
Type: extensions.ReplicaSetConditionType(cond.Type),
Status: api.ConditionStatus(cond.Status),
LastTransitionTime: cond.LastTransitionTime,
Reason: cond.Reason,
Message: cond.Message,
})
}
return nil return nil
} }
@ -296,6 +305,15 @@ func Convert_extensions_ReplicaSetStatus_to_v1_ReplicationControllerStatus(in *e
out.ReadyReplicas = in.ReadyReplicas out.ReadyReplicas = in.ReadyReplicas
out.AvailableReplicas = in.AvailableReplicas out.AvailableReplicas = in.AvailableReplicas
out.ObservedGeneration = in.ObservedGeneration out.ObservedGeneration = in.ObservedGeneration
for _, cond := range in.Conditions {
out.Conditions = append(out.Conditions, v1.ReplicationControllerCondition{
Type: v1.ReplicationControllerConditionType(cond.Type),
Status: v1.ConditionStatus(cond.Status),
LastTransitionTime: cond.LastTransitionTime,
Reason: cond.Reason,
Message: cond.Message,
})
}
return nil return nil
} }

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

@ -261,7 +261,15 @@ func TestReplicationControllerConversion(t *testing.T) {
ReadyReplicas: 3, ReadyReplicas: 3,
AvailableReplicas: 4, AvailableReplicas: 4,
ObservedGeneration: 5, ObservedGeneration: 5,
Conditions: []v1.ReplicationControllerCondition{}, Conditions: []v1.ReplicationControllerCondition{
{
Type: v1.ReplicationControllerReplicaFailure,
Status: v1.ConditionTrue,
LastTransitionTime: metav1.NewTime(time.Unix(123456789, 0)),
Reason: "Reason",
Message: "Message",
},
},
}, },
} }
in = roundTrip(t, in).(*v1.ReplicationController) in = roundTrip(t, in).(*v1.ReplicationController)