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

Add comments about deployment revision update

Browse Source
This commit is contained in:
Janet Kuo 2016-03-02 11:19:48 -08:00
parent 940e0a9b94
commit e42eab59bc
1 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -751,32 +751,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
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
} }