summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichail Kargakis <mkargaki@redhat.com>2017-05-25 14:25:53 +0200
committerMichail Kargakis <mkargaki@redhat.com>2017-05-25 14:25:53 +0200
commit7ccbe70107a4e6a16330a656d84a9caf0fdd7585 (patch)
tree6565974073a5d4e5bcdefa92d64d202c8da2b4b0
parent4fff7fadadcfec9fe66543af8dc13597bbb51631 (diff)
Rename uniquifier field to collisionCount
Signed-off-by: Michail Kargakis <mkargaki@redhat.com>
-rw-r--r--contributors/design-proposals/deployment.md16
1 files changed, 8 insertions, 8 deletions
diff --git a/contributors/design-proposals/deployment.md b/contributors/design-proposals/deployment.md
index b064f47d..5256ffeb 100644
--- a/contributors/design-proposals/deployment.md
+++ b/contributors/design-proposals/deployment.md
@@ -116,10 +116,10 @@ type DeploymentStatus struct {
// Total number of new ready pods with the desired template spec.
UpdatedReplicas int32
- // Monotonically increasing counter that tracks hash collisions for
- // the Deployment. Used as a collision avoidance mechanism by the
- // Deployment controller.
- Uniquifier *int64
+ // Count of hash collisions for the Deployment. The Deployment controller uses this
+ // field as a collision avoidance mechanism when it needs to create the name for the
+ // newest ReplicaSet.
+ CollisionCount *int64
}
```
@@ -139,8 +139,8 @@ For each creation or update for a Deployment, it will:
that they do not select the newly created pods (or old pods get selected by the
new RS).
- The label key will be "pod-template-hash".
- - The label value will be the hash of {podTemplateSpec+uniquifier} where podTemplateSpec
- is the one that the new RS uses and uniquifier is a counter in the DeploymentStatus
+ - The label value will be the hash of {podTemplateSpec+collisionCount} where podTemplateSpec
+ is the one that the new RS uses and collisionCount is a counter in the DeploymentStatus
that increments every time a [hash collision](#hashing-collisions) happens (hash
collisions should be rare with fnv).
- If the RSs and pods dont already have this label and selector:
@@ -235,8 +235,8 @@ hashing an API object is subject to API changes which means that the name
for a ReplicaSet may differ between minor Kubernetes versions.
For both of the aforementioned cases, we will use a field in the DeploymentStatus,
-called Uniquifier, to create a unique hash value when a hash collision happens.
-The Deployment controller will compute the hash value of {template+uniquifier},
+called collisionCount, to create a unique hash value when a hash collision happens.
+The Deployment controller will compute the hash value of {template+collisionCount},
and will use the resulting hash in the ReplicaSet names and selectors. One side
effect of this hash collision avoidance mechanism is that we don't need to
migrate ReplicaSets that were created with adler.