Skip to content

fix(adminqos): update validation minimum to -1 for grace periods #160

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

Open
luomingmeng wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(adminqos): update validation minimum to -1 for grace periods #160

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 12 additions & 7 deletions config/crd/bases/config.katalyst.kubewharf.io_adminqosconfigurations.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ spec:
description: GracePeriod is the grace period of cpu pressure
eviction
format: int64
minimum: 0
minimum: -1
type: integer
loadEvictionCoolDownTime:
description: |-
Expand Down Expand Up @@ -257,7 +257,7 @@ spec:
GracePeriod is the grace period (in seconds) after a pod starts before it can be considered for eviction
due to NUMA CPU pressure. 0 means no grace period.
format: int64
minimum: 0
minimum: -1
type: integer
metricRingSize:
description: MetricRingSize is the size of the metric
Expand Down Expand Up @@ -310,7 +310,10 @@ spec:
type: string
type: array
gracePeriod:
description: GracePeriod is the grace period of cpu system
pressure eviction
format: int64
minimum: -1
type: integer
loadLowerBoundRatio:
description: |-
Expand Down Expand Up @@ -388,7 +391,7 @@ spec:
description: GracePeriod is the grace period of memory
pressure eviction
format: int64
minimum: 0
minimum: -1
type: integer
numaEvictionRankingMetrics:
description: |-
Expand Down Expand Up @@ -420,7 +423,7 @@ spec:
description: ReclaimedGracePeriod is the grace period
of memory pressure reclaimed eviction
format: int64
minimum: 0
minimum: -1
type: integer
rssOveruseRateThreshold:
description: RSSOveruseRateThreshold is the threshold
Expand Down Expand Up @@ -477,7 +480,7 @@ spec:
description: GracePeriod is the grace period of nic health
eviction
format: int64
minimum: 0
minimum: -1
type: integer
nicUnhealthyToleranceDuration:
description: |-
Expand All @@ -499,13 +502,13 @@ spec:
description: GracePeriod is the grace period of reclaimed
resources' eviction
format: int64
minimum: 0
minimum: -1
type: integer
thresholdMetToleranceDuration:
description: ThresholdMetToleranceDuration is the tolerance
duration before eviction.
format: int64
minimum: 0
minimum: -1
type: integer
type: object
rootfsPressureEvictionConfig:
Expand All @@ -523,6 +526,7 @@ spec:
gracePeriod:
description: GracePeriod is the grace period of pod deletion
format: int64
minimum: -1
type: integer
minimumImageFsDiskCapacityThreshold:
anyOf:
Expand Down Expand Up @@ -609,6 +613,7 @@ spec:
gracePeriod:
description: GracePeriod is the grace period of pod deletion
format: int64
minimum: -1
type: integer
hardThreshold:
description: |-
Expand Down
18 changes: 11 additions & 7 deletions pkg/apis/config/v1alpha1/adminqos.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -380,12 +380,12 @@ type ReclaimedResourcesEvictionConfig struct {
EvictionThreshold map[v1.ResourceName]float64 `json:"evictionThreshold"`

// GracePeriod is the grace period of reclaimed resources' eviction
// +kubebuilder:validation:Minimum=0
// +kubebuilder:validation:Minimum=-1
// +optional
GracePeriod *int64 `json:"gracePeriod,omitempty"`

// ThresholdMetToleranceDuration is the tolerance duration before eviction.
// +kubebuilder:validation:Minimum=0
// +kubebuilder:validation:Minimum=-1
// +optional
ThresholdMetToleranceDuration *int64 `json:"thresholdMetToleranceDuration,omitempty"`
}
Expand Down Expand Up @@ -449,7 +449,7 @@ type CPUPressureEvictionConfig struct {
MinSuppressionToleranceDuration *metav1.Duration `json:"minSuppressionToleranceDuration,omitempty"`

// GracePeriod is the grace period of cpu pressure eviction
// +kubebuilder:validation:Minimum=0
// +kubebuilder:validation:Minimum=-1
// +optional
GracePeriod *int64 `json:"gracePeriod,omitempty"`

Expand Down Expand Up @@ -477,7 +477,7 @@ type NumaCPUPressureEvictionConfig struct {

// GracePeriod is the grace period (in seconds) after a pod starts before it can be considered for eviction
// due to NUMA CPU pressure. 0 means no grace period.
// +kubebuilder:validation:Minimum=0
// +kubebuilder:validation:Minimum=-1
// +optional
GracePeriod *int64 `json:"gracePeriod,omitempty"`

Expand Down Expand Up @@ -555,12 +555,12 @@ type MemoryPressureEvictionConfig struct {
RSSOveruseRateThreshold *float64 `json:"rssOveruseRateThreshold,omitempty"`

// GracePeriod is the grace period of memory pressure eviction
// +kubebuilder:validation:Minimum=0
// +kubebuilder:validation:Minimum=-1
// +optional
GracePeriod *int64 `json:"gracePeriod,omitempty"`

// ReclaimedGracePeriod is the grace period of memory pressure reclaimed eviction
// +kubebuilder:validation:Minimum=0
// +kubebuilder:validation:Minimum=-1
// +optional
ReclaimedGracePeriod *int64 `json:"reclaimedGracePeriod,omitempty"`
}
Expand Down Expand Up @@ -592,6 +592,7 @@ type SystemLoadPressureEvictionConfig struct {
CoolDownTime *int64 `json:"coolDownTime,omitempty"`

// GracePeriod is the grace period of pod deletion
// +kubebuilder:validation:Minimum=-1
// +optional
GracePeriod *int64 `json:"gracePeriod,omitempty"`

Expand Down Expand Up @@ -654,6 +655,7 @@ type RootfsPressureEvictionConfig struct {
MinimumImageFsDiskCapacityThreshold *resource.Quantity `json:"minimumImageFsDiskCapacityThreshold,omitempty"`

// GracePeriod is the grace period of pod deletion
// +kubebuilder:validation:Minimum=-1
// +optional
GracePeriod *int64 `json:"gracePeriod,omitempty"`

Expand Down Expand Up @@ -687,7 +689,7 @@ type NetworkEvictionConfig struct {
NICUnhealthyToleranceDuration *metav1.Duration `json:"nicUnhealthyToleranceDuration,omitempty"`

// GracePeriod is the grace period of nic health eviction
// +kubebuilder:validation:Minimum=0
// +kubebuilder:validation:Minimum=-1
// +optional
GracePeriod *int64 `json:"gracePeriod,omitempty"`
}
Expand Down Expand Up @@ -750,6 +752,8 @@ type CPUSystemPressureEvictionConfig struct {
// +optional
EvictionRankingMetrics []string `json:"evictionRankingMetrics,omitempty"`

// GracePeriod is the grace period of cpu system pressure eviction
// +kubebuilder:validation:Minimum=-1
// +optional
GracePeriod *int64 `json:"gracePeriod,omitempty"`

Expand Down