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

pkg/apis/apps/fuzzer/fuzzer.go

@@ -44,7 +44,7 @@ var Funcs = func(codecs runtimeserializer.CodecFactory) []interface{} {
 				s.Status.ObservedGeneration = new(int64)
 			}
 			if s.Status.CollisionCount == nil {
-				s.Status.CollisionCount = new(int64)
+				s.Status.CollisionCount = new(int32)
 			}
 		},
 	}

pkg/apis/apps/types.go

@@ -192,7 +192,7 @@ type StatefulSetStatus struct {
 	// uses this field as a collision avoidance mechanism when it needs to create the name for the
 	// newest ControllerRevision.
 	// +optional
-	CollisionCount *int64
+	CollisionCount *int32
 }
 
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object

pkg/apis/apps/v1beta2/conversion.go

@@ -244,7 +244,7 @@ func Convert_v1beta2_StatefulSetStatus_To_apps_StatefulSetStatus(in *appsv1beta2
 	out.CurrentRevision = in.CurrentRevision
 	out.UpdateRevision = in.UpdateRevision
 	if in.CollisionCount != nil {
-		out.CollisionCount = new(int64)
+		out.CollisionCount = new(int32)
 		*out.CollisionCount = *in.CollisionCount
 	}
 	return nil
@@ -261,7 +261,7 @@ func Convert_apps_StatefulSetStatus_To_v1beta2_StatefulSetStatus(in *apps.Statef
 	out.CurrentRevision = in.CurrentRevision
 	out.UpdateRevision = in.UpdateRevision
 	if in.CollisionCount != nil {
-		out.CollisionCount = new(int64)
+		out.CollisionCount = new(int32)
 		*out.CollisionCount = *in.CollisionCount
 	}
 	return nil

pkg/apis/apps/validation/validation_test.go

@@ -302,7 +302,8 @@ func TestValidateStatefulSet(t *testing.T) {
 }
 
 func TestValidateStatefulSetStatus(t *testing.T) {
-	minusOne := int64(-1)
+	observedGenerationMinusOne := int64(-1)
+	collisionCountMinusOne := int32(-1)
 	tests := []struct {
 		name               string
 		replicas           int32
@@ -310,7 +311,7 @@ func TestValidateStatefulSetStatus(t *testing.T) {
 		currentReplicas    int32
 		updatedReplicas    int32
 		observedGeneration *int64
-		collisionCount     *int64
+		collisionCount     *int32
 		expectedErr        bool
 	}{
 		{
@@ -359,7 +360,7 @@ func TestValidateStatefulSetStatus(t *testing.T) {
 			readyReplicas:      3,
 			currentReplicas:    2,
 			updatedReplicas:    1,
-			observedGeneration: &minusOne,
+			observedGeneration: &observedGenerationMinusOne,
 			expectedErr:        true,
 		},
 		{
@@ -368,7 +369,7 @@ func TestValidateStatefulSetStatus(t *testing.T) {
 			readyReplicas:   3,
 			currentReplicas: 2,
 			updatedReplicas: 1,
-			collisionCount:  &minusOne,
+			collisionCount:  &collisionCountMinusOne,
 			expectedErr:     true,
 		},
 		{