github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 13:37:30 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #22375 from janetkuo/comment-deployment-revision

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot 2016-03-02 18:51:54 -08:00
commit aba1847857
1 changed files with 32 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
pkg/controller/deployment/deployment_controller.go
View File

@ -452,7 +452,7 @@ func (dc *DeploymentController) syncDeployment(key string) error {
// Updates the status of a paused deployment // Updates the status of a paused deployment
func (dc *DeploymentController) syncPausedDeploymentStatus(deployment *extensions.Deployment) error { func (dc *DeploymentController) syncPausedDeploymentStatus(deployment *extensions.Deployment) error {
newRS, oldRSs, err := dc.getAllReplicaSets(deployment, false) newRS, oldRSs, err := dc.getAllReplicaSetsAndSyncRevision(deployment, false)
if err != nil { if err != nil {
return err return err
} }
@ -464,7 +464,7 @@ func (dc *DeploymentController) syncPausedDeploymentStatus(deployment *extension
// Rolling back to a revision; no-op if the toRevision is deployment's current revision // Rolling back to a revision; no-op if the toRevision is deployment's current revision
func (dc *DeploymentController) rollback(deployment *extensions.Deployment, toRevision *int64) (*extensions.Deployment, error) { func (dc *DeploymentController) rollback(deployment *extensions.Deployment, toRevision *int64) (*extensions.Deployment, error) {
newRS, allOldRSs, err := dc.getAllReplicaSets(deployment, true) newRS, allOldRSs, err := dc.getAllReplicaSetsAndSyncRevision(deployment, true)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -517,7 +517,7 @@ func (dc *DeploymentController) updateDeploymentAndClearRollbackTo(deployment *e
func (dc *DeploymentController) syncRecreateDeployment(deployment *extensions.Deployment) error { func (dc *DeploymentController) syncRecreateDeployment(deployment *extensions.Deployment) 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.getAllReplicaSets(deployment, false) newRS, oldRSs, err := dc.getAllReplicaSetsAndSyncRevision(deployment, false)
if err != nil { if err != nil {
return err return err
} }
@ -536,7 +536,7 @@ func (dc *DeploymentController) syncRecreateDeployment(deployment *extensions.De
// 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.getAllReplicaSets(deployment, true) newRS, oldRSs, err = dc.getAllReplicaSetsAndSyncRevision(deployment, true)
if err != nil { if err != nil {
return err return err
} }
@ -563,7 +563,7 @@ func (dc *DeploymentController) syncRecreateDeployment(deployment *extensions.De
} }
func (dc *DeploymentController) syncRollingUpdateDeployment(deployment *extensions.Deployment) error { func (dc *DeploymentController) syncRollingUpdateDeployment(deployment *extensions.Deployment) error {
newRS, oldRSs, err := dc.getAllReplicaSets(deployment, true) newRS, oldRSs, err := dc.getAllReplicaSetsAndSyncRevision(deployment, true)
if err != nil { if err != nil {
return err return err
} }
@ -610,13 +610,18 @@ func (dc *DeploymentController) syncDeploymentStatus(allRSs []*extensions.Replic
return nil return nil
} }
// getAllReplicaSets returns all the replica sets for the provided deployment (new and all old). // getAllReplicaSetsAndSyncRevision returns all the replica sets for the provided deployment (new and all old), with new RS's and deployment's revision updated.
func (dc *DeploymentController) getAllReplicaSets(deployment *extensions.Deployment, createIfNotExisted bool) (*extensions.ReplicaSet, []*extensions.ReplicaSet, error) { // 1. Get all old RSes this deployment targets, and calculate the max revision number among them (maxOldV).
// 2. Get new RS this deployment targets (whose pod template matches deployment's), and update new RS's revision number to (maxOldV + 1),
// only if its revision number is smaller than (maxOldV + 1). If this step failed, we'll update it in the next deployment sync loop.
// 3. Copy new RS's revision number to deployment (update deployment's revision). If this step failed, we'll update it in the next deployment sync loop.
func (dc *DeploymentController) getAllReplicaSetsAndSyncRevision(deployment *extensions.Deployment, createIfNotExisted bool) (*extensions.ReplicaSet, []*extensions.ReplicaSet, error) {
_, allOldRSs, err := dc.getOldReplicaSets(deployment) _, allOldRSs, err := dc.getOldReplicaSets(deployment)
if err != nil { if err != nil {
return nil, nil, err return nil, nil, err
} }
// Calculate the max revision number among all old RSes
maxOldV := maxRevision(allOldRSs) maxOldV := maxRevision(allOldRSs)
// Get new replica set with the updated revision number // Get new replica set with the updated revision number
@ -680,8 +685,9 @@ func (dc *DeploymentController) getOldReplicaSets(deployment *extensions.Deploym
} }
// Returns a replica set that matches the intent of the given deployment. // Returns a replica set that matches the intent of the given deployment.
// It creates a new replica set if required. // 1. Get existing new RS (the RS that the given deployment targets, whose pod template is the same as deployment's).
// The revision of the new replica set will be updated to maxOldRevision + 1 // 2. If there's existing new RS, update its revision number if it's smaller than (maxOldRevision + 1), where maxOldRevision is the max revision number among all old RSes.
// 3. If there's no existing new RS and createIfNotExisted is true, create one with appropriate revision number (maxOldRevision + 1) and replicas.
func (dc *DeploymentController) getNewReplicaSet(deployment *extensions.Deployment, maxOldRevision int64, oldRSs []*extensions.ReplicaSet, createIfNotExisted bool) (*extensions.ReplicaSet, error) { func (dc *DeploymentController) getNewReplicaSet(deployment *extensions.Deployment, maxOldRevision int64, oldRSs []*extensions.ReplicaSet, createIfNotExisted bool) (*extensions.ReplicaSet, error) {
// Calculate revision number for this new replica set // Calculate revision number for this new replica set
newRevision := strconv.FormatInt(maxOldRevision+1, 10) newRevision := strconv.FormatInt(maxOldRevision+1, 10)
@ -751,32 +757,39 @@ func (dc *DeploymentController) getNewReplicaSet(deployment *extensions.Deployme
// setNewReplicaSetAnnotations sets new replica set's annotations appropriately by updating its revision and // setNewReplicaSetAnnotations sets new replica set's annotations appropriately by updating its revision and
// copying required deployment annotations to it; it returns true if replica set's annotation is changed. // copying required deployment annotations to it; it returns true if replica set's annotation is changed.
func setNewReplicaSetAnnotations(deployment *extensions.Deployment, rs *extensions.ReplicaSet, newRevision string) bool { func setNewReplicaSetAnnotations(deployment *extensions.Deployment, newRS *extensions.ReplicaSet, newRevision string) bool {
// First, copy deployment's annotations // First, copy deployment's annotations (except for apply and revision annotations)
annotationChanged := copyDeploymentAnnotationsToReplicaSet(deployment, rs) annotationChanged := copyDeploymentAnnotationsToReplicaSet(deployment, newRS)
// Then, update replica set's revision annotation // Then, update replica set's revision annotation
if rs.Annotations == nil { if newRS.Annotations == nil {
rs.Annotations = make(map[string]string) newRS.Annotations = make(map[string]string)
} }
if rs.Annotations[deploymentutil.RevisionAnnotation] < newRevision { // The newRS's revision should be the greatest among all RSes. Usually, its revision number is newRevision (the max revision number
rs.Annotations[deploymentutil.RevisionAnnotation] = newRevision // of all old RSes + 1). However, it's possible that some of the old RSes are deleted after the newRS revision being updated, and
// newRevision becomes smaller than newRS's revision. We should only update newRS revision when it's smaller than newRevision.
if newRS.Annotations[deploymentutil.RevisionAnnotation] < newRevision {
newRS.Annotations[deploymentutil.RevisionAnnotation] = newRevision
annotationChanged = true annotationChanged = true
glog.V(4).Infof("updating replica set %q's revision to %s - %+v\n", rs.Name, newRevision, rs) glog.V(4).Infof("updating replica set %q's revision to %s - %+v\n", newRS.Name, newRevision, newRS)
} }
return annotationChanged return annotationChanged
} }
// copyDeploymentAnnotationsToReplicaSet copies deployment's annotations to replica set's annotations, // copyDeploymentAnnotationsToReplicaSet copies deployment's annotations to replica set's annotations,
// and returns true if replica set's annotation is changed // and returns true if replica set's annotation is changed.
// Note that apply and revision annotations are not copied.
func copyDeploymentAnnotationsToReplicaSet(deployment *extensions.Deployment, rs *extensions.ReplicaSet) bool { func copyDeploymentAnnotationsToReplicaSet(deployment *extensions.Deployment, rs *extensions.ReplicaSet) bool {
rsAnnotationsChanged := false rsAnnotationsChanged := false
if rs.Annotations == nil { if rs.Annotations == nil {
rs.Annotations = make(map[string]string) rs.Annotations = make(map[string]string)
} }
for k, v := range deployment.Annotations { for k, v := range deployment.Annotations {
// Skip apply annotations and revision annotations
// TODO: How to decide which annotations should / should not be copied? // TODO: How to decide which annotations should / should not be copied?
// See https://github.com/kubernetes/kubernetes/pull/20035#issuecomment-179558615 // See https://github.com/kubernetes/kubernetes/pull/20035#issuecomment-179558615
// Skip apply annotations and revision annotations.
// newRS revision is updated automatically in getNewReplicaSet, and the deployment's revision number is then updated
// by copying its newRS revision number. We should not copy deployment's revision to its newRS, since the update of
// deployment revision number may fail (revision becomes stale) and the revision number in newRS is more reliable.
if k == kubectl.LastAppliedConfigAnnotation || k == deploymentutil.RevisionAnnotation || rs.Annotations[k] == v { if k == kubectl.LastAppliedConfigAnnotation || k == deploymentutil.RevisionAnnotation || rs.Annotations[k] == v {
continue continue
} }