Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

AME-3041 Add support for cluster autoscaler settings #24

Merged
merged 5 commits into from
Oct 3, 2024
Merged

AME-3041 Add support for cluster autoscaler settings #24

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4f23277
AME-3041 Add support for cluster autoscaler settings
HugUlf Sep 11, 2024
c45818a
AME-3041 update MR after changes made to platform-api
HugUlf Sep 16, 2024
c3850b6
AME-3041 Turn CreateCluster and Cluster autoscaler settings into poin…
HugUlf Oct 3, 2024
7e98af7
Merge branch 'main' into AME-3041-add-support-for-cluster-autoscaling…
HugUlf Oct 3, 2024
eb62d49
AME-3041 Turn autoscaler settings into pointer on UpdateCluster
HugUlf Oct 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 27 additions & 7 deletions pkg/acloudapi/apitypes.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ type Cluster struct {
ObservabilityTenant *ObservabilityTenant `json:"observabilityTenant,omitempty" yaml:"ObservabilityTenant,omitempty"`
EnvironmentPrometheusRules bool `json:"environmentPrometheusRules" yaml:"EnvironmentPrometheusRules"`
MaintenanceSchedule *MaintenanceSchedule `json:"maintenanceSchedule,omitempty" yaml:"MaintenanceSchedule,omitempty"`
AutoScalerSettings *AutoscalingSettings `json:"clusterAutoscalerSettings,omitempty" yaml:"ClusterAutoScalerSettings,omitempty"`
}

type MaintenanceSchedule struct {
Expand Down Expand Up @@ -153,7 +154,8 @@ type CreateCluster struct {
IPWhitelist []IPWhitelistEntry `json:"ipWhitelist,omitempty" yaml:"IpWhitelist,omitempty"`
Addons map[string]APIAddon `json:"addons,omitempty" yaml:"Addons,omitempty"`

MaintenanceScheduleIdentity string `json:"maintenanceScheduleIdentity,omitempty" yaml:"MaintenanceScheduleIdentity,omitempty"`
AutoScalerSettings *AutoscalingSettings `json:"clusterAutoscalerSettings,omitempty" yaml:"ClusterAutoScalerSettings,omitempty"`
MaintenanceScheduleIdentity string `json:"maintenanceScheduleIdentity,omitempty" yaml:"MaintenanceScheduleIdentity,omitempty"`
}

// IPWhitelistEntry represents an entry in the IP whitelist.
Expand All @@ -173,12 +175,13 @@ type UpdateCluster struct {
EnableAutoUpgrade *bool `json:"enableAutoUpgrade,omitempty" yaml:"EnableAutoUpgrade,omitempty"`
EnableHighAvailability *bool `json:"enableHighAvailability,omitempty" yaml:"EnableHighAvailability,omitempty"`
// Deprecated: replaced by PodSecurityStandardsProfile which offers support for selecting a specific default PSS profile. This setting does not do anything since Kubernetes v1.23
EnablePodSecurityStandards *bool `json:"enablePodSecurityStandards,omitempty" yaml:"EnablePodSecurityStandards,omitempty"`
PodSecurityStandardsProfile *string `json:"podSecurityStandardsProfile,omitempty" yaml:"PodSecurityStandardsProfile,omitempty"`
DeleteProtection *bool `json:"deleteProtection,omitempty" yaml:"DeleteProtection,omitempty"`
IPWhitelist []string `json:"ipWhitelist,omitempty" yaml:"IpWhitelist,omitempty"`
Addons map[string]APIAddon `json:"addons,omitempty" yaml:"Addons,omitempty"`
MaintenanceScheduleIdentity *string `json:"maintenanceScheduleIdentity,omitempty" yaml:"MaintenanceScheduleIdentity,omitempty"`
EnablePodSecurityStandards *bool `json:"enablePodSecurityStandards,omitempty" yaml:"EnablePodSecurityStandards,omitempty"`
PodSecurityStandardsProfile *string `json:"podSecurityStandardsProfile,omitempty" yaml:"PodSecurityStandardsProfile,omitempty"`
DeleteProtection *bool `json:"deleteProtection,omitempty" yaml:"DeleteProtection,omitempty"`
IPWhitelist []string `json:"ipWhitelist,omitempty" yaml:"IpWhitelist,omitempty"`
Addons map[string]APIAddon `json:"addons,omitempty" yaml:"Addons,omitempty"`
AutoScalerSettings *AutoscalingSettings `json:"clusterAutoscalerSettings,omitempty" yaml:"ClusterAutoScalerSettings,omitempty"`
MaintenanceScheduleIdentity *string `json:"maintenanceScheduleIdentity,omitempty" yaml:"MaintenanceScheduleIdentity,omitempty"`
}

// NodePools is used by CreateCluster
Expand Down Expand Up @@ -451,3 +454,20 @@ type ListScheduledClusterUpgradesOpts struct {
ClusterIdentities []string
Statuses []ScheduledClusterUpgradeStatus
}

type AutoscalingSettings struct {
// ScaleDownUtilizationThreshold specifies the scale down utilization threshold
ScaleDownUtilizationThreshold string `json:"scale-down-utilization-threshold"`
// ScaleDownGpuUtilizationThreshold specifies the scale down GPU utilization threshold
ScaleDownGpuUtilizationThreshold string `json:"scale-down-gpu-utilization-threshold"`
// ScaleDownDelayAfterAdd specifies the scale down delay after add
ScaleDownDelayAfterAdd string `json:"scale-down-delay-after-add"`
// ScaleDownUnneededTime specifies the scale down unneeded time
ScaleDownUnneededTime string `json:"scale-down-unneeded-time"`
// ScaleDownUnreadyTime specifies the scale down unready time
ScaleDownUnreadyTime string `json:"scale-down-unready-time"`
// MaxNodeProvisionTime specifies the max node provision time
MaxNodeProvisionTime string `json:"max-node-provision-time"`
// UnremovableNodeRecheckTimeout specifies the unremovable node recheck timeout
UnremovableNodeRecheckTimeout string `json:"unremovable-node-recheck-timeout"`
}
Loading