Merge pull request #9876 from kargakis/rhl-to-int32

Merged by openshift-bot

Author: OpenShift Bot

pkg/deploy/api/deep_copy_generated.go

@@ -172,7 +172,7 @@ func DeepCopy_api_DeploymentConfigSpec(in DeploymentConfigSpec, out *DeploymentC
 	out.Replicas = in.Replicas
 	if in.RevisionHistoryLimit != nil {
 		in, out := in.RevisionHistoryLimit, &out.RevisionHistoryLimit
-		*out = new(int)
+		*out = new(int32)
 		**out = *in
 	} else {
 		out.RevisionHistoryLimit = nil

pkg/deploy/api/types.go

@@ -307,7 +307,7 @@ type DeploymentConfigSpec struct {
 
 	// RevisionHistoryLimit is the number of old ReplicationControllers to retain to allow for rollbacks.
 	// This field is a pointer to allow for differentiation between an explicit zero and not specified.
-	RevisionHistoryLimit *int
+	RevisionHistoryLimit *int32
 
 	// Test ensures that this deployment config will have zero replicas except while a deployment is running. This allows the
 	// deployment config to be used as a continuous deployment test - triggering on images, running the deployment, and then succeeding

pkg/deploy/api/v1/deep_copy_generated.go

@@ -171,7 +171,7 @@ func DeepCopy_v1_DeploymentConfigSpec(in DeploymentConfigSpec, out *DeploymentCo
 	out.Replicas = in.Replicas
 	if in.RevisionHistoryLimit != nil {
 		in, out := in.RevisionHistoryLimit, &out.RevisionHistoryLimit
-		*out = new(int)
+		*out = new(int32)
 		**out = *in
 	} else {
 		out.RevisionHistoryLimit = nil

pkg/deploy/api/v1/types.go

@@ -267,7 +267,7 @@ type DeploymentConfigSpec struct {
 
 	// RevisionHistoryLimit is the number of old ReplicationControllers to retain to allow for rollbacks.
 	// This field is a pointer to allow for differentiation between an explicit zero and not specified.
-	RevisionHistoryLimit *int `json:"revisionHistoryLimit,omitempty"`
+	RevisionHistoryLimit *int32 `json:"revisionHistoryLimit,omitempty"`
 
 	// Test ensures that this deployment config will have zero replicas except while a deployment is running. This allows the
 	// deployment config to be used as a continuous deployment test - triggering on images, running the deployment, and then succeeding

pkg/deploy/controller/deploymentconfig/controller.go

@@ -415,13 +415,13 @@ func (c *DeploymentConfigController) cleanupOldDeployments(existingDeployments [
 	}
 
 	prunableDeployments := deployutil.DeploymentsForCleanup(deploymentConfig, existingDeployments)
-	if len(prunableDeployments) <= *deploymentConfig.Spec.RevisionHistoryLimit {
+	if len(prunableDeployments) <= int(*deploymentConfig.Spec.RevisionHistoryLimit) {
 		// the past deployment quota has not been exceeded
 		return nil
 	}
 
 	deletionErrors := []error{}
-	for i := 0; i < (len(prunableDeployments) - *deploymentConfig.Spec.RevisionHistoryLimit); i++ {
+	for i := 0; i < (len(prunableDeployments) - int(*deploymentConfig.Spec.RevisionHistoryLimit)); i++ {
 		deployment := prunableDeployments[i]
 		if deployment.Spec.Replicas != 0 {
 			// we do not want to clobber active older deployments, but we *do* want them to count

test/extended/deployments/deployments.go

@@ -536,7 +536,7 @@ var _ = g.Describe("deploymentconfigs", func() {
 			deploymentConfig, deployments, _, err := deploymentInfo(oc, "history-limit")
 			o.Expect(err).NotTo(o.HaveOccurred())
 			// sanity check to ensure that the following asertion on the amount of old deployments is valid
-			o.Expect(*deploymentConfig.Spec.RevisionHistoryLimit).To(o.Equal(revisionHistoryLimit))
+			o.Expect(*deploymentConfig.Spec.RevisionHistoryLimit).To(o.Equal(int32(revisionHistoryLimit)))
 
 			// we need to filter out any deployments that we don't care about,
 			// namely the active deployment and any newer deployments