CollisionCount should have type int32 across controllers that use it for collision avoidance

pkg/controller/controller_utils.go

@@ -1030,14 +1030,14 @@ func WaitForCacheSync(controllerName string, stopCh <-chan struct{}, cacheSyncs
 }
 
 // ComputeHash returns a hash value calculated from pod template and a collisionCount to avoid hash collision
-func ComputeHash(template *v1.PodTemplateSpec, collisionCount *int64) uint32 {
+func ComputeHash(template *v1.PodTemplateSpec, collisionCount *int32) uint32 {
 	podTemplateSpecHasher := fnv.New32a()
 	hashutil.DeepHashObject(podTemplateSpecHasher, *template)
 
 	// Add collisionCount in the hash if it exists.
 	if collisionCount != nil {
 		collisionCountBytes := make([]byte, 8)
-		binary.LittleEndian.PutUint64(collisionCountBytes, uint64(*collisionCount))
+		binary.LittleEndian.PutUint32(collisionCountBytes, uint32(*collisionCount))
 		podTemplateSpecHasher.Write(collisionCountBytes)
 	}
 

pkg/controller/controller_utils_test.go

@@ -453,23 +453,26 @@ func int64P(num int64) *int64 {
 }
 
 func TestComputeHash(t *testing.T) {
+	collisionCount := int32(1)
+	otherCollisionCount := int32(2)
+	maxCollisionCount := int32(math.MaxInt32)
 	tests := []struct {
 		name                string
 		template            *v1.PodTemplateSpec
-		collisionCount      *int64
-		otherCollisionCount *int64
+		collisionCount      *int32
+		otherCollisionCount *int32
 	}{
 		{
 			name:                "simple",
 			template:            &v1.PodTemplateSpec{},
-			collisionCount:      int64P(1),
-			otherCollisionCount: int64P(2),
+			collisionCount:      &collisionCount,
+			otherCollisionCount: &otherCollisionCount,
 		},
 		{
 			name:                "using math.MaxInt64",
 			template:            &v1.PodTemplateSpec{},
 			collisionCount:      nil,
-			otherCollisionCount: int64P(int64(math.MaxInt64)),
+			otherCollisionCount: &maxCollisionCount,
 		},
 	}
 

pkg/controller/daemon/update.go

@@ -368,7 +368,7 @@ func (dsc *DaemonSetsController) snapshot(ds *extensions.DaemonSet, revision int
 			return nil, getErr
 		}
 		if currDS.Status.CollisionCount == nil {
-			currDS.Status.CollisionCount = new(int64)
+			currDS.Status.CollisionCount = new(int32)
 		}
 		*currDS.Status.CollisionCount++
 		_, updateErr := dsc.kubeClient.ExtensionsV1beta1().DaemonSets(ds.Namespace).UpdateStatus(currDS)

pkg/controller/deployment/sync.go

@@ -160,7 +160,7 @@ func (dc *DeploymentController) rsAndPodsWithHashKeySynced(d *extensions.Deploym
 // 1. Add hash label to the rs's pod template, and make sure the controller sees this update so that no orphaned pods will be created
 // 2. Add hash label to all pods this rs owns, wait until replicaset controller reports rs.Status.FullyLabeledReplicas equal to the desired number of replicas
 // 3. Add hash label to the rs's label and selector
-func (dc *DeploymentController) addHashKeyToRSAndPods(rs *extensions.ReplicaSet, podList *v1.PodList, collisionCount *int64) (*extensions.ReplicaSet, error) {
+func (dc *DeploymentController) addHashKeyToRSAndPods(rs *extensions.ReplicaSet, podList *v1.PodList, collisionCount *int32) (*extensions.ReplicaSet, error) {
 	// If the rs already has the new hash label in its selector, it's done syncing
 	if labelsutil.SelectorHasLabel(rs.Spec.Selector, extensions.DefaultDeploymentUniqueLabelKey) {
 		return rs, nil
@@ -349,7 +349,7 @@ func (dc *DeploymentController) getNewReplicaSet(d *extensions.Deployment, rsLis
 		// and requeue the Deployment.
 		if !isEqual {
 			if d.Status.CollisionCount == nil {
-				d.Status.CollisionCount = new(int64)
+				d.Status.CollisionCount = new(int32)
 			}
 			preCollisionCount := *d.Status.CollisionCount
 			*d.Status.CollisionCount++

pkg/controller/deployment/util/replicaset_util.go

@@ -70,7 +70,7 @@ func UpdateRSWithRetries(rsClient unversionedextensions.ReplicaSetInterface, rsL
 }
 
 // GetReplicaSetHash returns the pod template hash of a ReplicaSet's pod template space
-func GetReplicaSetHash(rs *extensions.ReplicaSet, uniquifier *int64) (string, error) {
+func GetReplicaSetHash(rs *extensions.ReplicaSet, uniquifier *int32) (string, error) {
 	template, err := scheme.Scheme.DeepCopy(rs.Spec.Template)
 	if err != nil {
 		return "", err