Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
89cfaf91
Unverified
Commit
89cfaf91
authored
Sep 27, 2017
by
Anthony Yeh
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix loss of Conditions during RC/RS conversion.
parent
b4815bd4
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
27 additions
and
1 deletion
+27
-1
conversion.go
pkg/api/v1/conversion.go
+18
-0
conversion_test.go
pkg/api/v1/conversion_test.go
+9
-1
No files found.
pkg/api/v1/conversion.go
View file @
89cfaf91
...
...
@@ -254,6 +254,15 @@ func Convert_v1_ReplicationControllerStatus_to_extensions_ReplicaSetStatus(in *v
out
.
ReadyReplicas
=
in
.
ReadyReplicas
out
.
AvailableReplicas
=
in
.
AvailableReplicas
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
}
...
...
@@ -296,6 +305,15 @@ func Convert_extensions_ReplicaSetStatus_to_v1_ReplicationControllerStatus(in *e
out
.
ReadyReplicas
=
in
.
ReadyReplicas
out
.
AvailableReplicas
=
in
.
AvailableReplicas
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
}
...
...
pkg/api/v1/conversion_test.go
View file @
89cfaf91
...
...
@@ -261,7 +261,15 @@ func TestReplicationControllerConversion(t *testing.T) {
ReadyReplicas
:
3
,
AvailableReplicas
:
4
,
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
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment