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

Avoid copying deployment revision annotations to rs

Browse Source
This commit is contained in:
Janet Kuo 2016-03-01 17:25:44 -08:00
parent 1706df6242
commit 67bfe5d796
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -774,10 +774,10 @@ func copyDeploymentAnnotationsToReplicaSet(deployment *extensions.Deployment, rs
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 // 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
if k == kubectl.LastAppliedConfigAnnotation || rs.Annotations[k] == v { if k == kubectl.LastAppliedConfigAnnotation || k == deploymentutil.RevisionAnnotation || rs.Annotations[k] == v {
continue continue
} }
rs.Annotations[k] = v rs.Annotations[k] = v