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
996200b7
Commit
996200b7
authored
Mar 14, 2017
by
zhengjiajin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update annotations
parent
5e29e1ee
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
9 deletions
+9
-9
recreate.go
pkg/controller/deployment/recreate.go
+9
-9
No files found.
pkg/controller/deployment/recreate.go
View file @
996200b7
...
@@ -25,7 +25,7 @@ import (
...
@@ -25,7 +25,7 @@ import (
// rolloutRecreate implements the logic for recreating a replica set.
// rolloutRecreate implements the logic for recreating a replica set.
func
(
dc
*
DeploymentController
)
rolloutRecreate
(
d
*
extensions
.
Deployment
,
rsList
[]
*
extensions
.
ReplicaSet
,
podMap
map
[
types
.
UID
]
*
v1
.
PodList
)
error
{
func
(
dc
*
DeploymentController
)
rolloutRecreate
(
d
*
extensions
.
Deployment
,
rsList
[]
*
extensions
.
ReplicaSet
,
podMap
map
[
types
.
UID
]
*
v1
.
PodList
)
error
{
// Don't create a new RS if not already existed, so that we avoid scaling up before scaling down
// Don't create a new RS if not already existed, so that we avoid scaling up before scaling down
.
newRS
,
oldRSs
,
err
:=
dc
.
getAllReplicaSetsAndSyncRevision
(
d
,
rsList
,
podMap
,
false
)
newRS
,
oldRSs
,
err
:=
dc
.
getAllReplicaSetsAndSyncRevision
(
d
,
rsList
,
podMap
,
false
)
if
err
!=
nil
{
if
err
!=
nil
{
return
err
return
err
...
@@ -33,13 +33,13 @@ func (dc *DeploymentController) rolloutRecreate(d *extensions.Deployment, rsList
...
@@ -33,13 +33,13 @@ func (dc *DeploymentController) rolloutRecreate(d *extensions.Deployment, rsList
allRSs
:=
append
(
oldRSs
,
newRS
)
allRSs
:=
append
(
oldRSs
,
newRS
)
activeOldRSs
:=
controller
.
FilterActiveReplicaSets
(
oldRSs
)
activeOldRSs
:=
controller
.
FilterActiveReplicaSets
(
oldRSs
)
// scale down old replica sets
// scale down old replica sets
.
scaledDown
,
err
:=
dc
.
scaleDownOldReplicaSetsForRecreate
(
activeOldRSs
,
d
)
scaledDown
,
err
:=
dc
.
scaleDownOldReplicaSetsForRecreate
(
activeOldRSs
,
d
)
if
err
!=
nil
{
if
err
!=
nil
{
return
err
return
err
}
}
if
scaledDown
{
if
scaledDown
{
// Update DeploymentStatus
// Update DeploymentStatus
.
return
dc
.
syncRolloutStatus
(
allRSs
,
newRS
,
d
)
return
dc
.
syncRolloutStatus
(
allRSs
,
newRS
,
d
)
}
}
...
@@ -53,7 +53,7 @@ func (dc *DeploymentController) rolloutRecreate(d *extensions.Deployment, rsList
...
@@ -53,7 +53,7 @@ func (dc *DeploymentController) rolloutRecreate(d *extensions.Deployment, rsList
}
}
}
}
// If we need to create a new RS, create it now
// If we need to create a new RS, create it now
.
// TODO: Create a new RS without re-listing all RSs.
// TODO: Create a new RS without re-listing all RSs.
if
newRS
==
nil
{
if
newRS
==
nil
{
newRS
,
oldRSs
,
err
=
dc
.
getAllReplicaSetsAndSyncRevision
(
d
,
rsList
,
podMap
,
true
)
newRS
,
oldRSs
,
err
=
dc
.
getAllReplicaSetsAndSyncRevision
(
d
,
rsList
,
podMap
,
true
)
...
@@ -63,21 +63,21 @@ func (dc *DeploymentController) rolloutRecreate(d *extensions.Deployment, rsList
...
@@ -63,21 +63,21 @@ func (dc *DeploymentController) rolloutRecreate(d *extensions.Deployment, rsList
allRSs
=
append
(
oldRSs
,
newRS
)
allRSs
=
append
(
oldRSs
,
newRS
)
}
}
// scale up new replica set
// scale up new replica set
.
scaledUp
,
err
:=
dc
.
scaleUpNewReplicaSetForRecreate
(
newRS
,
d
)
scaledUp
,
err
:=
dc
.
scaleUpNewReplicaSetForRecreate
(
newRS
,
d
)
if
err
!=
nil
{
if
err
!=
nil
{
return
err
return
err
}
}
if
scaledUp
{
if
scaledUp
{
// Update DeploymentStatus
// Update DeploymentStatus
.
return
dc
.
syncRolloutStatus
(
allRSs
,
newRS
,
d
)
return
dc
.
syncRolloutStatus
(
allRSs
,
newRS
,
d
)
}
}
// Sync deployment status
// Sync deployment status
.
return
dc
.
syncRolloutStatus
(
allRSs
,
newRS
,
d
)
return
dc
.
syncRolloutStatus
(
allRSs
,
newRS
,
d
)
}
}
// scaleDownOldReplicaSetsForRecreate scales down old replica sets when deployment strategy is "Recreate"
// scaleDownOldReplicaSetsForRecreate scales down old replica sets when deployment strategy is "Recreate"
.
func
(
dc
*
DeploymentController
)
scaleDownOldReplicaSetsForRecreate
(
oldRSs
[]
*
extensions
.
ReplicaSet
,
deployment
*
extensions
.
Deployment
)
(
bool
,
error
)
{
func
(
dc
*
DeploymentController
)
scaleDownOldReplicaSetsForRecreate
(
oldRSs
[]
*
extensions
.
ReplicaSet
,
deployment
*
extensions
.
Deployment
)
(
bool
,
error
)
{
scaled
:=
false
scaled
:=
false
for
i
:=
range
oldRSs
{
for
i
:=
range
oldRSs
{
...
@@ -98,7 +98,7 @@ func (dc *DeploymentController) scaleDownOldReplicaSetsForRecreate(oldRSs []*ext
...
@@ -98,7 +98,7 @@ func (dc *DeploymentController) scaleDownOldReplicaSetsForRecreate(oldRSs []*ext
return
scaled
,
nil
return
scaled
,
nil
}
}
// scaleUpNewReplicaSetForRecreate scales up new replica set when deployment strategy is "Recreate"
// scaleUpNewReplicaSetForRecreate scales up new replica set when deployment strategy is "Recreate"
.
func
(
dc
*
DeploymentController
)
scaleUpNewReplicaSetForRecreate
(
newRS
*
extensions
.
ReplicaSet
,
deployment
*
extensions
.
Deployment
)
(
bool
,
error
)
{
func
(
dc
*
DeploymentController
)
scaleUpNewReplicaSetForRecreate
(
newRS
*
extensions
.
ReplicaSet
,
deployment
*
extensions
.
Deployment
)
(
bool
,
error
)
{
scaled
,
_
,
err
:=
dc
.
scaleReplicaSetAndRecordEvent
(
newRS
,
*
(
deployment
.
Spec
.
Replicas
),
deployment
)
scaled
,
_
,
err
:=
dc
.
scaleReplicaSetAndRecordEvent
(
newRS
,
*
(
deployment
.
Spec
.
Replicas
),
deployment
)
return
scaled
,
err
return
scaled
,
err
...
...
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