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

2017-08-13 20:10:25 +08:00
parent 12ce4151ce
commit 85602fd542
16 changed files with 48 additions and 41 deletions
--- a/pkg/controller/daemon/update.go
+++ b/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)