Skip to content

Commit

Permalink
feat(upgradeStrategies) AME-3240: support new upgrade strategies
Browse files Browse the repository at this point in the history
  • Loading branch information
@gerruite
gerruite committed Dec 12, 2024
1 parent b456174 commit 5fd04a3
Showing 1 changed file with 62 additions and 32 deletions.
94 changes: 62 additions & 32 deletions pkg/acloudapi/apitypes.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -186,37 +186,66 @@ type UpdateCluster struct {

// NodePools is used by CreateCluster
type NodePools struct {
Name string `json:"name" yaml:"Name"`
AutoScaling bool `json:"autoScaling" yaml:"AutoScaling"`
MinSize int `json:"minSize" yaml:"MinSize"`
MaxSize int `json:"maxSize" yaml:"MaxSize"`
NodeSize string `json:"nodeSize" yaml:"NodeSize"`
AvailabilityZone string `json:"availabilityZone,omitempty" yaml:"AvailabilityZone,omitempty"`
Name string `json:"name" yaml:"Name"`
Identity string `json:"identity" yaml:"Identity"`
AutoScaling bool `json:"autoScaling" yaml:"AutoScaling"`
MinSize int `json:"minSize" yaml:"MinSize"`
MaxSize int `json:"maxSize" yaml:"MaxSize"`
NodeSize string `json:"nodeSize" yaml:"NodeSize"`
AvailabilityZone string `json:"availabilityZone,omitempty" yaml:"AvailabilityZone,omitempty"`
UpgradeStrategy NodePoolUpgradeStrategy `json:"upgradeStrategy" yaml:"UpgradeStrategy"`
}

// NodePool represents a pool of nodes in a cluster.
type NodePool struct {
ID int `json:"id" yaml:"ID"`
Identity string `json:"identity" yaml:"Identity"`
Name string `json:"name" yaml:"Name"`
AvailabilityZone string `json:"availabilityZone" yaml:"AvailabilityZone,omitempty"`
NodeSize string `json:"nodeSize" yaml:"NodeSize"`
AutoScaling bool `json:"autoScaling" yaml:"AutoScaling"`
MinSize int `json:"minSize" yaml:"MinSize"`
MaxSize int `json:"maxSize" yaml:"MaxSize"`
NodeAutoReplacement bool `json:"enableNodeAutoReplacement" yaml:"EnableNodeAutoReplacement"`
Annotations map[string]string `json:"annotations" yaml:"Annotations"`
Labels map[string]string `json:"labels" yaml:"Labels"`
Taints []NodeTaint `json:"taints" yaml:"Taints"`
Status string `json:"status" yaml:"Status,omitempty"`
CreatedAt time.Time `json:"createdAt" yaml:"CreatedAt,omitempty"`
ModifiedAt time.Time `json:"modifiedAt" yaml:"ModifiedAt,omitempty"`
DeletedAt *time.Time `json:"deletedAt" yaml:"DeletedAt,omitempty"`
ID int `json:"id" yaml:"ID"`
Identity string `json:"identity" yaml:"Identity"`
Name string `json:"name" yaml:"Name"`
AvailabilityZone string `json:"availabilityZone" yaml:"AvailabilityZone,omitempty"`
NodeSize string `json:"nodeSize" yaml:"NodeSize"`
AutoScaling bool `json:"autoScaling" yaml:"AutoScaling"`
MinSize int `json:"minSize" yaml:"MinSize"`
MaxSize int `json:"maxSize" yaml:"MaxSize"`
NodeAutoReplacement bool `json:"enableNodeAutoReplacement" yaml:"EnableNodeAutoReplacement"`
UpgradeStrategy NodePoolUpgradeStrategy `json:"upgradeStrategy" yaml:"UpgradeStrategy"`
Annotations map[string]string `json:"annotations" yaml:"Annotations"`
Labels map[string]string `json:"labels" yaml:"Labels"`
Taints []NodeTaint `json:"taints" yaml:"Taints"`
Status string `json:"status" yaml:"Status,omitempty"`
CreatedAt time.Time `json:"createdAt" yaml:"CreatedAt,omitempty"`
ModifiedAt time.Time `json:"modifiedAt" yaml:"ModifiedAt,omitempty"`
DeletedAt *time.Time `json:"deletedAt" yaml:"DeletedAt,omitempty"`

ClusterIdentity string `json:"clusterIdentity" yaml:"ClusterIdentity,omitempty"` // adds a reference to Cluster
Cluster Cluster `json:"-" yaml:"-"` // adds a reference to Cluster for in-code
}

// NodePoolUpgradeStrategy represents the upgrade strategy for a node pool.
type NodePoolUpgradeStrategy string

const (
NodePoolUpgradeStrategyReplace NodePoolUpgradeStrategy = "REPLACE"
NodePoolUpgradeStrategyInPlace NodePoolUpgradeStrategy = "INPLACE"
NodePoolUpgradeStrategyInPlaceWithoutDrain NodePoolUpgradeStrategy = "INPLACE_WITHOUT_DRAIN"
NodePoolUpgradeStrategyReplaceMinorInPlacePatch NodePoolUpgradeStrategy = "REPLACE_MINOR_INPLACE_PATCH"
NodePoolUpgradeStrategyReplaceMinorInPlacePatchNoDrain NodePoolUpgradeStrategy = "REPLACE_MINOR_INPLACE_PATCH_WITHOUT_DRAIN"
)

var nodePoolUpgradeStrategyMap = map[string]NodePoolUpgradeStrategy{
"REPLACE": NodePoolUpgradeStrategyReplace,
"INPLACE": NodePoolUpgradeStrategyInPlace,
"INPLACE_WITHOUT_DRAIN": NodePoolUpgradeStrategyInPlaceWithoutDrain,
"REPLACE_MINOR_INPLACE_PATCH": NodePoolUpgradeStrategyReplaceMinorInPlacePatch,
"REPLACE_MINOR_INPLACE_PATCH_WITHOUT_DRAIN": NodePoolUpgradeStrategyReplaceMinorInPlacePatchNoDrain,
}

func ParseNodePoolUpgradeStrategy(s string) (NodePoolUpgradeStrategy, error) {
if strategy, exists := nodePoolUpgradeStrategyMap[s]; exists {
return strategy, nil
}
return "", fmt.Errorf("unsupported upgrade strategy: %s", s)
}

// NodeTaint represents a taint applied to a Kubernetes node.
type NodeTaint struct {
Key string `json:"key" yaml:"Key"` // Key is the key of the taint.
Expand Down Expand Up @@ -249,16 +278,17 @@ func (n NodePool) FullIdentifier() string {

// CreateNodePool represents the configuration for creating a node pool.
type CreateNodePool struct {
Name string `json:"name" yaml:"Name"`
AvailabilityZone string `json:"availabilityZone,omitempty" yaml:"AvailabilityZone,omitempty"`
NodeSize string `json:"nodeSize" yaml:"NodeSize"`
MinSize int `json:"minSize" yaml:"MinSize"`
MaxSize int `json:"maxSize" yaml:"MaxSize"`
AutoScaling bool `json:"autoScaling" yaml:"AutoScaling"`
NodeAutoReplacement bool `json:"enableNodeAutoReplacement" yaml:"EnableNodeAutoReplacement"`
Annotations map[string]string `json:"annotations" yaml:"Annotations"`
Labels map[string]string `json:"labels" yaml:"Labels"`
Taints []NodeTaint `json:"taints" yaml:"Taints"`
Name string `json:"name" yaml:"Name"`
AvailabilityZone string `json:"availabilityZone,omitempty" yaml:"AvailabilityZone,omitempty"`
NodeSize string `json:"nodeSize" yaml:"NodeSize"`
MinSize int `json:"minSize" yaml:"MinSize"`
MaxSize int `json:"maxSize" yaml:"MaxSize"`
AutoScaling bool `json:"autoScaling" yaml:"AutoScaling"`
NodeAutoReplacement bool `json:"enableNodeAutoReplacement" yaml:"EnableNodeAutoReplacement"`
UpgradeStrategy NodePoolUpgradeStrategy `json:"upgradeStrategy" yaml:"UpgradeStrategy"`
Annotations map[string]string `json:"annotations" yaml:"Annotations"`
Labels map[string]string `json:"labels" yaml:"Labels"`
Taints []NodeTaint `json:"taints" yaml:"Taints"`
}

type ClusterMetadataResponse struct {
Expand Down

0 comments on commit 5fd04a3

Please sign in to comment.