provide rotatorconfig when resizing

mattermost · Oct 24, 2022 · 574b8d0 · 574b8d0
1 parent e96aeb8
commit 574b8d0
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 3 deletions.
diff --git a/internal/provisioner/kops_provisioner_cluster.go b/internal/provisioner/kops_provisioner_cluster.go
@@ -525,6 +525,16 @@ func (provisioner *KopsProvisioner) ResizeCluster(cluster *model.Cluster, awsCli
 		return err
 	}
 
+	if cluster.ProvisionerMetadataKops.RotatorRequest.Config != nil {
+		if *cluster.ProvisionerMetadataKops.RotatorRequest.Config.UseRotator {
+			logger.Info("Using node rotator for node resize")
+			err = provisioner.RotateClusterNodes(cluster)
+			if err != nil {
+				return err
+			}
+		}
+	}
+
 	err = kops.RollingUpdateCluster(kopsMetadata.Name)
 	if err != nil {
 		return err

diff --git a/model/cluster_request.go b/model/cluster_request.go
@@ -293,9 +293,10 @@ func NewUpgradeClusterRequestFromReader(reader io.Reader) (*PatchUpgradeClusterR
 
 // PatchClusterSizeRequest specifies the parameters for resizing a cluster.
 type PatchClusterSizeRequest struct {
-	NodeInstanceType *string `json:"node-instance-type,omitempty"`
-	NodeMinCount     *int64  `json:"node-min-count,omitempty"`
-	NodeMaxCount     *int64  `json:"node-max-count,omitempty"`
+	NodeInstanceType *string        `json:"node-instance-type,omitempty"`
+	NodeMinCount     *int64         `json:"node-min-count,omitempty"`
+	NodeMaxCount     *int64         `json:"node-max-count,omitempty"`
+	RotatorConfig    *RotatorConfig `json:"rotatorConfig,omitempty"`
 }
 
 // Validate validates the values of a PatchClusterSizeRequest.
@@ -311,6 +312,12 @@ func (p *PatchClusterSizeRequest) Validate() error {
 		return errors.Errorf("node max count (%d) can't be less than min count (%d)", *p.NodeMaxCount, *p.NodeMinCount)
 	}
 
+	if p.RotatorConfig != nil {
+		if err := p.RotatorConfig.Validate(); err != nil {
+			return err
+		}
+	}
+
 	return nil
 }
 
@@ -332,8 +339,13 @@ func (p *PatchClusterSizeRequest) Apply(metadata *KopsMetadata) bool {
 		changes.NodeMaxCount = *p.NodeMaxCount
 	}
 
+	if metadata.RotatorRequest == nil {
+		metadata.RotatorRequest = &RotatorMetadata{}
+	}
+
 	if applied {
 		metadata.ChangeRequest = changes
+		metadata.RotatorRequest.Config = p.RotatorConfig
 	}
 
 	return applied