[MM-49782] Allow configurable deployment revision history limit (#335)

* Added deploymenttemplate spec * manifests * check deployment as well * Documentation typos Co-authored-by: Mir Shahriar Sabuj <mir.shahriar@mattermost.com> * regenerate openapi manifest * update manifests --------- Co-authored-by: Mir Shahriar Sabuj <mir.shahriar@mattermost.com>
mattermost · Feb 1, 2023 · 262f04a · 262f04a
1 parent fc440cf
commit 262f04a
Show file tree

Hide file tree

Showing 5 changed files with 60 additions and 2 deletions.
diff --git a/apis/mattermost/v1beta1/mattermost_types.go b/apis/mattermost/v1beta1/mattermost_types.go
@@ -120,6 +120,10 @@ type MattermostSpec struct {
 	// +optional
 	PodTemplate *PodTemplate `json:"podTemplate,omitempty"`
 
+	// DeploymentTemplate defines configuration for the template for Mattermost deployment.
+	// +optional
+	DeploymentTemplate *DeploymentTemplate `json:"deploymentTemplate,omitempty"`
+
 	// UpdateJob defines configuration for the template for the update job.
 	// +optional
 	UpdateJob *UpdateJob `json:"updateJob,omitempty"`
@@ -259,6 +263,13 @@ type PodTemplate struct {
 	ExtraLabels map[string]string `json:"extraLabels,omitempty"`
 }
 
+// DeploymentTemplate defines configuration for the template for Mattermost deployment.
+type DeploymentTemplate struct {
+	// Defines the revision history limit for the mattermost deployment.
+	// +optional
+	RevisionHistoryLimit *int32 `json:"revisionHistoryLimit,omitempty"`
+}
+
 // UpdateJob defines configuration for the template for the update job pod.
 type UpdateJob struct {
 	// Determines whether to disable the Operator's creation of the update job.

diff --git a/apis/mattermost/v1beta1/zz_generated.deepcopy.go b/apis/mattermost/v1beta1/zz_generated.deepcopy.go
diff --git a/apis/mattermost/v1beta1/zz_generated.openapi.go b/apis/mattermost/v1beta1/zz_generated.openapi.go
diff --git a/config/crd/bases/installation.mattermost.com_mattermosts.yaml b/config/crd/bases/installation.mattermost.com_mattermosts.yaml
@@ -183,6 +183,16 @@ spec:
                         type: string
                     type: object
                 type: object
+              deploymentTemplate:
+                description: DeploymentTemplate defines configuration for the template
+                  for Mattermost deployment.
+                properties:
+                  revisionHistoryLimit:
+                    description: Defines the revision history limit for the mattermost
+                      deployment.
+                    format: int32
+                    type: integer
+                type: object
               dnsConfig:
                 description: Custom DNS configuration to use for the Mattermost Installation
                   pods.

diff --git a/pkg/mattermost/mattermost_v1beta.go b/pkg/mattermost/mattermost_v1beta.go
@@ -347,6 +347,12 @@ func GenerateDeploymentV1Beta(mattermost *mmv1beta.Mattermost, db DatabaseConfig
 		podSecurityContext = mattermost.Spec.PodTemplate.SecurityContext
 	}
 
+	// Deployment template
+	revisionHistoryLimit := pkgUtils.NewInt32(defaultRevHistoryLimit)
+	if mattermost.Spec.DeploymentTemplate != nil && mattermost.Spec.DeploymentTemplate.RevisionHistoryLimit != nil {
+		revisionHistoryLimit = mattermost.Spec.DeploymentTemplate.RevisionHistoryLimit
+	}
+
 	return &appsv1.Deployment{
 		ObjectMeta: metav1.ObjectMeta{
 			Name:            deploymentName,
@@ -362,7 +368,7 @@ func GenerateDeploymentV1Beta(mattermost *mmv1beta.Mattermost, db DatabaseConfig
 					MaxSurge:       &maxSurge,
 				},
 			},
-			RevisionHistoryLimit: pkgUtils.NewInt32(defaultRevHistoryLimit),
+			RevisionHistoryLimit: revisionHistoryLimit,
 			Replicas:             mattermost.Spec.Replicas,
 			Selector: &metav1.LabelSelector{
 				MatchLabels: mmv1beta.MattermostSelectorLabels(deploymentName),