Skip to content

Commit

Permalink
Merge pull request kubewharf#3 from caohe/update-kcnr-definition
Browse files Browse the repository at this point in the history 
feat(katalyst): update crd definitions for v0.3.0
  • Loading branch information
@waynepeking348
waynepeking348 authored Aug 9, 2023
2 parents 5412b78 + 12a16fe commit d8dd2ea
Show file tree
Hide file tree
Showing 4 changed files with 306 additions and 226 deletions.
248 changes: 242 additions & 6 deletions charts/katalyst/crds/config.katalyst.kubewharf.io_adminqosconfigurations.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,9 @@ spec:
- jsonPath: .spec.nodeLabelSelector
name: SELECTOR
type: string
- jsonPath: .spec.priority
name: PRIORITY
type: string
- jsonPath: .spec.ephemeralSelector.nodeNames
name: NODES
type: string
Expand Down Expand Up @@ -63,17 +66,242 @@ spec:
config:
description: Config is custom field for admin qos configuration
properties:
evictionConfig:
description: EvictionConfig is a configuration for eviction
properties:
cpuPressureEvictionConfig:
description: CPUPressureEvictionConfig is the config for cpu
pressure eviction
properties:
enableLoadEviction:
description: EnableLoadEviction is whether to enable cpu
load eviction
type: boolean
enableSuppressionEviction:
description: EnableSuppressionEviction is whether to enable
pod-level cpu suppression eviction
type: boolean
gracePeriod:
description: GracePeriod is the grace period of cpu pressure
eviction
format: int64
type: integer
loadEvictionCoolDownTime:
description: LoadEvictionCoolDownTime is the cool-down
time of cpu load eviction, if the cpu load eviction
is triggered, the cpu load eviction will be disabled
for the cool-down time
type: string
loadMetricRingSize:
description: LoadMetricRingSize is the size of the load
metric ring, which is used to calculate the load of
the target cpuset pool
minimum: 1
type: integer
loadThresholdMetPercentage:
description: LoadThresholdMetPercentage is the percentage
of the number of times the load over the upper bound
to the total number of times the load is measured, if
the percentage is greater than the load threshold met
percentage, the eviction or node tainted will be triggered
type: number
loadUpperBoundRatio:
description: LoadUpperBoundRatio is the upper bound ratio
of cpuset pool load, if the load of the target cpuset
pool is greater than the load upper bound repeatedly,
the eviction will be triggered
type: number
maxSuppressionToleranceRate:
description: MaxSuppressionToleranceRate is the maximum
cpu suppression tolerance rate that can be set by the
pod, if the cpu suppression tolerance rate of the pod
is greater than the maximum cpu suppression tolerance
rate, the cpu suppression tolerance rate of the pod
will be set to the maximum cpu suppression tolerance
rate
type: number
minSuppressionToleranceDuration:
description: MinSuppressionToleranceDuration is the minimum
duration a pod can tolerate cpu suppression, only if
the cpu suppression duration of the pod is greater than
the minimum cpu suppression duration, the eviction will
be triggered
type: string
type: object
dryRun:
description: DryRun is the list of eviction plugins to dryRun
'*' means "all dry-run by default" 'foo' means "dry-run
'foo'" first item for a particular name wins
items:
type: string
type: array
memoryPressureEvictionConfig:
description: MemoryPressureEvictionConfig is the config for
memory pressure eviction
properties:
enableNumaLevelEviction:
description: EnableNumaLevelEviction is whether to enable
numa-level eviction
type: boolean
enableRSSOveruseEviction:
description: EnableRSSOveruseEviction is whether to enable
pod-level rss overuse eviction
type: boolean
enableSystemLevelEviction:
description: EnableSystemLevelEviction is whether to enable
system-level eviction
type: boolean
gracePeriod:
description: GracePeriod is the grace period of memory
pressure eviction
format: int64
type: integer
numaEvictionRankingMetrics:
description: NumaEvictionRankingMetrics is the metrics
used to rank pods for eviction at the NUMA level
items:
description: NumaEvictionRankingMetric is the metrics
used to rank pods for eviction at the NUMA level
enum:
- qos.pod
- priority.pod
- mem.total.numa.container
type: string
minItems: 1
type: array
numaFreeBelowWatermarkTimesThreshold:
description: NumaFreeBelowWatermarkTimesThreshold is the
threshold for the number of times NUMA's free memory
falls below the watermark
type: integer
rssOveruseRateThreshold:
description: RSSOveruseRateThreshold is the threshold
for the rate of rss
type: number
systemEvictionRankingMetrics:
description: SystemEvictionRankingMetrics is the metrics
used to rank pods for eviction at the system level
items:
description: SystemEvictionRankingMetric is the metrics
used to rank pods for eviction at the system level
enum:
- qos.pod
- priority.pod
- mem.usage.container
type: string
minItems: 1
type: array
systemKswapdRateExceedDurationThreshold:
description: SystemKswapdRateExceedDurationThreshold is
the threshold for the duration the kswapd reclaiming
rate exceeds the threshold
type: integer
systemKswapdRateThreshold:
description: NumaFreeBelowWatermarkTimesThreshold is the
threshold for the rate of kswapd reclaiming rate
type: integer
type: object
reclaimedResourcesEvictionConfig:
description: ReclaimedResourcesEvictionConfig is the config
for reclaimed resources' eviction
properties:
evictionThreshold:
additionalProperties:
type: number
description: EvictionThreshold eviction threshold rate
for reclaimed resources
type: object
gracePeriod:
description: GracePeriod is the grace period of reclaimed
resources' eviction
format: int64
type: integer
type: object
type: object
reclaimedResourceConfig:
description: ReclaimedResourceConfig is a configuration for reclaim
resource
properties:
cpuHeadroomConfig:
description: CPUHeadroomConfig is a configuration for cpu
headroom
properties:
utilBasedConfig:
description: UtilBasedConfig is a config for utilization
based cpu headroom policy
properties:
enable:
description: Enable is a flag to enable utilization
based cpu headroom policy
type: boolean
maxHeadroomCapacityRate:
description: MaxHeadroomCapacityRate is the max headroom
capacity rate of cpu headroom to the total cpu capacity
of node
type: number
maxOversoldRate:
description: MaxOversoldRate is the max oversold rate
of cpu headroom to the actual size of reclaimed_cores
pool
type: number
maxReclaimedCoreUtilization:
description: MaxReclaimedCoreUtilization is the max
reclaimed core utilization of reclaimed_cores pool,
which is used to calculate the oversold cpu headroom,
if zero means no limit
type: number
targetReclaimedCoreUtilization:
description: TargetReclaimedCoreUtilization is the
target reclaimed core utilization to be used for
calculating the oversold cpu headroom
type: number
type: object
type: object
enableReclaim:
description: EnableReclaim is a flag to enable reclaim resource,
if true, reclaim resource will be enabled, which means reclaim
resource will be reported to custom node resource and support
colocation between reclaimed_cores pod and other pods, otherwise,
reclaim resource will be disabled.
type: boolean
memoryHeadroomConfig:
description: MemoryHeadroomConfig is a configuration for memory
headroom
properties:
utilBasedConfig:
description: MemoryHeadroomUtilBasedConfig is a config
for utilization based memory headroom policy
properties:
cacheBasedRatio:
description: CacheBasedRatio is the rate of cache
oversold, 0 means disable cache oversold
type: number
enable:
description: Enable is a flag to enable utilization
based memory headroom policy
type: boolean
freeBasedRatio:
description: FreeBasedRatio is the estimation of free
memory utilization, which can be used as system
buffer to oversold memory.
type: number
staticBasedCapacity:
description: StaticBasedCapacity is the static oversold
memory size by bytes
type: number
type: object
type: object
minReclaimedResourceForAllocate:
additionalProperties:
anyOf:
- type: integer
- type: string
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
x-kubernetes-int-or-string: true
description: MinReclaimedResourceForAllocate is a resource
reserved for reclaimed_cores pods，these resources will not
be used by shared_cores pods.
type: object
minReclaimedResourceForReport:
additionalProperties:
anyOf:
Expand Down Expand Up @@ -113,7 +341,7 @@ spec:
type: object
type: object
ephemeralSelector:
description: EphemeralSelector is used to indicate the
description: EphemeralSelector is a selector for temporary use only
properties:
lastDuration:
description: define the duration this configuration will last
Expand All @@ -127,12 +355,18 @@ spec:
type: array
type: object
nodeLabelSelector:
description: NodeLabelSelector select nodes to apply these configurations
if spec.labelKey no set, NodeLabelSelector must be empty, the label
selector must only include KatalystCustomConfig.spec .nodeLabelSelectorKey,
otherwise it will not be synced This field will be immutable after
it is initially set.
description: NodeLabelSelector select nodes to apply these configurations,
the priority and node label selector must be matched according to
KatalystCustomConfig.spec.nodeLabelSelectorAllowedKeyList, otherwise
it will not be synced.
type: string
priority:
description: Priority is used by one node matched by NodeLabelSelector
of more than one configuration, and the higher priority will be
considered. The priority only be supported when NodeLabelSelector
set
format: int32
type: integer
revisionHistoryLimit:
default: 3
description: RevisionHistoryLimit is the maximum number of revisions
Expand All @@ -141,6 +375,8 @@ spec:
currently applied Spec version. The default value is 3.
format: int64
type: integer
required:
- config
type: object
status:
properties:
Expand Down
Loading

0 comments on commit d8dd2ea

Please sign in to comment.