@@ -21098,7 +21098,7 @@

     "properties": {

      "latestVersion": {

       "type": "integer",

-      "format": "int32",

+      "format": "int64",

       "description": "LatestVersion is used to determine whether the current deployment associated with a DeploymentConfig is out of sync."

      },

      "details": {

@@ -21515,7 +21515,7 @@

      "size": {

       "type": "integer",

       "format": "int64",

-      "description": "Size of the layer as defined by the underlying store."

+      "description": "Size of the layer in bytes as defined by the underlying store."

      }

     }

    },

@@ -1006,7 +1006,7 @@ func deepCopy_v1beta3_BuildRequest(in apiv1beta3.BuildRequest, out *apiv1beta3.B

 		out.Binary = nil

 	}

 	if in.LastVersion != nil {

-		out.LastVersion = new(int)

+		out.LastVersion = new(int64)

 		*out.LastVersion = *in.LastVersion

 	} else {

 		out.LastVersion = nil

@@ -1896,7 +1896,7 @@ func deepCopy_v1beta3_RollingDeploymentStrategyParams(in deployapiv1beta3.Rollin

 		out.MaxSurge = nil

 	}

 	if in.UpdatePercent != nil {

-		out.UpdatePercent = new(int)

+		out.UpdatePercent = new(int32)

 		*out.UpdatePercent = *in.UpdatePercent

 	} else {

 		out.UpdatePercent = nil

@@ -320,7 +320,7 @@ func DeepCopy_api_BuildRequest(in BuildRequest, out *BuildRequest, c *conversion

 	}

 	if in.LastVersion != nil {

 		in, out := in.LastVersion, &out.LastVersion

-		*out = new(int)

+		*out = new(int64)

 		**out = *in

 	} else {

 		out.LastVersion = nil

@@ -336,7 +336,7 @@ func Convert_api_BuildConfigSpec_To_v1_BuildConfigSpec(in *build_api.BuildConfig

 }

 func autoConvert_v1_BuildConfigStatus_To_api_BuildConfigStatus(in *BuildConfigStatus, out *build_api.BuildConfigStatus, s conversion.Scope) error {

-	out.LastVersion = in.LastVersion

+	out.LastVersion = int64(in.LastVersion)

 	return nil

 }

@@ -345,7 +345,7 @@ func Convert_v1_BuildConfigStatus_To_api_BuildConfigStatus(in *BuildConfigStatus

 }

 func autoConvert_api_BuildConfigStatus_To_v1_BuildConfigStatus(in *build_api.BuildConfigStatus, out *BuildConfigStatus, s conversion.Scope) error {

-	out.LastVersion = in.LastVersion

+	out.LastVersion = int(in.LastVersion)

 	return nil

 }

@@ -677,8 +677,8 @@ func autoConvert_v1_BuildRequest_To_api_BuildRequest(in *BuildRequest, out *buil

 	}

 	if in.LastVersion != nil {

 		in, out := &in.LastVersion, &out.LastVersion

-		*out = new(int)

-		**out = **in

+		*out = new(int64)

+		**out = int64(**in)

 	} else {

 		out.LastVersion = nil

 	}

@@ -761,7 +761,7 @@ func autoConvert_api_BuildRequest_To_v1_BuildRequest(in *build_api.BuildRequest,

 	if in.LastVersion != nil {

 		in, out := &in.LastVersion, &out.LastVersion

 		*out = new(int)

-		**out = **in

+		**out = int(**in)

 	} else {

 		out.LastVersion = nil

 	}

@@ -62,7 +62,7 @@ func (c *BuildConfigController) HandleBuildConfig(bc *buildapi.BuildConfig) erro

 	buildTriggerCauses := []buildapi.BuildTriggerCause{}

 	// instantiate new build

-	lastVersion := 0

+	lastVersion := int64(0)

 	request := &buildapi.BuildRequest{

 		TriggeredBy: append(buildTriggerCauses,

 			buildapi.BuildTriggerCause{

@@ -266,7 +266,7 @@ func (g *BuildGenerator) Instantiate(ctx kapi.Context, request *buildapi.BuildRe

 // checkBuildConfigLastVersion will return an error if the BuildConfig's LastVersion doesn't match the passed in lastVersion

 // when lastVersion is not nil

-func (g *BuildGenerator) checkLastVersion(bc *buildapi.BuildConfig, lastVersion *int) error {

+func (g *BuildGenerator) checkLastVersion(bc *buildapi.BuildConfig, lastVersion *int64) error {

 	if lastVersion != nil && bc.Status.LastVersion != *lastVersion {

 		glog.V(2).Infof("Aborting version triggered build for BuildConfig %s/%s because the BuildConfig LastVersion (%d) does not match the requested LastVersion (%d)", bc.Namespace, bc.Name, bc.Status.LastVersion, *lastVersion)

 		return fmt.Errorf("the LastVersion(%v) on build config %s/%s does not match the build request LastVersion(%d)",

@@ -429,7 +429,7 @@ func (g *BuildGenerator) generateBuildFromConfig(ctx kapi.Context, bc *buildapi.

 	if build.Annotations == nil {

 		build.Annotations = make(map[string]string)

 	}

-	build.Annotations[buildapi.BuildNumberAnnotation] = strconv.Itoa(bc.Status.LastVersion)

+	build.Annotations[buildapi.BuildNumberAnnotation] = strconv.FormatInt(bc.Status.LastVersion, 10)

 	build.Annotations[buildapi.BuildConfigAnnotation] = bcCopy.Name

 	if build.Labels == nil {

 		build.Labels = make(map[string]string)

@@ -703,7 +703,7 @@ func generateBuildFromBuild(build *buildapi.Build, buildConfig *buildapi.BuildCo

 	}

 	newBuild.Annotations[buildapi.BuildCloneAnnotation] = build.Name

 	if buildConfig != nil {

-		newBuild.Annotations[buildapi.BuildNumberAnnotation] = strconv.Itoa(buildConfig.Status.LastVersion)

+		newBuild.Annotations[buildapi.BuildNumberAnnotation] = strconv.FormatInt(buildConfig.Status.LastVersion, 10)

 	} else {

 		// builds without a buildconfig don't have build numbers.

 		delete(newBuild.Annotations, buildapi.BuildNumberAnnotation)

@@ -327,7 +327,7 @@ func TestInstantiateWithLastVersion(t *testing.T) {

 	}

 	// Version specified and it matches

-	lastVersion := 1

+	lastVersion := int64(1)

 	_, err = g.Instantiate(kapi.NewDefaultContext(), &buildapi.BuildRequest{LastVersion: &lastVersion})

 	if err != nil {

 		t.Errorf("Unexpected error %v", err)

@@ -1177,7 +1177,7 @@ func TestGetNextBuildName(t *testing.T) {

 	if expected, actual := bc.Name+"-1", getNextBuildName(bc); expected != actual {

 		t.Errorf("Wrong buildName, expected %s, got %s", expected, actual)

 	}

-	if expected, actual := 1, bc.Status.LastVersion; expected != actual {

+	if expected, actual := int64(1), bc.Status.LastVersion; expected != actual {

 		t.Errorf("Wrong version, expected %d, got %d", expected, actual)

 	}

 }

@@ -24,7 +24,7 @@ var (

 	configName = strings.Repeat("a", validation.DNS1123LabelMaxLength)

 )

-func makeBuildConfig(version int, deleting bool) *buildapi.BuildConfig {

+func makeBuildConfig(version int64, deleting bool) *buildapi.BuildConfig {

 	ret := &buildapi.BuildConfig{

 		ObjectMeta: kapi.ObjectMeta{

 			Name:        configName,

@@ -92,7 +92,7 @@ type RegistryConfig struct {

 	Type           string

 	ImageTemplate  variable.ImageTemplate

 	Ports          string

-	Replicas       int

+	Replicas       int32

 	Labels         string

 	Volume         string

 	HostMount      string

@@ -161,7 +161,7 @@ func NewCmdRegistry(f *clientcmd.Factory, parentName, name string, out io.Writer

 	cmd.Flags().StringVar(&cfg.ImageTemplate.Format, "images", cfg.ImageTemplate.Format, "The image to base this registry on - ${component} will be replaced with --type")

 	cmd.Flags().BoolVar(&cfg.ImageTemplate.Latest, "latest-images", cfg.ImageTemplate.Latest, "If true, attempt to use the latest image for the registry instead of the latest release.")

 	cmd.Flags().StringVar(&cfg.Ports, "ports", cfg.Ports, fmt.Sprintf("A comma delimited list of ports or port pairs to expose on the registry pod. The default is set for %d.", defaultPort))

-	cmd.Flags().IntVar(&cfg.Replicas, "replicas", cfg.Replicas, "The replication factor of the registry; commonly 2 when high availability is desired.")

+	cmd.Flags().Int32Var(&cfg.Replicas, "replicas", cfg.Replicas, "The replication factor of the registry; commonly 2 when high availability is desired.")

 	cmd.Flags().StringVar(&cfg.Labels, "labels", cfg.Labels, "A set of labels to uniquely identify the registry and its components.")

 	cmd.Flags().StringVar(&cfg.Volume, "volume", cfg.Volume, "The volume path to use for registry storage; defaults to /registry which is the default for origin-docker-registry.")

 	cmd.Flags().StringVar(&cfg.HostMount, "mount-host", cfg.HostMount, "If set, the registry volume will be created as a host-mount at this path.")

@@ -110,7 +110,7 @@ type RouterConfig struct {

 	Ports string

 	// Replicas specifies the initial replica count for the router.

-	Replicas int

+	Replicas int32

 	// Labels specifies the label or labels that will be assigned to the router

 	// pod.

@@ -248,7 +248,7 @@ func NewCmdRouter(f *clientcmd.Factory, parentName, name string, out io.Writer)

 	cmd.Flags().StringVar(&cfg.ImageTemplate.Format, "images", cfg.ImageTemplate.Format, "The image to base this router on - ${component} will be replaced with --type")

 	cmd.Flags().BoolVar(&cfg.ImageTemplate.Latest, "latest-images", cfg.ImageTemplate.Latest, "If true, attempt to use the latest images for the router instead of the latest release.")

 	cmd.Flags().StringVar(&cfg.Ports, "ports", cfg.Ports, "A comma delimited list of ports or port pairs to expose on the router pod. The default is set for HAProxy. Port pairs are applied to the service and to host ports (if specified).")

-	cmd.Flags().IntVar(&cfg.Replicas, "replicas", cfg.Replicas, "The replication factor of the router; commonly 2 when high availability is desired.")

+	cmd.Flags().Int32Var(&cfg.Replicas, "replicas", cfg.Replicas, "The replication factor of the router; commonly 2 when high availability is desired.")

 	cmd.Flags().StringVar(&cfg.Labels, "labels", cfg.Labels, "A set of labels to uniquely identify the router and its components.")

 	cmd.Flags().BoolVar(&cfg.SecretsAsEnv, "secrets-as-env", cfg.SecretsAsEnv, "Use environment variables for master secrets.")

 	cmd.Flags().Bool("create", false, "deprecated; this is now the default behavior")

@@ -711,7 +711,7 @@ func RunCmdRouter(f *clientcmd.Factory, cmd *cobra.Command, out io.Writer, cfg *

 			},

 		)

 	}

-	updatePercent := int(-25)

+	updatePercent := int32(-25)

 	objects = append(objects, &deployapi.DeploymentConfig{

 		ObjectMeta: kapi.ObjectMeta{

 			Name:   name,

@@ -336,7 +336,7 @@ func (o DeployOptions) cancel(config *deployapi.DeploymentConfig, out io.Writer)

 				anyCancelled = true

 			} else {

 				fmt.Fprintf(out, "Couldn't cancel deployment #%d (status: %s): %v\n", deployutil.DeploymentVersionFor(&deployment), status, err)

-				failedCancellations = append(failedCancellations, strconv.Itoa(deployutil.DeploymentVersionFor(&deployment)))

+				failedCancellations = append(failedCancellations, strconv.FormatInt(deployutil.DeploymentVersionFor(&deployment), 10))

 			}

 		}

 	}

@@ -207,12 +207,12 @@ func TestCmdDeploy_retryRejectNonFailed(t *testing.T) {

 // and none of the completed/faild ones.

 func TestCmdDeploy_cancelOk(t *testing.T) {

 	type existing struct {

-		version      int

+		version      int64

 		status       deployapi.DeploymentStatus

 		shouldCancel bool

 	}

 	type scenario struct {

-		version  int

+		version  int64

 		existing []existing

 	}

@@ -262,8 +262,8 @@ func TestCmdDeploy_cancelOk(t *testing.T) {

 			t.Fatalf("unexpected error: %v", err)

 		}

-		expectedCancellations := []int{}

-		actualCancellations := []int{}

+		expectedCancellations := []int64{}

+		actualCancellations := []int64{}

 		for _, e := range scenario.existing {

 			if e.shouldCancel {

 				expectedCancellations = append(expectedCancellations, e.version)

@@ -273,14 +273,20 @@ func TestCmdDeploy_cancelOk(t *testing.T) {

 			actualCancellations = append(actualCancellations, deployutil.DeploymentVersionFor(&d))

 		}

-		sort.Ints(actualCancellations)

-		sort.Ints(expectedCancellations)

+		sort.Sort(Int64Slice(actualCancellations))

+		sort.Sort(Int64Slice(expectedCancellations))

 		if !reflect.DeepEqual(actualCancellations, expectedCancellations) {

 			t.Fatalf("expected cancellations: %v, actual: %v", expectedCancellations, actualCancellations)

 		}

 	}

 }

+type Int64Slice []int64

+

+func (p Int64Slice) Len() int           { return len(p) }

+func (p Int64Slice) Less(i, j int) bool { return p[i] < p[j] }

+func (p Int64Slice) Swap(i, j int)      { p[i], p[j] = p[j], p[i] }

+

 func TestDeploy_reenableTriggers(t *testing.T) {

 	mktrigger := func() deployapi.DeploymentTriggerPolicy {

 		t := deploytest.OkImageChangeTrigger()

@@ -87,7 +87,7 @@ func NewCmdRollback(fullName string, f *clientcmd.Factory, out io.Writer) *cobra

 	cmd.Flags().StringVarP(&opts.Format, "output", "o", "", "Instead of performing the rollback, print the updated deployment configuration in the specified format (json|yaml|name|template|templatefile)")

 	cmd.Flags().StringVarP(&opts.Template, "template", "t", "", "Template string or path to template file to use when -o=template or -o=templatefile.")

 	cmd.MarkFlagFilename("template")

-	cmd.Flags().IntVar(&opts.DesiredVersion, "to-version", 0, "A config version to rollback to. Specifying version 0 is the same as omitting a version (the version will be auto-detected). This option is ignored when specifying a deployment.")

+	cmd.Flags().Int64Var(&opts.DesiredVersion, "to-version", 0, "A config version to rollback to. Specifying version 0 is the same as omitting a version (the version will be auto-detected). This option is ignored when specifying a deployment.")

 	return cmd

 }

@@ -96,7 +96,7 @@ func NewCmdRollback(fullName string, f *clientcmd.Factory, out io.Writer) *cobra

 type RollbackOptions struct {

 	Namespace              string

 	TargetName             string

-	DesiredVersion         int

+	DesiredVersion         int64

 	Format                 string

 	Template               string

 	DryRun                 bool

@@ -319,7 +319,7 @@ func (o *RollbackOptions) findResource(targetName string) (runtime.Object, error

 // the deployment matching desiredVersion will be returned. If desiredVersion

 // is <=0, the last completed deployment which is older than the config's

 // version will be returned.

-func (o *RollbackOptions) findTargetDeployment(config *deployapi.DeploymentConfig, desiredVersion int) (*kapi.ReplicationController, error) {

+func (o *RollbackOptions) findTargetDeployment(config *deployapi.DeploymentConfig, desiredVersion int64) (*kapi.ReplicationController, error) {

 	// Find deployments for the config sorted by version descending.

 	deployments, err := o.kc.ReplicationControllers(config.Namespace).List(kapi.ListOptions{LabelSelector: deployutil.ConfigSelector(config.Name)})

 	if err != nil {

@@ -13,15 +13,15 @@ import (

 func TestRollbackOptions_findTargetDeployment(t *testing.T) {

 	type existingDeployment struct {

-		version int

+		version int64

 		status  deployapi.DeploymentStatus

 	}

 	tests := []struct {

 		name            string

-		configVersion   int

-		desiredVersion  int

+		configVersion   int64

+		desiredVersion  int64

 		existing        []existingDeployment

-		expectedVersion int

+		expectedVersion int64

 		errorExpected   bool

 	}{

 		{

@@ -65,7 +65,7 @@ func (d *DeploymentConfigDescriber) Describe(namespace, name string, settings kc

 		if deploymentConfig.Status.LatestVersion == 0 {

 			formatString(out, "Latest Version", "Not deployed")

 		} else {

-			formatString(out, "Latest Version", strconv.Itoa(deploymentConfig.Status.LatestVersion))

+			formatString(out, "Latest Version", strconv.FormatInt(deploymentConfig.Status.LatestVersion, 10))

 		}

 		printDeploymentConfigSpec(d.kubeClient, *deploymentConfig, out)

@@ -413,7 +413,7 @@ func (d *BuildConfigDescriber) Describe(namespace, name string, settings kctl.De

 		if buildConfig.Status.LastVersion == 0 {

 			formatString(out, "Latest Version", "Never built")

 		} else {

-			formatString(out, "Latest Version", strconv.Itoa(buildConfig.Status.LastVersion))

+			formatString(out, "Latest Version", strconv.FormatInt(buildConfig.Status.LastVersion, 10))

 		}

 		describeCommonSpec(buildConfig.Spec.CommonSpec, out)

 		formatString(out, "\nBuild Run Policy", string(buildConfig.Spec.RunPolicy))

@@ -499,14 +499,14 @@ func describeImage(image *imageapi.Image, imageName string) (string, error) {

 			formatString(out, "Image Size", units.HumanSize(float64(image.DockerImageMetadata.Size)))

 		default:

 			info := []string{}

-			if image.DockerImageLayers[0].Size > 0 {

-				info = append(info, fmt.Sprintf("first layer %s", units.HumanSize(float64(image.DockerImageLayers[0].Size))))

+			if image.DockerImageLayers[0].LayerSize > 0 {

+				info = append(info, fmt.Sprintf("first layer %s", units.HumanSize(float64(image.DockerImageLayers[0].LayerSize))))

 			}

 			for i := l - 1; i > 0; i-- {

-				if image.DockerImageLayers[i].Size == 0 {

+				if image.DockerImageLayers[i].LayerSize == 0 {

 					continue

 				}

-				info = append(info, fmt.Sprintf("last binary layer %s", units.HumanSize(float64(image.DockerImageLayers[i].Size))))

+				info = append(info, fmt.Sprintf("last binary layer %s", units.HumanSize(float64(image.DockerImageLayers[i].LayerSize))))

 				break

 			}

 			if len(info) > 0 {

@@ -92,7 +92,7 @@ func NewCmdIPFailoverConfig(f *clientcmd.Factory, parentName, name string, out,

 	cmd.Flags().IntVarP(&options.WatchPort, "watch-port", "w", ipfailover.DefaultWatchPort, "Port to monitor or watch for resource availability.")

 	cmd.Flags().IntVar(&options.VRRPIDOffset, "vrrp-id-offset", options.VRRPIDOffset, "Offset to use for setting ids of VRRP instances (default offset is 0). This allows multiple ipfailover instances to run within the same cluster.")

-	cmd.Flags().IntVarP(&options.Replicas, "replicas", "r", options.Replicas, "The replication factor of this IP failover configuration; commonly 2 when high availability is desired. Please ensure this matches the number of nodes that satisfy the selector (or default selector) specified.")

+	cmd.Flags().Int32VarP(&options.Replicas, "replicas", "r", options.Replicas, "The replication factor of this IP failover configuration; commonly 2 when high availability is desired. Please ensure this matches the number of nodes that satisfy the selector (or default selector) specified.")

 	// autocompletion hints

 	cmd.MarkFlagFilename("credentials", "kubeconfig")

@@ -240,7 +240,7 @@ func (d *Deployer) Deploy(namespace, rcName string) error {

 	}

 	// Perform the deployment.

-	if err := s.Deploy(from, to, desiredReplicas); err != nil {

+	if err := s.Deploy(from, to, int(desiredReplicas)); err != nil {

 		return err

 	}

 	fmt.Fprintf(d.out, "--> Success\n")

@@ -43,23 +43,23 @@ func TestDeployer_getDeploymentFail(t *testing.T) {

 }

 func TestDeployer_deployScenarios(t *testing.T) {

-	mkd := func(version int, status deployapi.DeploymentStatus, replicas int, desired int) *kapi.ReplicationController {

+	mkd := func(version int64, status deployapi.DeploymentStatus, replicas int32, desired int32) *kapi.ReplicationController {

 		deployment := mkdeployment(version, status)

 		deployment.Spec.Replicas = int32(replicas)

 		if desired > 0 {

-			deployment.Annotations[deployapi.DesiredReplicasAnnotation] = strconv.Itoa(desired)

+			deployment.Annotations[deployapi.DesiredReplicasAnnotation] = strconv.Itoa(int(desired))

 		}

 		return deployment

 	}

 	type scaleEvent struct {

-		version int

-		size    int

+		version int64

+		size    int32

 	}

 	scenarios := []struct {

 		name        string

 		deployments []*kapi.ReplicationController

-		fromVersion int

-		toVersion   int

+		fromVersion int64

+		toVersion   int64

 		scaleEvents []scaleEvent

 	}{

 		{

@@ -121,7 +121,7 @@ func TestDeployer_deployScenarios(t *testing.T) {

 	for _, s := range scenarios {

 		t.Logf("executing scenario %s", s.name)

-		findDeployment := func(version int) *kapi.ReplicationController {

+		findDeployment := func(version int64) *kapi.ReplicationController {

 			for _, d := range s.deployments {

 				if deployutil.DeploymentVersionFor(d) == version {

 					return d

@@ -131,7 +131,7 @@ func TestDeployer_deployScenarios(t *testing.T) {

 		}

 		var actualFrom, actualTo *kapi.ReplicationController

-		var actualDesired int

+		var actualDesired int32

 		to := findDeployment(s.toVersion)

 		scaler := &scalertest.FakeScaler{}

@@ -143,7 +143,7 @@ func TestDeployer_deployScenarios(t *testing.T) {

 					deployFunc: func(from *kapi.ReplicationController, to *kapi.ReplicationController, desiredReplicas int) error {

 						actualFrom = from

 						actualTo = to

-						actualDesired = desiredReplicas

+						actualDesired = int32(desiredReplicas)

 						return nil

 					},

 				}, nil

@@ -196,7 +196,7 @@ func TestDeployer_deployScenarios(t *testing.T) {

 	}

 }

-func mkdeployment(version int, status deployapi.DeploymentStatus) *kapi.ReplicationController {

+func mkdeployment(version int64, status deployapi.DeploymentStatus) *kapi.ReplicationController {

 	deployment, _ := deployutil.MakeDeployment(deploytest.OkDeploymentConfig(version), kapi.Codecs.LegacyCodec(deployapi.SchemeGroupVersion))

 	deployment.Annotations[deployapi.DeploymentStatusAnnotation] = string(status)

 	return deployment

@@ -475,7 +475,7 @@ func DeepCopy_api_RollingDeploymentStrategyParams(in RollingDeploymentStrategyPa

 	}

 	if in.UpdatePercent != nil {

 		in, out := in.UpdatePercent, &out.UpdatePercent

-		*out = new(int)

+		*out = new(int32)

 		**out = *in

 	} else {

 		out.UpdatePercent = nil

@@ -16,7 +16,7 @@ const (

 	DockerImageReference = "registry:5000/openshift/test-image-stream@sha256:00000000000000000000000000000001"

 )

-func OkDeploymentConfig(version int) *deployapi.DeploymentConfig {

+func OkDeploymentConfig(version int64) *deployapi.DeploymentConfig {

 	return &deployapi.DeploymentConfig{

 		ObjectMeta: kapi.ObjectMeta{

 			Name: "config",

@@ -39,7 +39,7 @@ func OkDeploymentConfigSpec() deployapi.DeploymentConfigSpec {

 	}

 }

-func OkDeploymentConfigStatus(version int) deployapi.DeploymentConfigStatus {

+func OkDeploymentConfigStatus(version int64) deployapi.DeploymentConfigStatus {

 	return deployapi.DeploymentConfigStatus{

 		LatestVersion: version,

 	}

@@ -65,7 +65,7 @@ func Test_convert_v1_RollingDeploymentStrategyParams_To_api_RollingDeploymentStr

 				UpdatePeriodSeconds: newInt64(5),

 				IntervalSeconds:     newInt64(6),

 				TimeoutSeconds:      newInt64(7),

-				UpdatePercent:       newInt(-25),

+				UpdatePercent:       newInt32(-25),

 				Pre: &LifecycleHook{

 					FailurePolicy: LifecycleHookFailurePolicyIgnore,

 				},

@@ -77,7 +77,7 @@ func Test_convert_v1_RollingDeploymentStrategyParams_To_api_RollingDeploymentStr

 				UpdatePeriodSeconds: newInt64(5),

 				IntervalSeconds:     newInt64(6),

 				TimeoutSeconds:      newInt64(7),

-				UpdatePercent:       newInt(-25),

+				UpdatePercent:       newInt32(-25),

 				MaxSurge:            intstr.FromInt(0),

 				MaxUnavailable:      intstr.FromString("25%"),

 				Pre: &newer.LifecycleHook{

@@ -93,13 +93,13 @@ func Test_convert_v1_RollingDeploymentStrategyParams_To_api_RollingDeploymentStr

 				UpdatePeriodSeconds: newInt64(5),

 				IntervalSeconds:     newInt64(6),

 				TimeoutSeconds:      newInt64(7),

-				UpdatePercent:       newInt(25),

+				UpdatePercent:       newInt32(25),

 			},

 			out: &newer.RollingDeploymentStrategyParams{

 				UpdatePeriodSeconds: newInt64(5),

 				IntervalSeconds:     newInt64(6),

 				TimeoutSeconds:      newInt64(7),

-				UpdatePercent:       newInt(25),

+				UpdatePercent:       newInt32(25),

 				MaxSurge:            intstr.FromString("25%"),

 				MaxUnavailable:      intstr.FromInt(0),

 			},

@@ -143,7 +143,7 @@ func Test_convert_api_RollingDeploymentStrategyParams_To_v1_RollingDeploymentStr

 				UpdatePeriodSeconds: newInt64(5),

 				IntervalSeconds:     newInt64(6),

 				TimeoutSeconds:      newInt64(7),

-				UpdatePercent:       newInt(-25),

+				UpdatePercent:       newInt32(-25),

 				MaxSurge:            intstr.FromInt(0),

 				MaxUnavailable:      intstr.FromString("25%"),

 			},

@@ -151,7 +151,7 @@ func Test_convert_api_RollingDeploymentStrategyParams_To_v1_RollingDeploymentStr

 				UpdatePeriodSeconds: newInt64(5),

 				IntervalSeconds:     newInt64(6),

 				TimeoutSeconds:      newInt64(7),

-				UpdatePercent:       newInt(-25),

+				UpdatePercent:       newInt32(-25),

 				MaxSurge:            newIntOrString(intstr.FromInt(0)),

 				MaxUnavailable:      newIntOrString(intstr.FromString("25%")),

 			},

@@ -161,7 +161,7 @@ func Test_convert_api_RollingDeploymentStrategyParams_To_v1_RollingDeploymentStr

 				UpdatePeriodSeconds: newInt64(5),

 				IntervalSeconds:     newInt64(6),

 				TimeoutSeconds:      newInt64(7),

-				UpdatePercent:       newInt(25),

+				UpdatePercent:       newInt32(25),

 				MaxSurge:            intstr.FromString("25%"),

 				MaxUnavailable:      intstr.FromInt(0),

 			},

@@ -169,7 +169,7 @@ func Test_convert_api_RollingDeploymentStrategyParams_To_v1_RollingDeploymentStr

 				UpdatePeriodSeconds: newInt64(5),

 				IntervalSeconds:     newInt64(6),

 				TimeoutSeconds:      newInt64(7),

-				UpdatePercent:       newInt(25),

+				UpdatePercent:       newInt32(25),

 				MaxSurge:            newIntOrString(intstr.FromString("25%")),

 				MaxUnavailable:      newIntOrString(intstr.FromInt(0)),

 			},

@@ -207,7 +207,7 @@ func newInt64(val int64) *int64 {

 	return &val

 }

-func newInt(val int) *int {

+func newInt32(val int32) *int32 {

 	return &val

 }

@@ -486,7 +486,7 @@ func DeepCopy_v1_RollingDeploymentStrategyParams(in RollingDeploymentStrategyPar

 	}

 	if in.UpdatePercent != nil {

 		in, out := in.UpdatePercent, &out.UpdatePercent

-		*out = new(int)

+		*out = new(int32)

 		**out = *in

 	} else {

 		out.UpdatePercent = nil

@@ -163,7 +163,7 @@ func TestDefaults(t *testing.T) {

 							UpdatePeriodSeconds: newInt64(5),

 							IntervalSeconds:     newInt64(6),

 							TimeoutSeconds:      newInt64(7),

-							UpdatePercent:       newInt(50),

+							UpdatePercent:       newInt32(50),

 						},

 					},

 					Triggers: []deployv1.DeploymentTriggerPolicy{

@@ -181,7 +181,7 @@ func TestDefaults(t *testing.T) {

 							UpdatePeriodSeconds: newInt64(5),

 							IntervalSeconds:     newInt64(6),

 							TimeoutSeconds:      newInt64(7),

-							UpdatePercent:       newInt(50),

+							UpdatePercent:       newInt32(50),

 							MaxSurge:            newIntOrString(intstr.FromString("50%")),

 							MaxUnavailable:      newIntOrString(intstr.FromInt(0)),

 						},

@@ -203,7 +203,7 @@ func TestDefaults(t *testing.T) {

 							UpdatePeriodSeconds: newInt64(5),

 							IntervalSeconds:     newInt64(6),

 							TimeoutSeconds:      newInt64(7),

-							UpdatePercent:       newInt(-25),

+							UpdatePercent:       newInt32(-25),

 						},

 					},

 					Triggers: []deployv1.DeploymentTriggerPolicy{

@@ -221,7 +221,7 @@ func TestDefaults(t *testing.T) {

 							UpdatePeriodSeconds: newInt64(5),

 							IntervalSeconds:     newInt64(6),

 							TimeoutSeconds:      newInt64(7),

-							UpdatePercent:       newInt(-25),

+							UpdatePercent:       newInt32(-25),

 							MaxSurge:            newIntOrString(intstr.FromInt(0)),

 							MaxUnavailable:      newIntOrString(intstr.FromString("25%")),

 						},

@@ -276,7 +276,7 @@ func newInt64(val int64) *int64 {

 	return &val

 }

-func newInt(val int) *int {

+func newInt32(val int32) *int32 {

 	return &val

 }

@@ -64,7 +64,7 @@ func Test_convert_v1beta3_RollingDeploymentStrategyParams_To_api_RollingDeployme

 				UpdatePeriodSeconds: newInt64(5),

 				IntervalSeconds:     newInt64(6),

 				TimeoutSeconds:      newInt64(7),

-				UpdatePercent:       newInt(-25),

+				UpdatePercent:       newInt32(-25),

 				Pre: &LifecycleHook{

 					FailurePolicy: LifecycleHookFailurePolicyIgnore,

 				},

@@ -76,7 +76,7 @@ func Test_convert_v1beta3_RollingDeploymentStrategyParams_To_api_RollingDeployme

 				UpdatePeriodSeconds: newInt64(5),

 				IntervalSeconds:     newInt64(6),

 				TimeoutSeconds:      newInt64(7),

-				UpdatePercent:       newInt(-25),

+				UpdatePercent:       newInt32(-25),

 				MaxSurge:            intstr.FromInt(0),

 				MaxUnavailable:      intstr.FromString("25%"),

 				Pre: &newer.LifecycleHook{

@@ -92,13 +92,13 @@ func Test_convert_v1beta3_RollingDeploymentStrategyParams_To_api_RollingDeployme

 				UpdatePeriodSeconds: newInt64(5),

 				IntervalSeconds:     newInt64(6),

 				TimeoutSeconds:      newInt64(7),

-				UpdatePercent:       newInt(25),

+				UpdatePercent:       newInt32(25),

 			},

 			out: &newer.RollingDeploymentStrategyParams{

 				UpdatePeriodSeconds: newInt64(5),

 				IntervalSeconds:     newInt64(6),

 				TimeoutSeconds:      newInt64(7),

-				UpdatePercent:       newInt(25),

+				UpdatePercent:       newInt32(25),

 				MaxSurge:            intstr.FromString("25%"),

 				MaxUnavailable:      intstr.FromInt(0),

 			},

@@ -142,7 +142,7 @@ func Test_convert_api_RollingDeploymentStrategyParams_To_v1beta3_RollingDeployme

 				UpdatePeriodSeconds: newInt64(5),

 				IntervalSeconds:     newInt64(6),

 				TimeoutSeconds:      newInt64(7),

-				UpdatePercent:       newInt(-25),

+				UpdatePercent:       newInt32(-25),

 				MaxSurge:            intstr.FromInt(0),

 				MaxUnavailable:      intstr.FromString("25%"),

 			},

@@ -150,7 +150,7 @@ func Test_convert_api_RollingDeploymentStrategyParams_To_v1beta3_RollingDeployme

 				UpdatePeriodSeconds: newInt64(5),

 				IntervalSeconds:     newInt64(6),

 				TimeoutSeconds:      newInt64(7),

-				UpdatePercent:       newInt(-25),

+				UpdatePercent:       newInt32(-25),

 				MaxSurge:            newIntOrString(intstr.FromInt(0)),

 				MaxUnavailable:      newIntOrString(intstr.FromString("25%")),

 			},

@@ -160,7 +160,7 @@ func Test_convert_api_RollingDeploymentStrategyParams_To_v1beta3_RollingDeployme

 				UpdatePeriodSeconds: newInt64(5),

 				IntervalSeconds:     newInt64(6),

 				TimeoutSeconds:      newInt64(7),

-				UpdatePercent:       newInt(25),

+				UpdatePercent:       newInt32(25),

 				MaxSurge:            intstr.FromString("25%"),

 				MaxUnavailable:      intstr.FromInt(0),

 			},

@@ -168,7 +168,7 @@ func Test_convert_api_RollingDeploymentStrategyParams_To_v1beta3_RollingDeployme

 				UpdatePeriodSeconds: newInt64(5),

 				IntervalSeconds:     newInt64(6),

 				TimeoutSeconds:      newInt64(7),

-				UpdatePercent:       newInt(25),

+				UpdatePercent:       newInt32(25),

 				MaxSurge:            newIntOrString(intstr.FromString("25%")),

 				MaxUnavailable:      newIntOrString(intstr.FromInt(0)),

 			},

@@ -206,7 +206,7 @@ func newInt64(val int64) *int64 {

 	return &val

 }

-func newInt(val int) *int {

+func newInt32(val int32) *int32 {

 	return &val

 }

@@ -96,7 +96,7 @@ func TestDefaults(t *testing.T) {

 							UpdatePeriodSeconds: newInt64(5),

 							IntervalSeconds:     newInt64(6),

 							TimeoutSeconds:      newInt64(7),

-							UpdatePercent:       newInt(50),

+							UpdatePercent:       newInt32(50),

 						},

 					},

 					Triggers: []deployv1.DeploymentTriggerPolicy{

@@ -114,7 +114,7 @@ func TestDefaults(t *testing.T) {

 							UpdatePeriodSeconds: newInt64(5),

 							IntervalSeconds:     newInt64(6),

 							TimeoutSeconds:      newInt64(7),

-							UpdatePercent:       newInt(50),

+							UpdatePercent:       newInt32(50),

 							MaxSurge:            newIntOrString(intstr.FromString("50%")),

 							MaxUnavailable:      newIntOrString(intstr.FromInt(0)),

 						},

@@ -136,7 +136,7 @@ func TestDefaults(t *testing.T) {

 							UpdatePeriodSeconds: newInt64(5),

 							IntervalSeconds:     newInt64(6),

 							TimeoutSeconds:      newInt64(7),

-							UpdatePercent:       newInt(-50),

+							UpdatePercent:       newInt32(-50),

 						},

 					},

 					Triggers: []deployv1.DeploymentTriggerPolicy{

@@ -154,7 +154,7 @@ func TestDefaults(t *testing.T) {

 							UpdatePeriodSeconds: newInt64(5),

 							IntervalSeconds:     newInt64(6),

 							TimeoutSeconds:      newInt64(7),

-							UpdatePercent:       newInt(-50),

+							UpdatePercent:       newInt32(-50),

 							MaxSurge:            newIntOrString(intstr.FromInt(0)),

 							MaxUnavailable:      newIntOrString(intstr.FromString("50%")),

 						},

@@ -210,7 +210,7 @@ func newInt64(val int64) *int64 {

 	return &val

 }

-func newInt(val int) *int {

+func newInt32(val int32) *int32 {

 	return &val

 }

@@ -690,8 +690,8 @@ func TestValidateDeploymentConfigUpdate(t *testing.T) {

 	}

 	scenarios := []struct {

-		oldLatestVersion int

-		newLatestVersion int

+		oldLatestVersion int64

+		newLatestVersion int64

 	}{

 		{5, 3},

 		{5, 7},

@@ -161,7 +161,7 @@ func (c *DeployerPodController) Handle(pod *kapi.Pod) error {

 				if config.Annotations == nil {

 					config.Annotations = make(map[string]string)

 				}

-				config.Annotations[deployapi.DeploymentCancelledAnnotation] = strconv.Itoa(config.Status.LatestVersion)

+				config.Annotations[deployapi.DeploymentCancelledAnnotation] = strconv.FormatInt(config.Status.LatestVersion, 10)

 				_, err = c.client.DeploymentConfigs(config.Namespace).Update(config)

 				return err

 			})

@@ -186,8 +186,8 @@ func (c *DeploymentConfigController) reconcileDeployments(existingDeployments *k

 		// The active/latest deployment follows the config unless this is its first

 		// sync or if an external change to the deployment replicas is detected.

 		lastActiveReplicas, hasLastActiveReplicas := deployutil.DeploymentReplicas(activeDeployment)

-		if !hasLastActiveReplicas || lastActiveReplicas != int(activeDeployment.Spec.Replicas) {

-			activeReplicas = int(activeDeployment.Spec.Replicas)

+		if !hasLastActiveReplicas || lastActiveReplicas != activeDeployment.Spec.Replicas {

+			activeReplicas = activeDeployment.Spec.Replicas

 			source = fmt.Sprintf("the latest/active deployment %q which was scaled directly or has not previously been synced", deployutil.LabelForDeployment(activeDeployment))

 		}

 	case activeDeploymentExists && !activeDeploymentIsLatest:

@@ -203,7 +203,7 @@ func (c *DeploymentConfigController) reconcileDeployments(existingDeployments *k

 			activeReplicas = latestDesiredReplicas

 			source = fmt.Sprintf("the desired replicas of latest deployment %q which has not been previously synced", deployutil.LabelForDeployment(latestDeployment))

 		} else if activeDeployment.Spec.Replicas > 0 {

-			activeReplicas = int(activeDeployment.Spec.Replicas)

+			activeReplicas = activeDeployment.Spec.Replicas

 			source = fmt.Sprintf("the active deployment %q which has not been previously synced", deployutil.LabelForDeployment(activeDeployment))

 		}

 	case !activeDeploymentExists && latestHasDesiredReplicas:

@@ -238,8 +238,8 @@ func (c *DeploymentConfigController) reconcileDeployments(existingDeployments *k

 	for _, deployment := range existingDeployments.Items {

 		isActiveDeployment := activeDeployment != nil && deployment.Name == activeDeployment.Name

-		oldReplicaCount := int(deployment.Spec.Replicas)

-		newReplicaCount := 0

+		oldReplicaCount := deployment.Spec.Replicas

+		newReplicaCount := int32(0)

 		if isActiveDeployment {

 			newReplicaCount = activeReplicas

 		}

@@ -250,8 +250,8 @@ func (c *DeploymentConfigController) reconcileDeployments(existingDeployments *k

 		lastReplicas, hasLastReplicas := deployutil.DeploymentReplicas(&deployment)

 		// Only update if necessary.

 		if !hasLastReplicas || newReplicaCount != oldReplicaCount || lastReplicas != newReplicaCount {

-			deployment.Spec.Replicas = int32(newReplicaCount)

-			deployment.Annotations[deployapi.DeploymentReplicasAnnotation] = strconv.Itoa(newReplicaCount)

+			deployment.Spec.Replicas = newReplicaCount

+			deployment.Annotations[deployapi.DeploymentReplicasAnnotation] = strconv.Itoa(int(newReplicaCount))

 			_, err := c.kubeClient.ReplicationControllers(deployment.Namespace).Update(&deployment)

 			if err != nil {

 				c.recorder.Eventf(config, kapi.EventTypeWarning, "DeploymentScaleFailed",

@@ -21,14 +21,14 @@ import (

 func TestHandleScenarios(t *testing.T) {

 	type deployment struct {

 		// version is the deployment version

-		version int

+		version int64

 		// replicas is the spec replicas of the deployment

-		replicas int

+		replicas int32

 		// test is whether this is a test deployment config

 		test bool

 		// replicasA is the annotated replica value for backwards compat checks

-		replicasA *int

-		desiredA  *int

+		replicasA *int32

+		desiredA  *int32

 		status    deployapi.DeploymentStatus

 		cancelled bool

 	}

@@ -45,29 +45,29 @@ func TestHandleScenarios(t *testing.T) {

 			deployment.Annotations[deployapi.DeploymentStatusReasonAnnotation] = deployapi.DeploymentCancelledNewerDeploymentExists

 		}

 		if d.replicasA != nil {

-			deployment.Annotations[deployapi.DeploymentReplicasAnnotation] = strconv.Itoa(*d.replicasA)

+			deployment.Annotations[deployapi.DeploymentReplicasAnnotation] = strconv.Itoa(int(*d.replicasA))

 		} else {

 			delete(deployment.Annotations, deployapi.DeploymentReplicasAnnotation)

 		}

 		if d.desiredA != nil {

-			deployment.Annotations[deployapi.DesiredReplicasAnnotation] = strconv.Itoa(*d.desiredA)

+			deployment.Annotations[deployapi.DesiredReplicasAnnotation] = strconv.Itoa(int(*d.desiredA))

 		} else {

 			delete(deployment.Annotations, deployapi.DesiredReplicasAnnotation)

 		}

-		deployment.Spec.Replicas = int32(d.replicas)

+		deployment.Spec.Replicas = d.replicas

 		return *deployment

 	}

 	tests := []struct {

 		name string

 		// replicas is the config replicas prior to the update

-		replicas int

+		replicas int32

 		// test is whether this is a test deployment config

 		test bool

 		// newVersion is the version of the config at the time of the update

-		newVersion int

+		newVersion int64

 		// expectedReplicas is the expected config replica count after the update

-		expectedReplicas int

+		expectedReplicas int32

 		// before is the state of all deployments prior to the update

 		before []deployment

 		// after is the expected state of all deployments after the update

@@ -91,7 +91,7 @@ func TestHandleScenarios(t *testing.T) {

 			expectedReplicas: 1,

 			before:           []deployment{},

 			after: []deployment{

-				{version: 1, replicas: 0, replicasA: newint(0), desiredA: newint(1), status: deployapi.DeploymentStatusNew, cancelled: false},

+				{version: 1, replicas: 0, replicasA: newInt32(0), desiredA: newInt32(1), status: deployapi.DeploymentStatusNew, cancelled: false},

 			},

 			errExpected: false,

 		},

@@ -101,10 +101,10 @@ func TestHandleScenarios(t *testing.T) {

 			newVersion:       1,

 			expectedReplicas: 1,

 			before: []deployment{

-				{version: 1, replicas: 1, replicasA: newint(0), desiredA: newint(1), status: deployapi.DeploymentStatusNew, cancelled: false},

+				{version: 1, replicas: 1, replicasA: newInt32(0), desiredA: newInt32(1), status: deployapi.DeploymentStatusNew, cancelled: false},

 			},

 			after: []deployment{

-				{version: 1, replicas: 1, replicasA: newint(0), desiredA: newint(1), status: deployapi.DeploymentStatusNew, cancelled: false},

+				{version: 1, replicas: 1, replicasA: newInt32(0), desiredA: newInt32(1), status: deployapi.DeploymentStatusNew, cancelled: false},

 			},

 			errExpected: false,

 		},

@@ -114,11 +114,11 @@ func TestHandleScenarios(t *testing.T) {

 			newVersion:       2,

 			expectedReplicas: 1,

 			before: []deployment{

-				{version: 1, replicas: 1, replicasA: newint(1), status: deployapi.DeploymentStatusComplete, cancelled: false},

+				{version: 1, replicas: 1, replicasA: newInt32(1), status: deployapi.DeploymentStatusComplete, cancelled: false},

 			},

 			after: []deployment{

-				{version: 1, replicas: 1, replicasA: newint(1), status: deployapi.DeploymentStatusComplete, cancelled: false},

-				{version: 2, replicas: 0, replicasA: newint(0), desiredA: newint(1), status: deployapi.DeploymentStatusNew, cancelled: false},