From e2fac9bdb866e75c5f5f2ce6afa40e389d8628be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gary=20Liu=20=28=E5=88=98=E5=B9=BF=E6=BA=90=29?= Date: Tue, 10 Dec 2024 18:38:48 +0800 Subject: [PATCH 01/27] chore(ci): add inlinecheck --- .github/workflows/ci.yml | 3 ++ cmd/inlinecheck/main.go | 106 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 109 insertions(+) create mode 100644 cmd/inlinecheck/main.go diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 57a83605..53a9caba 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -25,3 +25,6 @@ jobs: run: | make fmt && git add pkg && git diff --cached --exit-code || (echo 'Please run "make fmt" to verify gofmt' && exit 1); + - name: Check inline fields + run: | + go run cmd/inlinecheck/main.go diff --git a/cmd/inlinecheck/main.go b/cmd/inlinecheck/main.go new file mode 100644 index 00000000..749c45fe --- /dev/null +++ b/cmd/inlinecheck/main.go @@ -0,0 +1,106 @@ +package main + +import ( + "fmt" + "os" + "reflect" + "strings" + + autoscalingv1a1 "github.com/kubewharf/katalyst-api/pkg/apis/autoscaling/v1alpha1" + autoscalingv1a2 "github.com/kubewharf/katalyst-api/pkg/apis/autoscaling/v1alpha2" + configv1a1 "github.com/kubewharf/katalyst-api/pkg/apis/config/v1alpha1" + nodev1a1 "github.com/kubewharf/katalyst-api/pkg/apis/node/v1alpha1" + overcommitv1a1 "github.com/kubewharf/katalyst-api/pkg/apis/overcommit/v1alpha1" + recommendationv1a1 "github.com/kubewharf/katalyst-api/pkg/apis/recommendation/v1alpha1" + schedcfgv1b3 "github.com/kubewharf/katalyst-api/pkg/apis/scheduling/config/v1beta3" + tidev1a1 "github.com/kubewharf/katalyst-api/pkg/apis/tide/v1alpha1" + workloadv1a1 "github.com/kubewharf/katalyst-api/pkg/apis/workload/v1alpha1" + + "k8s.io/apimachinery/pkg/runtime" +) + +func main() { + scheme := runtime.NewScheme() + configv1a1.AddToScheme(scheme) + autoscalingv1a1.AddToScheme(scheme) + autoscalingv1a2.AddToScheme(scheme) + nodev1a1.AddToScheme(scheme) + overcommitv1a1.AddToScheme(scheme) + recommendationv1a1.AddToScheme(scheme) + schedcfgv1b3.AddToScheme(scheme) + tidev1a1.AddToScheme(scheme) + workloadv1a1.AddToScheme(scheme) + + seenTypes := make(map[reflect.Type]struct{}) + var errs []error + for _, typ := range scheme.AllKnownTypes() { + fmt.Printf("Checking %s.%s\n", typ.PkgPath(), typ.Name()) + checkType(typ, typ.Name(), seenTypes, &errs) + } + + for _, err := range errs { + fmt.Println(err) + } + + if len(errs) > 0 { + os.Exit(1) + } +} + +func parseTag(tag string) (name string) { + if idx := strings.Index(tag, ","); idx != -1 { + return tag[:idx] + } else { + return tag + } +} + +// typ must be a struct type +func checkType(typ reflect.Type, path string, seenTypes map[reflect.Type]struct{}, errs *[]error) { + if _, ok := seenTypes[typ]; ok { + return + } + + for i := 0; i < typ.NumField(); i++ { + field := typ.Field(i) + if !field.IsExported() { + continue + } + fieldTyp := field.Type + origFieldTyp := fieldTyp + + if fieldTyp.Kind() == reflect.Ptr || + fieldTyp.Kind() == reflect.Slice || + fieldTyp.Kind() == reflect.Array || + fieldTyp.Kind() == reflect.Map { + fieldTyp = fieldTyp.Elem() + } + if fieldTyp.Kind() != reflect.Struct { + continue + } + + var newPath string + switch origFieldTyp.Kind() { + case reflect.Struct, reflect.Ptr: + newPath = fmt.Sprintf("%s.%s", path, field.Name) + case reflect.Array, reflect.Slice: + newPath = fmt.Sprintf("%s.%s[0]", path, field.Name) + case reflect.Map: + newPath = fmt.Sprintf("%s.%s[*]", path, field.Name) + default: + continue + } + + tag := field.Tag.Get("json") + name := parseTag(tag) + if name == "" && !field.Anonymous { + *errs = append( + *errs, + fmt.Errorf("field %s has no json tag and is not embedded, will cause unpredictable deserialization", newPath), + ) + } + checkType(fieldTyp, newPath, seenTypes, errs) + } + + seenTypes[typ] = struct{}{} +} From 574c6b0ec2b9c3aa5e081e3fc389223514274df8 Mon Sep 17 00:00:00 2001 From: luomingmeng Date: Thu, 16 Jan 2025 14:29:32 +0800 Subject: [PATCH 02/27] add nic selection result pod annotation --- pkg/consts/pod.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkg/consts/pod.go b/pkg/consts/pod.go index 354d2585..39eec36f 100644 --- a/pkg/consts/pod.go +++ b/pkg/consts/pod.go @@ -41,3 +41,8 @@ const ( const ( PodAnnotationResourcePackageKey = "katalyst.kubewharf.io/resource_package" ) + +// PodAnnotationNICSelectionResultKey is a const variable for pod annotation about a nic selection result. +const ( + PodAnnotationNICSelectionResultKey = "katalyst.kubewharf.io/nic_selection_result" +) From 4a00c19f700cc13457e2bad3541218fbe22c5dc8 Mon Sep 17 00:00:00 2001 From: sunyuliang Date: Fri, 21 Mar 2025 16:53:33 +0800 Subject: [PATCH 03/27] add cpu total and cpu usage metric for kcmas --- pkg/metric/node/node.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkg/metric/node/node.go b/pkg/metric/node/node.go index 437f3c1b..d1befb48 100644 --- a/pkg/metric/node/node.go +++ b/pkg/metric/node/node.go @@ -20,6 +20,8 @@ limitations under the License. package node const ( + CustomMetricNodeCPUTotal = "node_cpu_total" + CustomMetricNodeCPUUsage = "node_cpu_usage" CustomMetricNodeCPUUsageRatio = "node_cpu_usage_ratio" CustomMetricNodeCPULoad1Min = "node_cpu_load_system_1min" ) From 006a74ad86c9cd390707a2f682f087a2caf4a8be Mon Sep 17 00:00:00 2001 From: "xudong.l" Date: Wed, 21 May 2025 15:18:21 -0700 Subject: [PATCH 04/27] add memory bandwidth related metric Signed-off-by: xudong.l --- pkg/metric/node/node.go | 7 +++++++ pkg/metric/pod/pod.go | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/pkg/metric/node/node.go b/pkg/metric/node/node.go index d1befb48..ef44fed8 100644 --- a/pkg/metric/node/node.go +++ b/pkg/metric/node/node.go @@ -37,3 +37,10 @@ const ( CustomMetricNodeAdvisorPoolLoad1Min = "node_advisor_pool_load_1min" CustomMetricNodeAdvisorKnobStatus = "node_advisor_knob_status" ) + +// real-time numa level memory bandwidth related metric +const ( + CustomMetricNUMAMemoryBandwidthTotal = "numa_mbm_total" + CustomMetricNUMAMemoryBandwidthLocal = "numa_mbm_local" + CustomMetricNUMAMemoryBandwidthVictim = "numa_mbm_victim" +) diff --git a/pkg/metric/pod/pod.go b/pkg/metric/pod/pod.go index f11f3a80..b6a5e77e 100644 --- a/pkg/metric/pod/pod.go +++ b/pkg/metric/pod/pod.go @@ -35,3 +35,10 @@ const ( const ( CustomMetricPodGPUUsage = "pod_gpu_usage" ) + +// real-time memory bandwidth related metric +const ( + CustomMetricPodTotalMemoryBandwidth = "pod_mbm_total" + CustomMetricPodLocalMemoryBandwidth = "pod_mbm_local" + CustomMetricPodVictimMemoryBandwidth = "pod_mbm_victim" +) From 3be93c76141a8ac7c7dde525076bf4c7f9ef7145 Mon Sep 17 00:00:00 2001 From: "wangzy.17" Date: Wed, 28 May 2025 16:15:49 +0800 Subject: [PATCH 05/27] fix(npd): fix resource name of npd to its plural form --- pkg/apis/node/v1alpha1/register.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/apis/node/v1alpha1/register.go b/pkg/apis/node/v1alpha1/register.go index 7b36fb8c..8ec1d8f7 100644 --- a/pkg/apis/node/v1alpha1/register.go +++ b/pkg/apis/node/v1alpha1/register.go @@ -33,7 +33,7 @@ var SchemeGroupVersion = schema.GroupVersion{Group: GroupName, Version: "v1alpha // ResourceNameKatalystCNR is used to construct standard gvr const ( ResourceNameKatalystCNR = "customnoderesources" - ResourceNameKatalystNPD = "nodeprofiledescriptor" + ResourceNameKatalystNPD = "nodeprofiledescriptors" ) // Resource takes an unqualified resource and returns a Group qualified GroupResource From 8b0977517abc56225bd09e5ff6a3a6c948bb182e Mon Sep 17 00:00:00 2001 From: luomingmeng Date: Fri, 6 Jun 2025 11:03:35 +0800 Subject: [PATCH 06/27] feat(utils): add eviction utility functions for condition effects Add ParseConditionEffect and GenerateConditionEffect utility functions to handle parsing and generating condition effect strings in the format "QoSLevel/Effect". This provides standardized handling of condition effects across the codebase. --- pkg/utils/eviction.go | 45 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 pkg/utils/eviction.go diff --git a/pkg/utils/eviction.go b/pkg/utils/eviction.go new file mode 100644 index 00000000..47e1ef26 --- /dev/null +++ b/pkg/utils/eviction.go @@ -0,0 +1,45 @@ +/* +Copyright 2022 The Katalyst Authors. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package utils + +import ( + "fmt" + "strings" + + v1 "k8s.io/api/core/v1" + + "github.com/kubewharf/katalyst-api/pkg/consts" +) + +const ( + // cnrConditionQoSLevelEffectSeparator separates CNR Condition effects into QoS Level and CNR effects. + cnrConditionQoSLevelEffectSeparator = "/" +) + +// ParseConditionEffect parses the condition effect into QoS level and CNR effect. +func ParseConditionEffect(effect string) (consts.QoSLevel, v1.TaintEffect, error) { + parts := strings.Split(effect, cnrConditionQoSLevelEffectSeparator) + if len(parts) != 2 { + return "", "", fmt.Errorf("invalid condition effect: %s", effect) + } + return consts.QoSLevel(parts[0]), v1.TaintEffect(parts[1]), nil +} + +// GenerateConditionEffect generates the condition effect from QoS level and CNR effect. +func GenerateConditionEffect(level consts.QoSLevel, effect v1.TaintEffect) string { + return fmt.Sprintf("%s%s%s", level, cnrConditionQoSLevelEffectSeparator, effect) +} From 663f8f8334cbf44a37637b77dff5d0699648f0b0 Mon Sep 17 00:00:00 2001 From: luomingmeng Date: Mon, 21 Jul 2025 23:28:54 +0800 Subject: [PATCH 07/27] fix(config): make EnabledStrategies field optional in StrategyGroupStatus Add omitempty tag to EnabledStrategies field and remove it from required fields in CRD Fix incorrect comment for ResourceAnnotationKeyNICNetNSName --- .../crd/bases/config.katalyst.kubewharf.io_strategygroups.yaml | 2 -- pkg/apis/config/v1alpha1/strategygroup.go | 3 ++- pkg/consts/resource.go | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/config/crd/bases/config.katalyst.kubewharf.io_strategygroups.yaml b/config/crd/bases/config.katalyst.kubewharf.io_strategygroups.yaml index ab66ed60..3dbec4b2 100644 --- a/config/crd/bases/config.katalyst.kubewharf.io_strategygroups.yaml +++ b/config/crd/bases/config.katalyst.kubewharf.io_strategygroups.yaml @@ -228,8 +228,6 @@ spec: this config. format: int32 type: integer - required: - - enabledStrategies type: object type: object served: true diff --git a/pkg/apis/config/v1alpha1/strategygroup.go b/pkg/apis/config/v1alpha1/strategygroup.go index b95e11dd..ca06ef4a 100644 --- a/pkg/apis/config/v1alpha1/strategygroup.go +++ b/pkg/apis/config/v1alpha1/strategygroup.go @@ -63,7 +63,8 @@ type StrategyGroupStatus struct { GenericConfigStatus `json:",inline"` // EnabledStrategies are strategies enabled in this group - EnabledStrategies []Strategy `json:"enabledStrategies"` + // +optional + EnabledStrategies []Strategy `json:"enabledStrategies,omitempty"` } type Strategy struct { diff --git a/pkg/consts/resource.go b/pkg/consts/resource.go index 98c0d8d6..bfe06b0a 100644 --- a/pkg/consts/resource.go +++ b/pkg/consts/resource.go @@ -36,6 +36,6 @@ const ( // (to replace with the default name) ResourceAnnotationKeyResourceIdentifier = "katalyst.kubewharf.io/resource_identifier" - // ResourceAnnotationKeyResourceIdentifier nominated the key indicating net namespace name of the NIC + // ResourceAnnotationKeyNICNetNSName nominated the key indicating net namespace name of the NIC ResourceAnnotationKeyNICNetNSName = "katalyst.kubewharf.io/netns_name" ) From 74d17d314e4be24dec6b885cb0f0a4cf23a12524 Mon Sep 17 00:00:00 2001 From: luomingmeng Date: Wed, 30 Jul 2025 15:09:24 +0800 Subject: [PATCH 08/27] feat(consts): update cpu enhancement annotations and comments - Add new NUMA share annotation constants with documentation - Fix comment for suppression tolerance rate to use reclaimed-cores --- pkg/consts/qos.go | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkg/consts/qos.go b/pkg/consts/qos.go index cad59941..5890f7ec 100644 --- a/pkg/consts/qos.go +++ b/pkg/consts/qos.go @@ -96,6 +96,15 @@ const ( // - all pods will be settled in `default` pool if not specified PodAnnotationCPUEnhancementCPUSet = "cpuset_pool" + // PodAnnotationCPUEnhancementNUMAShare enables NUMA sharing for pods. + // It supports different cpuset_pool or qos_level pods that require NUMA binding + // to share or not share NUMA resources. + // + // - This enhancement is supported for shared-cores and dedicated-cores. + // - By default, all pods can share the same NUMA if not specified. + PodAnnotationCPUEnhancementNUMAShare = "numa_share" + PodAnnotationCPUEnhancementNUMAShareDisable = "false" + // PodAnnotationCPUEnhancementSuppressionToleranceRate provides a mechanism to ensure // the quality for reclaimed resources. since reclaimed resources will always change // dynamically according to running states of none-reclaimed services, it may reach to @@ -103,7 +112,7 @@ const ( // but the reclaimed services runs too slow and would rather be killed and rescheduled. // in this case, the workload can use this enhancement to trigger eviction. // - // - this enhancement is only supported for shared-cores, for now and foreseeable future + // - this enhancement is only supported for reclaimed-cores, for now and foreseeable future PodAnnotationCPUEnhancementSuppressionToleranceRate = "suppression_tolerance_rate" ) From 8035e1a1722affc2b3592e8d2af2fb26ebb0a87b Mon Sep 17 00:00:00 2001 From: luomingmeng Date: Tue, 5 Aug 2025 11:34:09 +0800 Subject: [PATCH 09/27] feat(evictionplugin): add candidate pods and eviction records to API Add new fields to ThresholdMetResponse and GetTopEvictionPodsRequest messages to support candidate pods and eviction records. Introduce EvictionRecord and Buckets messages to store disruption-related data. --- .../evictionplugin/v1alpha1/api.pb.go | 1215 +++++++++++++++-- .../evictionplugin/v1alpha1/api.proto | 22 + 2 files changed, 1136 insertions(+), 101 deletions(-) diff --git a/pkg/protocol/evictionplugin/v1alpha1/api.pb.go b/pkg/protocol/evictionplugin/v1alpha1/api.pb.go index 00a37954..0e4886c3 100644 --- a/pkg/protocol/evictionplugin/v1alpha1/api.pb.go +++ b/pkg/protocol/evictionplugin/v1alpha1/api.pb.go @@ -239,6 +239,7 @@ type ThresholdMetResponse struct { EvictionScope string `protobuf:"bytes,5,opt,name=eviction_scope,json=evictionScope,proto3" json:"eviction_scope,omitempty"` GracePeriodSeconds int64 `protobuf:"varint,6,opt,name=grace_period_seconds,json=gracePeriodSeconds,proto3" json:"grace_period_seconds,omitempty"` Condition *Condition `protobuf:"bytes,7,opt,name=condition,proto3" json:"condition,omitempty"` + CandidatePods []*v1.Pod `protobuf:"bytes,8,rep,name=candidate_pods,json=candidatePods,proto3" json:"candidate_pods,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_sizecache int32 `json:"-"` } @@ -324,12 +325,20 @@ func (m *ThresholdMetResponse) GetCondition() *Condition { return nil } +func (m *ThresholdMetResponse) GetCandidatePods() []*v1.Pod { + if m != nil { + return m.CandidatePods + } + return nil +} + type GetTopEvictionPodsRequest struct { - ActivePods []*v1.Pod `protobuf:"bytes,1,rep,name=active_pods,json=activePods,proto3" json:"active_pods,omitempty"` - TopN uint64 `protobuf:"varint,2,opt,name=topN,proto3" json:"topN,omitempty"` - EvictionScope string `protobuf:"bytes,3,opt,name=eviction_scope,json=evictionScope,proto3" json:"eviction_scope,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_sizecache int32 `json:"-"` + ActivePods []*v1.Pod `protobuf:"bytes,1,rep,name=active_pods,json=activePods,proto3" json:"active_pods,omitempty"` + TopN uint64 `protobuf:"varint,2,opt,name=topN,proto3" json:"topN,omitempty"` + EvictionScope string `protobuf:"bytes,3,opt,name=eviction_scope,json=evictionScope,proto3" json:"eviction_scope,omitempty"` + CandidateEvictionRecords []*EvictionRecord `protobuf:"bytes,4,rep,name=candidate_eviction_records,json=candidateEvictionRecords,proto3" json:"candidate_eviction_records,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *GetTopEvictionPodsRequest) Reset() { *m = GetTopEvictionPodsRequest{} } @@ -385,6 +394,13 @@ func (m *GetTopEvictionPodsRequest) GetEvictionScope() string { return "" } +func (m *GetTopEvictionPodsRequest) GetCandidateEvictionRecords() []*EvictionRecord { + if m != nil { + return m.CandidateEvictionRecords + } + return nil +} + type GetTopEvictionPodsResponse struct { TargetPods []*v1.Pod `protobuf:"bytes,1,rep,name=target_pods,json=targetPods,proto3" json:"target_pods,omitempty"` DeletionOptions *DeletionOptions `protobuf:"bytes,2,opt,name=deletion_options,json=deletionOptions,proto3" json:"deletion_options,omitempty"` @@ -703,6 +719,205 @@ func (m *DeletionOptions) GetGracePeriodSeconds() int64 { return 0 } +type EvictionRecord struct { + Uid string `protobuf:"bytes,1,opt,name=uid,proto3" json:"uid,omitempty"` + HasPdb bool `protobuf:"varint,2,opt,name=has_pdb,json=hasPdb,proto3" json:"has_pdb,omitempty"` + Buckets *Buckets `protobuf:"bytes,3,opt,name=buckets,proto3" json:"buckets,omitempty"` + DisruptionsAllowed int32 `protobuf:"varint,4,opt,name=disruptions_allowed,json=disruptionsAllowed,proto3" json:"disruptions_allowed,omitempty"` + CurrentHealthy int32 `protobuf:"varint,5,opt,name=current_healthy,json=currentHealthy,proto3" json:"current_healthy,omitempty"` + DesiredHealthy int32 `protobuf:"varint,6,opt,name=desired_healthy,json=desiredHealthy,proto3" json:"desired_healthy,omitempty"` + ExpectedPods int32 `protobuf:"varint,7,opt,name=expected_pods,json=expectedPods,proto3" json:"expected_pods,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *EvictionRecord) Reset() { *m = EvictionRecord{} } +func (*EvictionRecord) ProtoMessage() {} +func (*EvictionRecord) Descriptor() ([]byte, []int) { + return fileDescriptor_78941759e4c5eff9, []int{10} +} +func (m *EvictionRecord) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *EvictionRecord) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_EvictionRecord.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalToSizedBuffer(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *EvictionRecord) XXX_Merge(src proto.Message) { + xxx_messageInfo_EvictionRecord.Merge(m, src) +} +func (m *EvictionRecord) XXX_Size() int { + return m.Size() +} +func (m *EvictionRecord) XXX_DiscardUnknown() { + xxx_messageInfo_EvictionRecord.DiscardUnknown(m) +} + +var xxx_messageInfo_EvictionRecord proto.InternalMessageInfo + +func (m *EvictionRecord) GetUid() string { + if m != nil { + return m.Uid + } + return "" +} + +func (m *EvictionRecord) GetHasPdb() bool { + if m != nil { + return m.HasPdb + } + return false +} + +func (m *EvictionRecord) GetBuckets() *Buckets { + if m != nil { + return m.Buckets + } + return nil +} + +func (m *EvictionRecord) GetDisruptionsAllowed() int32 { + if m != nil { + return m.DisruptionsAllowed + } + return 0 +} + +func (m *EvictionRecord) GetCurrentHealthy() int32 { + if m != nil { + return m.CurrentHealthy + } + return 0 +} + +func (m *EvictionRecord) GetDesiredHealthy() int32 { + if m != nil { + return m.DesiredHealthy + } + return 0 +} + +func (m *EvictionRecord) GetExpectedPods() int32 { + if m != nil { + return m.ExpectedPods + } + return 0 +} + +type Buckets struct { + List []*Bucket `protobuf:"bytes,1,rep,name=list,proto3" json:"list,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *Buckets) Reset() { *m = Buckets{} } +func (*Buckets) ProtoMessage() {} +func (*Buckets) Descriptor() ([]byte, []int) { + return fileDescriptor_78941759e4c5eff9, []int{11} +} +func (m *Buckets) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *Buckets) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_Buckets.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalToSizedBuffer(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *Buckets) XXX_Merge(src proto.Message) { + xxx_messageInfo_Buckets.Merge(m, src) +} +func (m *Buckets) XXX_Size() int { + return m.Size() +} +func (m *Buckets) XXX_DiscardUnknown() { + xxx_messageInfo_Buckets.DiscardUnknown(m) +} + +var xxx_messageInfo_Buckets proto.InternalMessageInfo + +func (m *Buckets) GetList() []*Bucket { + if m != nil { + return m.List + } + return nil +} + +type Bucket struct { + Time int64 `protobuf:"varint,1,opt,name=time,proto3" json:"time,omitempty"` + Duration int64 `protobuf:"varint,2,opt,name=duration,proto3" json:"duration,omitempty"` + Count int64 `protobuf:"varint,3,opt,name=count,proto3" json:"count,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *Bucket) Reset() { *m = Bucket{} } +func (*Bucket) ProtoMessage() {} +func (*Bucket) Descriptor() ([]byte, []int) { + return fileDescriptor_78941759e4c5eff9, []int{12} +} +func (m *Bucket) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *Bucket) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_Bucket.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalToSizedBuffer(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *Bucket) XXX_Merge(src proto.Message) { + xxx_messageInfo_Bucket.Merge(m, src) +} +func (m *Bucket) XXX_Size() int { + return m.Size() +} +func (m *Bucket) XXX_DiscardUnknown() { + xxx_messageInfo_Bucket.DiscardUnknown(m) +} + +var xxx_messageInfo_Bucket proto.InternalMessageInfo + +func (m *Bucket) GetTime() int64 { + if m != nil { + return m.Time + } + return 0 +} + +func (m *Bucket) GetDuration() int64 { + if m != nil { + return m.Duration + } + return 0 +} + +func (m *Bucket) GetCount() int64 { + if m != nil { + return m.Count + } + return 0 +} + func init() { proto.RegisterEnum("evictionplugin.v1alpha1.ThresholdMetType", ThresholdMetType_name, ThresholdMetType_value) proto.RegisterEnum("evictionplugin.v1alpha1.ThresholdOperator", ThresholdOperator_name, ThresholdOperator_value) @@ -717,70 +932,88 @@ func init() { proto.RegisterType((*GetEvictPodsResponse)(nil), "evictionplugin.v1alpha1.GetEvictPodsResponse") proto.RegisterType((*GetTokenResponse)(nil), "evictionplugin.v1alpha1.GetTokenResponse") proto.RegisterType((*DeletionOptions)(nil), "evictionplugin.v1alpha1.DeletionOptions") + proto.RegisterType((*EvictionRecord)(nil), "evictionplugin.v1alpha1.EvictionRecord") + proto.RegisterType((*Buckets)(nil), "evictionplugin.v1alpha1.Buckets") + proto.RegisterType((*Bucket)(nil), "evictionplugin.v1alpha1.Bucket") } func init() { proto.RegisterFile("v1alpha1/api.proto", fileDescriptor_78941759e4c5eff9) } var fileDescriptor_78941759e4c5eff9 = []byte{ - // 918 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x56, 0x4d, 0x6f, 0x23, 0x45, - 0x13, 0x76, 0x67, 0x92, 0xd8, 0x2e, 0x7f, 0xc4, 0xe9, 0x37, 0x7a, 0xd7, 0xf8, 0x60, 0xcc, 0x20, - 0x60, 0x36, 0x62, 0xc7, 0xc4, 0x8b, 0x50, 0x24, 0x2e, 0x1b, 0x62, 0x93, 0x5d, 0x89, 0xd8, 0x56, - 0xdb, 0x02, 0xc1, 0x65, 0x34, 0x99, 0xa9, 0x38, 0xa3, 0xb5, 0xdd, 0xc3, 0x4c, 0xdb, 0x52, 0x4e, - 0xf0, 0x13, 0xf6, 0xcc, 0x91, 0x2b, 0xff, 0x80, 0x13, 0xc7, 0x3d, 0x72, 0xe4, 0xc8, 0x86, 0xdf, - 0xc0, 0x1d, 0x75, 0xb7, 0xc7, 0xb1, 0xbd, 0x76, 0xb2, 0xb0, 0xa7, 0x4c, 0x55, 0x57, 0x3d, 0xfd, - 0xf4, 0x53, 0x1f, 0x0e, 0xd0, 0xe9, 0x91, 0x3b, 0x0c, 0xaf, 0xdc, 0xa3, 0xba, 0x1b, 0x06, 0x76, - 0x18, 0x71, 0xc1, 0xe9, 0x03, 0x9c, 0x06, 0x9e, 0x08, 0xf8, 0x38, 0x1c, 0x4e, 0x06, 0xc1, 0xd8, - 0x4e, 0x42, 0x2a, 0x8f, 0x06, 0x81, 0xb8, 0x9a, 0x5c, 0xd8, 0x1e, 0x1f, 0xd5, 0x07, 0x7c, 0xc0, - 0xeb, 0x2a, 0xfe, 0x62, 0x72, 0xa9, 0x2c, 0x65, 0xa8, 0x2f, 0x8d, 0x53, 0x31, 0x9f, 0x1f, 0xc7, - 0x76, 0xc0, 0x25, 0x72, 0xdd, 0xe3, 0x11, 0xd6, 0xa7, 0x47, 0xf5, 0x01, 0x8e, 0x31, 0x72, 0x05, - 0xfa, 0x3a, 0xc6, 0x4c, 0xc3, 0x4e, 0x6b, 0x14, 0x8a, 0x6b, 0xf3, 0x37, 0x02, 0xd9, 0x53, 0x3e, - 0xf6, 0x03, 0x79, 0x31, 0x3d, 0x87, 0xa2, 0x97, 0x18, 0x8e, 0xb8, 0x0e, 0xb1, 0x4c, 0x6a, 0xc4, - 0x2a, 0x36, 0x3e, 0xb4, 0x37, 0x70, 0xb3, 0xe7, 0xb9, 0xfd, 0xeb, 0x10, 0x59, 0xc1, 0x5b, 0x34, - 0x69, 0x19, 0xd2, 0x78, 0x79, 0x89, 0x9e, 0x88, 0xcb, 0x5b, 0x35, 0xc3, 0xca, 0xb2, 0xc4, 0xa4, - 0x1f, 0x2c, 0x5e, 0x34, 0x76, 0x47, 0x58, 0x36, 0x6a, 0xc4, 0xca, 0x2e, 0x00, 0xb4, 0xdd, 0x11, - 0xd2, 0xf7, 0xa1, 0x30, 0x42, 0xe1, 0xcc, 0x9d, 0xe5, 0xed, 0x1a, 0xb1, 0x32, 0x2c, 0x3f, 0x42, - 0x31, 0xbf, 0xd8, 0xfc, 0xd9, 0x80, 0x83, 0xfe, 0x55, 0x84, 0xf1, 0x15, 0x1f, 0xfa, 0xe7, 0x28, - 0x18, 0xc6, 0x21, 0x1f, 0xc7, 0x48, 0x3f, 0x82, 0x3d, 0x91, 0xf8, 0x9d, 0xa9, 0x3b, 0x9c, 0xe8, - 0xe7, 0x10, 0x56, 0x9c, 0xbb, 0xbf, 0x96, 0x5e, 0xc9, 0x86, 0x5f, 0xc4, 0x18, 0x4d, 0x31, 0x89, - 0xdb, 0x52, 0x71, 0x85, 0xc4, 0xab, 0xc3, 0xbe, 0x05, 0x7a, 0x8b, 0xc7, 0x43, 0x29, 0x28, 0x8f, - 0x14, 0xf1, 0x62, 0xe3, 0x70, 0xa3, 0x42, 0x73, 0x6a, 0x9d, 0x59, 0x06, 0xdb, 0x17, 0xab, 0x2e, - 0xda, 0x84, 0x8c, 0x7c, 0xa8, 0x92, 0x7c, 0x5b, 0x01, 0x3e, 0xbc, 0x1f, 0xf0, 0x1c, 0x85, 0x52, - 0x3d, 0x3d, 0xd2, 0x1f, 0xf2, 0x1d, 0x49, 0x92, 0x13, 0x7b, 0x3c, 0xc4, 0xf2, 0x8e, 0x56, 0x35, - 0xf1, 0xf6, 0xa4, 0x93, 0x7e, 0x02, 0x07, 0x83, 0xc8, 0xf5, 0xd0, 0x09, 0x31, 0x0a, 0xb8, 0xef, - 0xc4, 0x28, 0x05, 0x8e, 0xcb, 0xbb, 0x35, 0x62, 0x19, 0x8c, 0xaa, 0xb3, 0xae, 0x3a, 0xea, 0xe9, - 0x13, 0xfa, 0x04, 0xb2, 0xb7, 0x35, 0x48, 0xd7, 0x88, 0x95, 0x6b, 0x98, 0xf7, 0xb7, 0x04, 0xbb, - 0x4d, 0x32, 0x5f, 0x10, 0x78, 0xe7, 0x0c, 0x45, 0x9f, 0x87, 0xad, 0x59, 0x5a, 0x97, 0xfb, 0x31, - 0xc3, 0xef, 0x27, 0x18, 0x0b, 0x7a, 0x0c, 0x39, 0xd7, 0x13, 0xc1, 0x14, 0x9d, 0x90, 0xfb, 0x71, - 0x99, 0xd4, 0x0c, 0x2b, 0xd7, 0x78, 0x60, 0xeb, 0x46, 0xb6, 0xe5, 0x88, 0xc8, 0x46, 0xb6, 0xa7, - 0x47, 0x76, 0x97, 0xfb, 0x0c, 0x74, 0xac, 0x04, 0xa0, 0x14, 0xb6, 0x05, 0x0f, 0xdb, 0xaa, 0x60, - 0xdb, 0x4c, 0x7d, 0xaf, 0x91, 0xc1, 0x58, 0x23, 0x83, 0xf9, 0x0b, 0x81, 0xca, 0x3a, 0x4a, 0xb3, - 0xee, 0x39, 0x86, 0x9c, 0x70, 0xa3, 0x01, 0x8a, 0x37, 0xe3, 0xa4, 0x63, 0x15, 0xa7, 0x1e, 0x94, - 0x7c, 0x1c, 0xa2, 0xba, 0x9f, 0x87, 0xf2, 0x4f, 0xac, 0xf8, 0xe5, 0x1a, 0xd6, 0x46, 0xd1, 0x9a, - 0xb3, 0x84, 0x8e, 0x8e, 0x67, 0x7b, 0xfe, 0xb2, 0xc3, 0xfc, 0x9b, 0x40, 0x46, 0xf1, 0xec, 0x72, - 0x9f, 0x3e, 0x04, 0x23, 0xe4, 0xbe, 0xea, 0xe6, 0x3b, 0x38, 0xc9, 0x18, 0xfa, 0x7f, 0xd8, 0x8d, - 0xd0, 0x8d, 0xf9, 0x58, 0x51, 0xc8, 0xb2, 0x99, 0xb5, 0x96, 0xa4, 0xf1, 0x96, 0x24, 0xe9, 0xbb, - 0x90, 0xbb, 0xe4, 0x91, 0x87, 0x8e, 0x42, 0x98, 0x4d, 0x2b, 0x28, 0x97, 0xe2, 0x2e, 0x5b, 0x6f, - 0x5e, 0x1a, 0x8d, 0xae, 0xa7, 0x5f, 0xf7, 0x29, 0x4d, 0xce, 0xba, 0xea, 0x48, 0xae, 0x00, 0xb3, - 0x03, 0xff, 0x3b, 0x43, 0x91, 0xbc, 0xfc, 0xed, 0x3b, 0xc6, 0xfc, 0x89, 0xc0, 0xc1, 0x32, 0xe2, - 0xac, 0xe0, 0x4f, 0x00, 0xd4, 0xfd, 0x8b, 0x88, 0xef, 0x6d, 0xd4, 0x22, 0xc9, 0x67, 0x59, 0x4c, - 0x90, 0x96, 0xc7, 0x64, 0xeb, 0xbf, 0x8c, 0x89, 0x05, 0x25, 0xd5, 0x92, 0xcf, 0x71, 0x3c, 0xe7, - 0x75, 0x00, 0x3b, 0x42, 0x3a, 0x54, 0xb9, 0xb3, 0x4c, 0x1b, 0xe6, 0x29, 0xec, 0xad, 0x94, 0x63, - 0xe3, 0x5c, 0x93, 0x4d, 0x73, 0x7d, 0xf8, 0x39, 0x94, 0x56, 0xb7, 0x09, 0xcd, 0x41, 0xba, 0xdd, - 0xe9, 0x3b, 0xe7, 0xad, 0x7e, 0x29, 0x45, 0xf3, 0x90, 0xe9, 0x75, 0xbe, 0xd4, 0x16, 0x91, 0xd6, - 0xd3, 0x13, 0xd6, 0x54, 0xd6, 0xd6, 0xe1, 0xa7, 0xb0, 0xff, 0xda, 0x6e, 0xa3, 0x05, 0xc8, 0x7e, - 0xd5, 0xea, 0xf5, 0x9c, 0xfe, 0xd3, 0x93, 0x76, 0x29, 0x45, 0x4b, 0x90, 0x3f, 0x63, 0xad, 0x93, - 0x7e, 0x8b, 0x69, 0x0f, 0x39, 0xfc, 0x0c, 0x0a, 0x4b, 0xbf, 0x19, 0x94, 0x42, 0xb1, 0xdd, 0x69, - 0xb6, 0x9c, 0xd3, 0x4e, 0xbb, 0xf9, 0xac, 0xff, 0xac, 0x23, 0xd3, 0xf6, 0xa1, 0x70, 0xda, 0x66, - 0x0b, 0x2e, 0xd2, 0xf8, 0xd5, 0x80, 0x62, 0x6b, 0xa9, 0x3d, 0xe8, 0x37, 0x90, 0x49, 0xc4, 0xa2, - 0xd5, 0xcd, 0x85, 0x92, 0xbf, 0x73, 0x95, 0xcd, 0xeb, 0x74, 0x55, 0x6f, 0x33, 0x45, 0x1d, 0xc8, - 0x2f, 0xca, 0x72, 0x2f, 0xf8, 0xa3, 0x37, 0xda, 0xd5, 0x0b, 0x17, 0xfc, 0x00, 0xf4, 0xf5, 0xcd, - 0x43, 0x1b, 0x77, 0x73, 0x5c, 0xb7, 0x39, 0x2b, 0x8f, 0xff, 0x55, 0xce, 0x9c, 0xc0, 0x08, 0xf2, - 0x8b, 0x33, 0x40, 0x3f, 0xbe, 0x0b, 0x66, 0x75, 0xf8, 0xee, 0x78, 0xef, 0xba, 0xc1, 0x32, 0x53, - 0x5f, 0x58, 0x2f, 0x5f, 0x55, 0xc9, 0x1f, 0xaf, 0xaa, 0xa9, 0x1f, 0x6f, 0xaa, 0xe4, 0xe5, 0x4d, - 0x95, 0xfc, 0x7e, 0x53, 0x25, 0x7f, 0xde, 0x54, 0xc9, 0x8b, 0xbf, 0xaa, 0xa9, 0xef, 0xc0, 0xae, - 0x27, 0x00, 0x17, 0xbb, 0xea, 0xff, 0x93, 0xc7, 0xff, 0x04, 0x00, 0x00, 0xff, 0xff, 0xfc, 0x3a, - 0xc5, 0xad, 0x21, 0x09, 0x00, 0x00, + // 1154 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x56, 0xcb, 0x8e, 0x1b, 0x45, + 0x17, 0x76, 0x4f, 0x7b, 0x7c, 0x39, 0xbe, 0xc4, 0xa9, 0x8c, 0xfe, 0xf8, 0xf7, 0xc2, 0x31, 0x1d, + 0x41, 0x9c, 0x11, 0xb1, 0x19, 0x07, 0xa1, 0x08, 0xa4, 0x28, 0x93, 0x19, 0x93, 0x44, 0x62, 0x6c, + 0xab, 0x6c, 0x81, 0x60, 0xd3, 0x6a, 0x77, 0x9f, 0xb1, 0x5b, 0x63, 0xbb, 0x9a, 0xee, 0xb2, 0x61, + 0x56, 0xf0, 0x08, 0xac, 0xd9, 0xf0, 0x00, 0xbc, 0x01, 0x2b, 0x96, 0x59, 0xb2, 0x64, 0x49, 0x86, + 0x67, 0x40, 0x6c, 0x51, 0x55, 0x75, 0xf7, 0xd8, 0x13, 0xdb, 0x13, 0xc8, 0xaa, 0xeb, 0x9c, 0xfa, + 0xea, 0xd4, 0x77, 0xae, 0xd5, 0x40, 0x16, 0x07, 0xd6, 0xc4, 0x1b, 0x5b, 0x07, 0x4d, 0xcb, 0x73, + 0x1b, 0x9e, 0xcf, 0x38, 0x23, 0xb7, 0x71, 0xe1, 0xda, 0xdc, 0x65, 0x33, 0x6f, 0x32, 0x1f, 0xb9, + 0xb3, 0x46, 0x04, 0xa9, 0x3c, 0x18, 0xb9, 0x7c, 0x3c, 0x1f, 0x36, 0x6c, 0x36, 0x6d, 0x8e, 0xd8, + 0x88, 0x35, 0x25, 0x7e, 0x38, 0x3f, 0x95, 0x92, 0x14, 0xe4, 0x4a, 0xd9, 0xa9, 0x18, 0x67, 0x8f, + 0x82, 0x86, 0xcb, 0x84, 0xe5, 0xa6, 0xcd, 0x7c, 0x6c, 0x2e, 0x0e, 0x9a, 0x23, 0x9c, 0xa1, 0x6f, + 0x71, 0x74, 0x14, 0xc6, 0x48, 0xc3, 0x6e, 0x7b, 0xea, 0xf1, 0x73, 0xe3, 0x57, 0x0d, 0xb2, 0x47, + 0x6c, 0xe6, 0xb8, 0xe2, 0x62, 0x72, 0x02, 0x45, 0x3b, 0x12, 0x4c, 0x7e, 0xee, 0x61, 0x59, 0xab, + 0x69, 0xf5, 0x62, 0xeb, 0xbd, 0xc6, 0x06, 0x6e, 0x8d, 0xf8, 0xec, 0xe0, 0xdc, 0x43, 0x5a, 0xb0, + 0x97, 0x45, 0x52, 0x86, 0x34, 0x9e, 0x9e, 0xa2, 0xcd, 0x83, 0xf2, 0x4e, 0x4d, 0xaf, 0x67, 0x69, + 0x24, 0x92, 0x77, 0x97, 0x2f, 0x9a, 0x59, 0x53, 0x2c, 0xeb, 0x35, 0xad, 0x9e, 0x5d, 0x32, 0xd0, + 0xb1, 0xa6, 0x48, 0xee, 0x42, 0x61, 0x8a, 0xdc, 0x8c, 0x95, 0xe5, 0x64, 0x4d, 0xab, 0x67, 0x68, + 0x7e, 0x8a, 0x3c, 0xbe, 0xd8, 0xb8, 0xd0, 0x61, 0x6f, 0x30, 0xf6, 0x31, 0x18, 0xb3, 0x89, 0x73, + 0x82, 0x9c, 0x62, 0xe0, 0xb1, 0x59, 0x80, 0xe4, 0x1e, 0xdc, 0xe0, 0x91, 0xde, 0x5c, 0x58, 0x93, + 0xb9, 0x72, 0x47, 0xa3, 0xc5, 0x58, 0xfd, 0xb9, 0xd0, 0x0a, 0x36, 0x6c, 0x18, 0xa0, 0xbf, 0xc0, + 0x08, 0xb7, 0x23, 0x71, 0x85, 0x48, 0xab, 0x60, 0x5f, 0x02, 0xb9, 0xb4, 0xc7, 0x3c, 0x11, 0x50, + 0xe6, 0x4b, 0xe2, 0xc5, 0xd6, 0xfe, 0xc6, 0x08, 0xc5, 0xd4, 0xba, 0xe1, 0x09, 0x7a, 0x93, 0x5f, + 0x55, 0x91, 0x63, 0xc8, 0x08, 0x47, 0x65, 0xc8, 0x93, 0xd2, 0xe0, 0xfd, 0xeb, 0x0d, 0x9e, 0x20, + 0x97, 0x51, 0x4f, 0x4f, 0xd5, 0x42, 0xf8, 0x11, 0x1d, 0x32, 0x03, 0x9b, 0x79, 0x58, 0xde, 0x55, + 0x51, 0x8d, 0xb4, 0x7d, 0xa1, 0x24, 0x1f, 0xc0, 0xde, 0xc8, 0xb7, 0x6c, 0x34, 0x3d, 0xf4, 0x5d, + 0xe6, 0x98, 0x01, 0x8a, 0x00, 0x07, 0xe5, 0x54, 0x4d, 0xab, 0xeb, 0x94, 0xc8, 0xbd, 0x9e, 0xdc, + 0xea, 0xab, 0x1d, 0xf2, 0x04, 0xb2, 0x97, 0x39, 0x48, 0xd7, 0xb4, 0x7a, 0xae, 0x65, 0x5c, 0x5f, + 0x12, 0xf4, 0xf2, 0x10, 0x79, 0x0c, 0x45, 0xdb, 0x9a, 0x39, 0xae, 0x63, 0x71, 0x34, 0x3d, 0xe6, + 0x04, 0xe5, 0x4c, 0x4d, 0xaf, 0xe7, 0x5a, 0xb7, 0x1b, 0xaa, 0x5a, 0x1b, 0xa2, 0x0f, 0x44, 0xb5, + 0x36, 0x16, 0x07, 0x8d, 0x1e, 0x73, 0x68, 0x21, 0x86, 0xf7, 0x98, 0x13, 0x18, 0x7f, 0x6b, 0xf0, + 0xff, 0x67, 0xc8, 0x07, 0xcc, 0x6b, 0x87, 0xd7, 0x0a, 0x35, 0xc5, 0xaf, 0xe7, 0x18, 0x70, 0xf2, + 0x08, 0x72, 0x96, 0xcd, 0xdd, 0x45, 0x68, 0x5a, 0xdb, 0x6e, 0x1a, 0x14, 0x56, 0x18, 0x20, 0x04, + 0x92, 0x9c, 0x79, 0x1d, 0x99, 0xf0, 0x24, 0x95, 0xeb, 0x35, 0x61, 0xd4, 0xd7, 0x85, 0x11, 0xa1, + 0x72, 0xe9, 0x52, 0x7c, 0xc0, 0x47, 0x9b, 0xf9, 0x4e, 0x50, 0x4e, 0x4a, 0x0e, 0xf7, 0x36, 0x46, + 0x29, 0x72, 0x83, 0x4a, 0x3c, 0x2d, 0xc7, 0xa6, 0x56, 0x37, 0x02, 0xe3, 0x67, 0x0d, 0x2a, 0xeb, + 0x3c, 0x0f, 0x8b, 0xfc, 0x11, 0xe4, 0xb8, 0xe5, 0x8f, 0x90, 0xbf, 0x99, 0xeb, 0x0a, 0x2b, 0x5d, + 0xef, 0x43, 0xc9, 0xc1, 0x09, 0x4a, 0xd6, 0xcc, 0x13, 0x9f, 0x40, 0x86, 0x21, 0xd7, 0xaa, 0x6f, + 0x64, 0x7d, 0x1c, 0x1e, 0xe8, 0x2a, 0x3c, 0xbd, 0xe1, 0xac, 0x2a, 0x8c, 0xbf, 0x34, 0xc8, 0x48, + 0x9e, 0x3d, 0xe6, 0x90, 0xfb, 0xa0, 0x7b, 0xcc, 0x91, 0x4d, 0xb7, 0x85, 0x93, 0xc0, 0x90, 0xff, + 0x41, 0xca, 0x47, 0x2b, 0x60, 0x33, 0x49, 0x21, 0x4b, 0x43, 0x69, 0x2d, 0x49, 0xfd, 0x2d, 0x49, + 0x92, 0x3b, 0x90, 0x3b, 0x65, 0xbe, 0x1d, 0x66, 0x2d, 0x1c, 0x2a, 0x20, 0x55, 0x92, 0xbb, 0xe8, + 0x90, 0x38, 0xa1, 0xca, 0xba, 0x1a, 0x52, 0xaa, 0x9d, 0x48, 0xb4, 0xd7, 0x93, 0x5b, 0x62, 0x52, + 0x19, 0x5d, 0xb8, 0xf5, 0x0c, 0x79, 0xe4, 0xf9, 0xdb, 0x17, 0xa6, 0xf1, 0xa3, 0x06, 0x7b, 0xab, + 0x16, 0xc3, 0x84, 0x3f, 0x01, 0x90, 0xf7, 0x2f, 0x5b, 0x7c, 0x67, 0x7b, 0x99, 0x09, 0xdb, 0x59, + 0x8c, 0x2c, 0xad, 0x76, 0xf3, 0xce, 0x7f, 0xe8, 0x66, 0xa3, 0x0e, 0x25, 0x59, 0x92, 0x67, 0x38, + 0x8b, 0x79, 0xed, 0xc1, 0x2e, 0x17, 0x0a, 0x99, 0xee, 0x2c, 0x55, 0x82, 0x71, 0x04, 0x37, 0xae, + 0xa4, 0x63, 0xe3, 0xf8, 0xd1, 0x36, 0x8d, 0x1f, 0xe3, 0xa7, 0x1d, 0x28, 0xae, 0xb6, 0x05, 0x29, + 0x81, 0x3e, 0x77, 0x9d, 0xf0, 0x2e, 0xb1, 0x24, 0xb7, 0x21, 0x3d, 0xb6, 0x02, 0xd3, 0x73, 0x86, + 0xd2, 0xa7, 0x0c, 0x4d, 0x8d, 0xad, 0xa0, 0xe7, 0x0c, 0xc9, 0xc7, 0x90, 0x1e, 0xce, 0xed, 0x33, + 0xe4, 0x51, 0xe5, 0xd4, 0x36, 0x3a, 0xfb, 0x54, 0xe1, 0x68, 0x74, 0x80, 0x34, 0xe1, 0x96, 0xe3, + 0x06, 0xfe, 0x5c, 0x51, 0x37, 0xad, 0xc9, 0x84, 0x7d, 0x83, 0x8e, 0xac, 0x98, 0x5d, 0x4a, 0x96, + 0xb6, 0x0e, 0xd5, 0x8e, 0x78, 0x73, 0xec, 0xb9, 0xef, 0xe3, 0x8c, 0x9b, 0x63, 0xb4, 0x26, 0x7c, + 0x7c, 0x2e, 0x8b, 0x66, 0x97, 0x16, 0x43, 0xf5, 0x73, 0xa5, 0x15, 0x40, 0x07, 0x03, 0xd7, 0x47, + 0x27, 0x06, 0xa6, 0x14, 0x30, 0x54, 0x47, 0xc0, 0xbb, 0x50, 0xc0, 0x6f, 0x3d, 0xb4, 0x39, 0x3a, + 0x2a, 0xe5, 0x69, 0x09, 0xcb, 0x47, 0x4a, 0x59, 0x2d, 0x8f, 0x21, 0x1d, 0x72, 0x27, 0x0f, 0x21, + 0x39, 0x71, 0x03, 0x1e, 0x56, 0xc6, 0x9d, 0x6b, 0x7c, 0xa5, 0x12, 0x6c, 0x74, 0x20, 0xa5, 0x64, + 0x39, 0x10, 0xdd, 0x29, 0x86, 0xd9, 0x90, 0x6b, 0x52, 0x81, 0x8c, 0x33, 0xf7, 0xad, 0xb8, 0x5e, + 0x74, 0x1a, 0xcb, 0x22, 0xed, 0x36, 0x9b, 0xcf, 0xb8, 0x8c, 0xad, 0x4e, 0x95, 0xb0, 0xff, 0x09, + 0x94, 0xae, 0x3e, 0x53, 0x24, 0x07, 0xe9, 0x4e, 0x77, 0x60, 0x9e, 0xb4, 0x07, 0xa5, 0x04, 0xc9, + 0x43, 0xa6, 0xdf, 0xfd, 0x54, 0x49, 0x9a, 0x90, 0x9e, 0x1f, 0xd2, 0x63, 0x29, 0xed, 0xec, 0x7f, + 0x08, 0x37, 0x5f, 0x7b, 0x34, 0x49, 0x01, 0xb2, 0x9f, 0xb5, 0xfb, 0x7d, 0x73, 0xf0, 0xfc, 0xb0, + 0x53, 0x4a, 0x90, 0x12, 0xe4, 0x9f, 0xd1, 0xf6, 0xe1, 0xa0, 0x4d, 0x95, 0x46, 0xdb, 0xff, 0x08, + 0x0a, 0x2b, 0x3f, 0x23, 0x84, 0x40, 0xb1, 0xd3, 0x3d, 0x6e, 0x9b, 0x47, 0xdd, 0xce, 0xf1, 0x8b, + 0xc1, 0x8b, 0xae, 0x38, 0x76, 0x13, 0x0a, 0x47, 0x1d, 0xba, 0xa4, 0xd2, 0x5a, 0xbf, 0xe8, 0x97, + 0xc5, 0xa5, 0x1a, 0x9a, 0x7c, 0x01, 0x99, 0xa8, 0xbc, 0x49, 0x75, 0x73, 0x6b, 0x89, 0x1f, 0xa8, + 0xca, 0xe6, 0x77, 0xfa, 0x6a, 0x87, 0x18, 0x09, 0x62, 0x42, 0x7e, 0x39, 0x2c, 0xd7, 0x1a, 0x7f, + 0xf0, 0x46, 0x3f, 0x01, 0x4b, 0x17, 0x7c, 0x07, 0xe4, 0xf5, 0xb7, 0x82, 0xb4, 0xb6, 0x73, 0x5c, + 0xf7, 0xa4, 0x56, 0x1e, 0xfe, 0xab, 0x33, 0x31, 0x81, 0x29, 0xe4, 0x97, 0xa7, 0x16, 0x79, 0x7f, + 0x9b, 0x99, 0xab, 0xe3, 0x72, 0x8b, 0xbf, 0xeb, 0x46, 0xa1, 0x91, 0x78, 0x5a, 0x7f, 0xf9, 0xaa, + 0xaa, 0xfd, 0xfe, 0xaa, 0x9a, 0xf8, 0xfe, 0xa2, 0xaa, 0xbd, 0xbc, 0xa8, 0x6a, 0xbf, 0x5d, 0x54, + 0xb5, 0x3f, 0x2e, 0xaa, 0xda, 0x0f, 0x7f, 0x56, 0x13, 0x5f, 0x41, 0xa3, 0x19, 0x19, 0x18, 0xa6, + 0xe4, 0x8f, 0xef, 0xc3, 0x7f, 0x02, 0x00, 0x00, 0xff, 0xff, 0x5e, 0x2f, 0x32, 0x4d, 0x7a, 0x0b, + 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -1068,6 +1301,20 @@ func (m *ThresholdMetResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l + if len(m.CandidatePods) > 0 { + for iNdEx := len(m.CandidatePods) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.CandidatePods[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintApi(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x42 + } + } if m.Condition != nil { { size, err := m.Condition.MarshalToSizedBuffer(dAtA[:i]) @@ -1137,6 +1384,20 @@ func (m *GetTopEvictionPodsRequest) MarshalToSizedBuffer(dAtA []byte) (int, erro _ = i var l int _ = l + if len(m.CandidateEvictionRecords) > 0 { + for iNdEx := len(m.CandidateEvictionRecords) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.CandidateEvictionRecords[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintApi(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x22 + } + } if len(m.EvictionScope) > 0 { i -= len(m.EvictionScope) copy(dAtA[i:], m.EvictionScope) @@ -1430,59 +1691,206 @@ func (m *DeletionOptions) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } -func encodeVarintApi(dAtA []byte, offset int, v uint64) int { - offset -= sovApi(v) - base := offset - for v >= 1<<7 { - dAtA[offset] = uint8(v&0x7f | 0x80) - v >>= 7 - offset++ +func (m *EvictionRecord) Marshal() (dAtA []byte, err error) { + size := m.Size() + dAtA = make([]byte, size) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) + if err != nil { + return nil, err } - dAtA[offset] = uint8(v) - return base + return dAtA[:n], nil } -func (m *Empty) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - return n + +func (m *EvictionRecord) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *Condition) Size() (n int) { - if m == nil { - return 0 - } +func (m *EvictionRecord) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i var l int _ = l - if m.ConditionType != 0 { - n += 1 + sovApi(uint64(m.ConditionType)) + if m.ExpectedPods != 0 { + i = encodeVarintApi(dAtA, i, uint64(m.ExpectedPods)) + i-- + dAtA[i] = 0x38 } - if len(m.Effects) > 0 { - for _, s := range m.Effects { - l = len(s) - n += 1 + l + sovApi(uint64(l)) + if m.DesiredHealthy != 0 { + i = encodeVarintApi(dAtA, i, uint64(m.DesiredHealthy)) + i-- + dAtA[i] = 0x30 + } + if m.CurrentHealthy != 0 { + i = encodeVarintApi(dAtA, i, uint64(m.CurrentHealthy)) + i-- + dAtA[i] = 0x28 + } + if m.DisruptionsAllowed != 0 { + i = encodeVarintApi(dAtA, i, uint64(m.DisruptionsAllowed)) + i-- + dAtA[i] = 0x20 + } + if m.Buckets != nil { + { + size, err := m.Buckets.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintApi(dAtA, i, uint64(size)) } + i-- + dAtA[i] = 0x1a } - l = len(m.ConditionName) - if l > 0 { - n += 1 + l + sovApi(uint64(l)) + if m.HasPdb { + i-- + if m.HasPdb { + dAtA[i] = 1 + } else { + dAtA[i] = 0 + } + i-- + dAtA[i] = 0x10 } - if m.MetCondition { - n += 2 + if len(m.Uid) > 0 { + i -= len(m.Uid) + copy(dAtA[i:], m.Uid) + i = encodeVarintApi(dAtA, i, uint64(len(m.Uid))) + i-- + dAtA[i] = 0xa } - return n + return len(dAtA) - i, nil } -func (m *ThresholdMetResponse) Size() (n int) { - if m == nil { - return 0 +func (m *Buckets) Marshal() (dAtA []byte, err error) { + size := m.Size() + dAtA = make([]byte, size) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) + if err != nil { + return nil, err } + return dAtA[:n], nil +} + +func (m *Buckets) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *Buckets) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i var l int _ = l - if m.ThresholdValue != 0 { - n += 9 + if len(m.List) > 0 { + for iNdEx := len(m.List) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.List[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintApi(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0xa + } + } + return len(dAtA) - i, nil +} + +func (m *Bucket) Marshal() (dAtA []byte, err error) { + size := m.Size() + dAtA = make([]byte, size) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) + if err != nil { + return nil, err + } + return dAtA[:n], nil +} + +func (m *Bucket) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *Bucket) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if m.Count != 0 { + i = encodeVarintApi(dAtA, i, uint64(m.Count)) + i-- + dAtA[i] = 0x18 + } + if m.Duration != 0 { + i = encodeVarintApi(dAtA, i, uint64(m.Duration)) + i-- + dAtA[i] = 0x10 + } + if m.Time != 0 { + i = encodeVarintApi(dAtA, i, uint64(m.Time)) + i-- + dAtA[i] = 0x8 + } + return len(dAtA) - i, nil +} + +func encodeVarintApi(dAtA []byte, offset int, v uint64) int { + offset -= sovApi(v) + base := offset + for v >= 1<<7 { + dAtA[offset] = uint8(v&0x7f | 0x80) + v >>= 7 + offset++ + } + dAtA[offset] = uint8(v) + return base +} +func (m *Empty) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + return n +} + +func (m *Condition) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if m.ConditionType != 0 { + n += 1 + sovApi(uint64(m.ConditionType)) + } + if len(m.Effects) > 0 { + for _, s := range m.Effects { + l = len(s) + n += 1 + l + sovApi(uint64(l)) + } + } + l = len(m.ConditionName) + if l > 0 { + n += 1 + l + sovApi(uint64(l)) + } + if m.MetCondition { + n += 2 + } + return n +} + +func (m *ThresholdMetResponse) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if m.ThresholdValue != 0 { + n += 9 } if m.ObservedValue != 0 { n += 9 @@ -1504,6 +1912,12 @@ func (m *ThresholdMetResponse) Size() (n int) { l = m.Condition.Size() n += 1 + l + sovApi(uint64(l)) } + if len(m.CandidatePods) > 0 { + for _, e := range m.CandidatePods { + l = e.Size() + n += 1 + l + sovApi(uint64(l)) + } + } return n } @@ -1526,6 +1940,12 @@ func (m *GetTopEvictionPodsRequest) Size() (n int) { if l > 0 { n += 1 + l + sovApi(uint64(l)) } + if len(m.CandidateEvictionRecords) > 0 { + for _, e := range m.CandidateEvictionRecords { + l = e.Size() + n += 1 + l + sovApi(uint64(l)) + } + } return n } @@ -1635,6 +2055,71 @@ func (m *DeletionOptions) Size() (n int) { return n } +func (m *EvictionRecord) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + l = len(m.Uid) + if l > 0 { + n += 1 + l + sovApi(uint64(l)) + } + if m.HasPdb { + n += 2 + } + if m.Buckets != nil { + l = m.Buckets.Size() + n += 1 + l + sovApi(uint64(l)) + } + if m.DisruptionsAllowed != 0 { + n += 1 + sovApi(uint64(m.DisruptionsAllowed)) + } + if m.CurrentHealthy != 0 { + n += 1 + sovApi(uint64(m.CurrentHealthy)) + } + if m.DesiredHealthy != 0 { + n += 1 + sovApi(uint64(m.DesiredHealthy)) + } + if m.ExpectedPods != 0 { + n += 1 + sovApi(uint64(m.ExpectedPods)) + } + return n +} + +func (m *Buckets) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if len(m.List) > 0 { + for _, e := range m.List { + l = e.Size() + n += 1 + l + sovApi(uint64(l)) + } + } + return n +} + +func (m *Bucket) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if m.Time != 0 { + n += 1 + sovApi(uint64(m.Time)) + } + if m.Duration != 0 { + n += 1 + sovApi(uint64(m.Duration)) + } + if m.Count != 0 { + n += 1 + sovApi(uint64(m.Count)) + } + return n +} + func sovApi(x uint64) (n int) { return (math_bits.Len64(x|1) + 6) / 7 } @@ -1667,6 +2152,11 @@ func (this *ThresholdMetResponse) String() string { if this == nil { return "nil" } + repeatedStringForCandidatePods := "[]*Pod{" + for _, f := range this.CandidatePods { + repeatedStringForCandidatePods += strings.Replace(fmt.Sprintf("%v", f), "Pod", "v1.Pod", 1) + "," + } + repeatedStringForCandidatePods += "}" s := strings.Join([]string{`&ThresholdMetResponse{`, `ThresholdValue:` + fmt.Sprintf("%v", this.ThresholdValue) + `,`, `ObservedValue:` + fmt.Sprintf("%v", this.ObservedValue) + `,`, @@ -1675,6 +2165,7 @@ func (this *ThresholdMetResponse) String() string { `EvictionScope:` + fmt.Sprintf("%v", this.EvictionScope) + `,`, `GracePeriodSeconds:` + fmt.Sprintf("%v", this.GracePeriodSeconds) + `,`, `Condition:` + strings.Replace(this.Condition.String(), "Condition", "Condition", 1) + `,`, + `CandidatePods:` + repeatedStringForCandidatePods + `,`, `}`, }, "") return s @@ -1688,10 +2179,16 @@ func (this *GetTopEvictionPodsRequest) String() string { repeatedStringForActivePods += strings.Replace(fmt.Sprintf("%v", f), "Pod", "v1.Pod", 1) + "," } repeatedStringForActivePods += "}" + repeatedStringForCandidateEvictionRecords := "[]*EvictionRecord{" + for _, f := range this.CandidateEvictionRecords { + repeatedStringForCandidateEvictionRecords += strings.Replace(f.String(), "EvictionRecord", "EvictionRecord", 1) + "," + } + repeatedStringForCandidateEvictionRecords += "}" s := strings.Join([]string{`&GetTopEvictionPodsRequest{`, `ActivePods:` + repeatedStringForActivePods + `,`, `TopN:` + fmt.Sprintf("%v", this.TopN) + `,`, `EvictionScope:` + fmt.Sprintf("%v", this.EvictionScope) + `,`, + `CandidateEvictionRecords:` + repeatedStringForCandidateEvictionRecords + `,`, `}`, }, "") return s @@ -1777,6 +2274,49 @@ func (this *DeletionOptions) String() string { }, "") return s } +func (this *EvictionRecord) String() string { + if this == nil { + return "nil" + } + s := strings.Join([]string{`&EvictionRecord{`, + `Uid:` + fmt.Sprintf("%v", this.Uid) + `,`, + `HasPdb:` + fmt.Sprintf("%v", this.HasPdb) + `,`, + `Buckets:` + strings.Replace(this.Buckets.String(), "Buckets", "Buckets", 1) + `,`, + `DisruptionsAllowed:` + fmt.Sprintf("%v", this.DisruptionsAllowed) + `,`, + `CurrentHealthy:` + fmt.Sprintf("%v", this.CurrentHealthy) + `,`, + `DesiredHealthy:` + fmt.Sprintf("%v", this.DesiredHealthy) + `,`, + `ExpectedPods:` + fmt.Sprintf("%v", this.ExpectedPods) + `,`, + `}`, + }, "") + return s +} +func (this *Buckets) String() string { + if this == nil { + return "nil" + } + repeatedStringForList := "[]*Bucket{" + for _, f := range this.List { + repeatedStringForList += strings.Replace(f.String(), "Bucket", "Bucket", 1) + "," + } + repeatedStringForList += "}" + s := strings.Join([]string{`&Buckets{`, + `List:` + repeatedStringForList + `,`, + `}`, + }, "") + return s +} +func (this *Bucket) String() string { + if this == nil { + return "nil" + } + s := strings.Join([]string{`&Bucket{`, + `Time:` + fmt.Sprintf("%v", this.Time) + `,`, + `Duration:` + fmt.Sprintf("%v", this.Duration) + `,`, + `Count:` + fmt.Sprintf("%v", this.Count) + `,`, + `}`, + }, "") + return s +} func valueToStringApi(v interface{}) string { rv := reflect.ValueOf(v) if rv.IsNil() { @@ -2164,6 +2704,40 @@ func (m *ThresholdMetResponse) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex + case 8: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field CandidatePods", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowApi + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthApi + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthApi + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.CandidatePods = append(m.CandidatePods, &v1.Pod{}) + if err := m.CandidatePods[len(m.CandidatePods)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipApi(dAtA[iNdEx:]) @@ -2299,6 +2873,40 @@ func (m *GetTopEvictionPodsRequest) Unmarshal(dAtA []byte) error { } m.EvictionScope = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex + case 4: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field CandidateEvictionRecords", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowApi + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthApi + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthApi + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.CandidateEvictionRecords = append(m.CandidateEvictionRecords, &EvictionRecord{}) + if err := m.CandidateEvictionRecords[len(m.CandidateEvictionRecords)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipApi(dAtA[iNdEx:]) @@ -3001,6 +3609,411 @@ func (m *DeletionOptions) Unmarshal(dAtA []byte) error { } return nil } +func (m *EvictionRecord) Unmarshal(dAtA []byte) error { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + preIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowApi + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: EvictionRecord: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: EvictionRecord: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Uid", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowApi + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthApi + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthApi + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Uid = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 2: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field HasPdb", wireType) + } + var v int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowApi + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + v |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + m.HasPdb = bool(v != 0) + case 3: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Buckets", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowApi + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthApi + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthApi + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if m.Buckets == nil { + m.Buckets = &Buckets{} + } + if err := m.Buckets.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + case 4: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field DisruptionsAllowed", wireType) + } + m.DisruptionsAllowed = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowApi + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.DisruptionsAllowed |= int32(b&0x7F) << shift + if b < 0x80 { + break + } + } + case 5: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field CurrentHealthy", wireType) + } + m.CurrentHealthy = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowApi + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.CurrentHealthy |= int32(b&0x7F) << shift + if b < 0x80 { + break + } + } + case 6: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field DesiredHealthy", wireType) + } + m.DesiredHealthy = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowApi + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.DesiredHealthy |= int32(b&0x7F) << shift + if b < 0x80 { + break + } + } + case 7: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field ExpectedPods", wireType) + } + m.ExpectedPods = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowApi + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.ExpectedPods |= int32(b&0x7F) << shift + if b < 0x80 { + break + } + } + default: + iNdEx = preIndex + skippy, err := skipApi(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthApi + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} +func (m *Buckets) Unmarshal(dAtA []byte) error { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + preIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowApi + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: Buckets: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: Buckets: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field List", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowApi + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthApi + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthApi + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.List = append(m.List, &Bucket{}) + if err := m.List[len(m.List)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipApi(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthApi + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} +func (m *Bucket) Unmarshal(dAtA []byte) error { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + preIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowApi + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: Bucket: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: Bucket: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field Time", wireType) + } + m.Time = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowApi + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.Time |= int64(b&0x7F) << shift + if b < 0x80 { + break + } + } + case 2: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field Duration", wireType) + } + m.Duration = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowApi + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.Duration |= int64(b&0x7F) << shift + if b < 0x80 { + break + } + } + case 3: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field Count", wireType) + } + m.Count = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowApi + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.Count |= int64(b&0x7F) << shift + if b < 0x80 { + break + } + } + default: + iNdEx = preIndex + skippy, err := skipApi(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthApi + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} func skipApi(dAtA []byte) (n int, err error) { l := len(dAtA) iNdEx := 0 diff --git a/pkg/protocol/evictionplugin/v1alpha1/api.proto b/pkg/protocol/evictionplugin/v1alpha1/api.proto index 254a2d98..bc9ac440 100644 --- a/pkg/protocol/evictionplugin/v1alpha1/api.proto +++ b/pkg/protocol/evictionplugin/v1alpha1/api.proto @@ -65,12 +65,14 @@ message ThresholdMetResponse { string eviction_scope = 5; int64 grace_period_seconds = 6; Condition condition = 7; + repeated k8s.io.api.core.v1.Pod candidate_pods = 8; } message GetTopEvictionPodsRequest { repeated k8s.io.api.core.v1.Pod active_pods = 1; uint64 topN = 2; string eviction_scope = 3; + repeated EvictionRecord candidate_eviction_records = 4; } message GetTopEvictionPodsResponse { @@ -103,6 +105,26 @@ message DeletionOptions { int64 grace_period_seconds = 1; } +message EvictionRecord { + string uid = 1; // Corresponding to the pod's UID to avoid repeated references to the pod + bool has_pdb = 2; + Buckets buckets = 3; + int32 disruptions_allowed = 4; // The number of allowed disruptions (currentHealthy - desiredHealthy) + int32 current_healthy = 5; // The number of currently healthy Pods (actually passing the health check) + int32 desired_healthy = 6; // The minimum number of healthy pods that should be maintained according to the rules + int32 expected_pods = 7; // Total number of matched Pods +} + +message Buckets { + repeated Bucket list = 1; +} + +message Bucket { + int64 time = 1; + int64 duration = 2; + int64 count = 3; +} + service EvictionPlugin { rpc GetToken(Empty) returns (GetTokenResponse) {} rpc ThresholdMet(Empty) returns (ThresholdMetResponse) {} From 4b8c5c5ddc21be18a60c77b264d02784ae3023f6 Mon Sep 17 00:00:00 2001 From: luomingmeng Date: Wed, 6 Aug 2025 12:49:27 +0800 Subject: [PATCH 10/27] feat(evictionplugin): add active pods to ThresholdMet request Add GetThresholdMetRequest message to include active pods in ThresholdMet RPC call --- .../evictionplugin/v1alpha1/api.pb.go | 379 +++++++++++++----- .../evictionplugin/v1alpha1/api.proto | 6 +- 2 files changed, 293 insertions(+), 92 deletions(-) diff --git a/pkg/protocol/evictionplugin/v1alpha1/api.pb.go b/pkg/protocol/evictionplugin/v1alpha1/api.pb.go index 0e4886c3..b464100f 100644 --- a/pkg/protocol/evictionplugin/v1alpha1/api.pb.go +++ b/pkg/protocol/evictionplugin/v1alpha1/api.pb.go @@ -231,6 +231,51 @@ func (m *Condition) GetMetCondition() bool { return false } +type GetThresholdMetRequest struct { + ActivePods []*v1.Pod `protobuf:"bytes,1,rep,name=active_pods,json=activePods,proto3" json:"active_pods,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *GetThresholdMetRequest) Reset() { *m = GetThresholdMetRequest{} } +func (*GetThresholdMetRequest) ProtoMessage() {} +func (*GetThresholdMetRequest) Descriptor() ([]byte, []int) { + return fileDescriptor_78941759e4c5eff9, []int{2} +} +func (m *GetThresholdMetRequest) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *GetThresholdMetRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_GetThresholdMetRequest.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalToSizedBuffer(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *GetThresholdMetRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_GetThresholdMetRequest.Merge(m, src) +} +func (m *GetThresholdMetRequest) XXX_Size() int { + return m.Size() +} +func (m *GetThresholdMetRequest) XXX_DiscardUnknown() { + xxx_messageInfo_GetThresholdMetRequest.DiscardUnknown(m) +} + +var xxx_messageInfo_GetThresholdMetRequest proto.InternalMessageInfo + +func (m *GetThresholdMetRequest) GetActivePods() []*v1.Pod { + if m != nil { + return m.ActivePods + } + return nil +} + type ThresholdMetResponse struct { ThresholdValue float64 `protobuf:"fixed64,1,opt,name=threshold_value,json=thresholdValue,proto3" json:"threshold_value,omitempty"` ObservedValue float64 `protobuf:"fixed64,2,opt,name=observed_value,json=observedValue,proto3" json:"observed_value,omitempty"` @@ -247,7 +292,7 @@ type ThresholdMetResponse struct { func (m *ThresholdMetResponse) Reset() { *m = ThresholdMetResponse{} } func (*ThresholdMetResponse) ProtoMessage() {} func (*ThresholdMetResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_78941759e4c5eff9, []int{2} + return fileDescriptor_78941759e4c5eff9, []int{3} } func (m *ThresholdMetResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -344,7 +389,7 @@ type GetTopEvictionPodsRequest struct { func (m *GetTopEvictionPodsRequest) Reset() { *m = GetTopEvictionPodsRequest{} } func (*GetTopEvictionPodsRequest) ProtoMessage() {} func (*GetTopEvictionPodsRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_78941759e4c5eff9, []int{3} + return fileDescriptor_78941759e4c5eff9, []int{4} } func (m *GetTopEvictionPodsRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -411,7 +456,7 @@ type GetTopEvictionPodsResponse struct { func (m *GetTopEvictionPodsResponse) Reset() { *m = GetTopEvictionPodsResponse{} } func (*GetTopEvictionPodsResponse) ProtoMessage() {} func (*GetTopEvictionPodsResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_78941759e4c5eff9, []int{4} + return fileDescriptor_78941759e4c5eff9, []int{5} } func (m *GetTopEvictionPodsResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -467,7 +512,7 @@ type EvictPod struct { func (m *EvictPod) Reset() { *m = EvictPod{} } func (*EvictPod) ProtoMessage() {} func (*EvictPod) Descriptor() ([]byte, []int) { - return fileDescriptor_78941759e4c5eff9, []int{5} + return fileDescriptor_78941759e4c5eff9, []int{6} } func (m *EvictPod) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -540,7 +585,7 @@ type GetEvictPodsRequest struct { func (m *GetEvictPodsRequest) Reset() { *m = GetEvictPodsRequest{} } func (*GetEvictPodsRequest) ProtoMessage() {} func (*GetEvictPodsRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_78941759e4c5eff9, []int{6} + return fileDescriptor_78941759e4c5eff9, []int{7} } func (m *GetEvictPodsRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -586,7 +631,7 @@ type GetEvictPodsResponse struct { func (m *GetEvictPodsResponse) Reset() { *m = GetEvictPodsResponse{} } func (*GetEvictPodsResponse) ProtoMessage() {} func (*GetEvictPodsResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_78941759e4c5eff9, []int{7} + return fileDescriptor_78941759e4c5eff9, []int{8} } func (m *GetEvictPodsResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -638,7 +683,7 @@ type GetTokenResponse struct { func (m *GetTokenResponse) Reset() { *m = GetTokenResponse{} } func (*GetTokenResponse) ProtoMessage() {} func (*GetTokenResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_78941759e4c5eff9, []int{8} + return fileDescriptor_78941759e4c5eff9, []int{9} } func (m *GetTokenResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -683,7 +728,7 @@ type DeletionOptions struct { func (m *DeletionOptions) Reset() { *m = DeletionOptions{} } func (*DeletionOptions) ProtoMessage() {} func (*DeletionOptions) Descriptor() ([]byte, []int) { - return fileDescriptor_78941759e4c5eff9, []int{9} + return fileDescriptor_78941759e4c5eff9, []int{10} } func (m *DeletionOptions) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -734,7 +779,7 @@ type EvictionRecord struct { func (m *EvictionRecord) Reset() { *m = EvictionRecord{} } func (*EvictionRecord) ProtoMessage() {} func (*EvictionRecord) Descriptor() ([]byte, []int) { - return fileDescriptor_78941759e4c5eff9, []int{10} + return fileDescriptor_78941759e4c5eff9, []int{11} } func (m *EvictionRecord) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -821,7 +866,7 @@ type Buckets struct { func (m *Buckets) Reset() { *m = Buckets{} } func (*Buckets) ProtoMessage() {} func (*Buckets) Descriptor() ([]byte, []int) { - return fileDescriptor_78941759e4c5eff9, []int{11} + return fileDescriptor_78941759e4c5eff9, []int{12} } func (m *Buckets) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -868,7 +913,7 @@ type Bucket struct { func (m *Bucket) Reset() { *m = Bucket{} } func (*Bucket) ProtoMessage() {} func (*Bucket) Descriptor() ([]byte, []int) { - return fileDescriptor_78941759e4c5eff9, []int{12} + return fileDescriptor_78941759e4c5eff9, []int{13} } func (m *Bucket) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -924,6 +969,7 @@ func init() { proto.RegisterEnum("evictionplugin.v1alpha1.ConditionType", ConditionType_name, ConditionType_value) proto.RegisterType((*Empty)(nil), "evictionplugin.v1alpha1.Empty") proto.RegisterType((*Condition)(nil), "evictionplugin.v1alpha1.Condition") + proto.RegisterType((*GetThresholdMetRequest)(nil), "evictionplugin.v1alpha1.GetThresholdMetRequest") proto.RegisterType((*ThresholdMetResponse)(nil), "evictionplugin.v1alpha1.ThresholdMetResponse") proto.RegisterType((*GetTopEvictionPodsRequest)(nil), "evictionplugin.v1alpha1.GetTopEvictionPodsRequest") proto.RegisterType((*GetTopEvictionPodsResponse)(nil), "evictionplugin.v1alpha1.GetTopEvictionPodsResponse") @@ -940,80 +986,80 @@ func init() { func init() { proto.RegisterFile("v1alpha1/api.proto", fileDescriptor_78941759e4c5eff9) } var fileDescriptor_78941759e4c5eff9 = []byte{ - // 1154 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x56, 0xcb, 0x8e, 0x1b, 0x45, - 0x17, 0x76, 0x4f, 0x7b, 0x7c, 0x39, 0xbe, 0xc4, 0xa9, 0x8c, 0xfe, 0xf8, 0xf7, 0xc2, 0x31, 0x1d, - 0x41, 0x9c, 0x11, 0xb1, 0x19, 0x07, 0xa1, 0x08, 0xa4, 0x28, 0x93, 0x19, 0x93, 0x44, 0x62, 0x6c, - 0xab, 0x6c, 0x81, 0x60, 0xd3, 0x6a, 0x77, 0x9f, 0xb1, 0x5b, 0x63, 0xbb, 0x9a, 0xee, 0xb2, 0x61, - 0x56, 0xf0, 0x08, 0xac, 0xd9, 0xf0, 0x00, 0xbc, 0x01, 0x2b, 0x96, 0x59, 0xb2, 0x64, 0x49, 0x86, - 0x67, 0x40, 0x6c, 0x51, 0x55, 0x75, 0xf7, 0xd8, 0x13, 0xdb, 0x13, 0xc8, 0xaa, 0xeb, 0x9c, 0xfa, - 0xea, 0xd4, 0x77, 0xae, 0xd5, 0x40, 0x16, 0x07, 0xd6, 0xc4, 0x1b, 0x5b, 0x07, 0x4d, 0xcb, 0x73, - 0x1b, 0x9e, 0xcf, 0x38, 0x23, 0xb7, 0x71, 0xe1, 0xda, 0xdc, 0x65, 0x33, 0x6f, 0x32, 0x1f, 0xb9, - 0xb3, 0x46, 0x04, 0xa9, 0x3c, 0x18, 0xb9, 0x7c, 0x3c, 0x1f, 0x36, 0x6c, 0x36, 0x6d, 0x8e, 0xd8, - 0x88, 0x35, 0x25, 0x7e, 0x38, 0x3f, 0x95, 0x92, 0x14, 0xe4, 0x4a, 0xd9, 0xa9, 0x18, 0x67, 0x8f, - 0x82, 0x86, 0xcb, 0x84, 0xe5, 0xa6, 0xcd, 0x7c, 0x6c, 0x2e, 0x0e, 0x9a, 0x23, 0x9c, 0xa1, 0x6f, - 0x71, 0x74, 0x14, 0xc6, 0x48, 0xc3, 0x6e, 0x7b, 0xea, 0xf1, 0x73, 0xe3, 0x57, 0x0d, 0xb2, 0x47, - 0x6c, 0xe6, 0xb8, 0xe2, 0x62, 0x72, 0x02, 0x45, 0x3b, 0x12, 0x4c, 0x7e, 0xee, 0x61, 0x59, 0xab, - 0x69, 0xf5, 0x62, 0xeb, 0xbd, 0xc6, 0x06, 0x6e, 0x8d, 0xf8, 0xec, 0xe0, 0xdc, 0x43, 0x5a, 0xb0, - 0x97, 0x45, 0x52, 0x86, 0x34, 0x9e, 0x9e, 0xa2, 0xcd, 0x83, 0xf2, 0x4e, 0x4d, 0xaf, 0x67, 0x69, - 0x24, 0x92, 0x77, 0x97, 0x2f, 0x9a, 0x59, 0x53, 0x2c, 0xeb, 0x35, 0xad, 0x9e, 0x5d, 0x32, 0xd0, - 0xb1, 0xa6, 0x48, 0xee, 0x42, 0x61, 0x8a, 0xdc, 0x8c, 0x95, 0xe5, 0x64, 0x4d, 0xab, 0x67, 0x68, - 0x7e, 0x8a, 0x3c, 0xbe, 0xd8, 0xb8, 0xd0, 0x61, 0x6f, 0x30, 0xf6, 0x31, 0x18, 0xb3, 0x89, 0x73, - 0x82, 0x9c, 0x62, 0xe0, 0xb1, 0x59, 0x80, 0xe4, 0x1e, 0xdc, 0xe0, 0x91, 0xde, 0x5c, 0x58, 0x93, - 0xb9, 0x72, 0x47, 0xa3, 0xc5, 0x58, 0xfd, 0xb9, 0xd0, 0x0a, 0x36, 0x6c, 0x18, 0xa0, 0xbf, 0xc0, - 0x08, 0xb7, 0x23, 0x71, 0x85, 0x48, 0xab, 0x60, 0x5f, 0x02, 0xb9, 0xb4, 0xc7, 0x3c, 0x11, 0x50, - 0xe6, 0x4b, 0xe2, 0xc5, 0xd6, 0xfe, 0xc6, 0x08, 0xc5, 0xd4, 0xba, 0xe1, 0x09, 0x7a, 0x93, 0x5f, - 0x55, 0x91, 0x63, 0xc8, 0x08, 0x47, 0x65, 0xc8, 0x93, 0xd2, 0xe0, 0xfd, 0xeb, 0x0d, 0x9e, 0x20, - 0x97, 0x51, 0x4f, 0x4f, 0xd5, 0x42, 0xf8, 0x11, 0x1d, 0x32, 0x03, 0x9b, 0x79, 0x58, 0xde, 0x55, - 0x51, 0x8d, 0xb4, 0x7d, 0xa1, 0x24, 0x1f, 0xc0, 0xde, 0xc8, 0xb7, 0x6c, 0x34, 0x3d, 0xf4, 0x5d, - 0xe6, 0x98, 0x01, 0x8a, 0x00, 0x07, 0xe5, 0x54, 0x4d, 0xab, 0xeb, 0x94, 0xc8, 0xbd, 0x9e, 0xdc, - 0xea, 0xab, 0x1d, 0xf2, 0x04, 0xb2, 0x97, 0x39, 0x48, 0xd7, 0xb4, 0x7a, 0xae, 0x65, 0x5c, 0x5f, - 0x12, 0xf4, 0xf2, 0x10, 0x79, 0x0c, 0x45, 0xdb, 0x9a, 0x39, 0xae, 0x63, 0x71, 0x34, 0x3d, 0xe6, - 0x04, 0xe5, 0x4c, 0x4d, 0xaf, 0xe7, 0x5a, 0xb7, 0x1b, 0xaa, 0x5a, 0x1b, 0xa2, 0x0f, 0x44, 0xb5, - 0x36, 0x16, 0x07, 0x8d, 0x1e, 0x73, 0x68, 0x21, 0x86, 0xf7, 0x98, 0x13, 0x18, 0x7f, 0x6b, 0xf0, - 0xff, 0x67, 0xc8, 0x07, 0xcc, 0x6b, 0x87, 0xd7, 0x0a, 0x35, 0xc5, 0xaf, 0xe7, 0x18, 0x70, 0xf2, - 0x08, 0x72, 0x96, 0xcd, 0xdd, 0x45, 0x68, 0x5a, 0xdb, 0x6e, 0x1a, 0x14, 0x56, 0x18, 0x20, 0x04, - 0x92, 0x9c, 0x79, 0x1d, 0x99, 0xf0, 0x24, 0x95, 0xeb, 0x35, 0x61, 0xd4, 0xd7, 0x85, 0x11, 0xa1, - 0x72, 0xe9, 0x52, 0x7c, 0xc0, 0x47, 0x9b, 0xf9, 0x4e, 0x50, 0x4e, 0x4a, 0x0e, 0xf7, 0x36, 0x46, - 0x29, 0x72, 0x83, 0x4a, 0x3c, 0x2d, 0xc7, 0xa6, 0x56, 0x37, 0x02, 0xe3, 0x67, 0x0d, 0x2a, 0xeb, - 0x3c, 0x0f, 0x8b, 0xfc, 0x11, 0xe4, 0xb8, 0xe5, 0x8f, 0x90, 0xbf, 0x99, 0xeb, 0x0a, 0x2b, 0x5d, - 0xef, 0x43, 0xc9, 0xc1, 0x09, 0x4a, 0xd6, 0xcc, 0x13, 0x9f, 0x40, 0x86, 0x21, 0xd7, 0xaa, 0x6f, - 0x64, 0x7d, 0x1c, 0x1e, 0xe8, 0x2a, 0x3c, 0xbd, 0xe1, 0xac, 0x2a, 0x8c, 0xbf, 0x34, 0xc8, 0x48, - 0x9e, 0x3d, 0xe6, 0x90, 0xfb, 0xa0, 0x7b, 0xcc, 0x91, 0x4d, 0xb7, 0x85, 0x93, 0xc0, 0x90, 0xff, - 0x41, 0xca, 0x47, 0x2b, 0x60, 0x33, 0x49, 0x21, 0x4b, 0x43, 0x69, 0x2d, 0x49, 0xfd, 0x2d, 0x49, - 0x92, 0x3b, 0x90, 0x3b, 0x65, 0xbe, 0x1d, 0x66, 0x2d, 0x1c, 0x2a, 0x20, 0x55, 0x92, 0xbb, 0xe8, - 0x90, 0x38, 0xa1, 0xca, 0xba, 0x1a, 0x52, 0xaa, 0x9d, 0x48, 0xb4, 0xd7, 0x93, 0x5b, 0x62, 0x52, - 0x19, 0x5d, 0xb8, 0xf5, 0x0c, 0x79, 0xe4, 0xf9, 0xdb, 0x17, 0xa6, 0xf1, 0xa3, 0x06, 0x7b, 0xab, - 0x16, 0xc3, 0x84, 0x3f, 0x01, 0x90, 0xf7, 0x2f, 0x5b, 0x7c, 0x67, 0x7b, 0x99, 0x09, 0xdb, 0x59, - 0x8c, 0x2c, 0xad, 0x76, 0xf3, 0xce, 0x7f, 0xe8, 0x66, 0xa3, 0x0e, 0x25, 0x59, 0x92, 0x67, 0x38, - 0x8b, 0x79, 0xed, 0xc1, 0x2e, 0x17, 0x0a, 0x99, 0xee, 0x2c, 0x55, 0x82, 0x71, 0x04, 0x37, 0xae, - 0xa4, 0x63, 0xe3, 0xf8, 0xd1, 0x36, 0x8d, 0x1f, 0xe3, 0xa7, 0x1d, 0x28, 0xae, 0xb6, 0x05, 0x29, - 0x81, 0x3e, 0x77, 0x9d, 0xf0, 0x2e, 0xb1, 0x24, 0xb7, 0x21, 0x3d, 0xb6, 0x02, 0xd3, 0x73, 0x86, - 0xd2, 0xa7, 0x0c, 0x4d, 0x8d, 0xad, 0xa0, 0xe7, 0x0c, 0xc9, 0xc7, 0x90, 0x1e, 0xce, 0xed, 0x33, - 0xe4, 0x51, 0xe5, 0xd4, 0x36, 0x3a, 0xfb, 0x54, 0xe1, 0x68, 0x74, 0x80, 0x34, 0xe1, 0x96, 0xe3, - 0x06, 0xfe, 0x5c, 0x51, 0x37, 0xad, 0xc9, 0x84, 0x7d, 0x83, 0x8e, 0xac, 0x98, 0x5d, 0x4a, 0x96, - 0xb6, 0x0e, 0xd5, 0x8e, 0x78, 0x73, 0xec, 0xb9, 0xef, 0xe3, 0x8c, 0x9b, 0x63, 0xb4, 0x26, 0x7c, - 0x7c, 0x2e, 0x8b, 0x66, 0x97, 0x16, 0x43, 0xf5, 0x73, 0xa5, 0x15, 0x40, 0x07, 0x03, 0xd7, 0x47, - 0x27, 0x06, 0xa6, 0x14, 0x30, 0x54, 0x47, 0xc0, 0xbb, 0x50, 0xc0, 0x6f, 0x3d, 0xb4, 0x39, 0x3a, - 0x2a, 0xe5, 0x69, 0x09, 0xcb, 0x47, 0x4a, 0x59, 0x2d, 0x8f, 0x21, 0x1d, 0x72, 0x27, 0x0f, 0x21, - 0x39, 0x71, 0x03, 0x1e, 0x56, 0xc6, 0x9d, 0x6b, 0x7c, 0xa5, 0x12, 0x6c, 0x74, 0x20, 0xa5, 0x64, - 0x39, 0x10, 0xdd, 0x29, 0x86, 0xd9, 0x90, 0x6b, 0x52, 0x81, 0x8c, 0x33, 0xf7, 0xad, 0xb8, 0x5e, - 0x74, 0x1a, 0xcb, 0x22, 0xed, 0x36, 0x9b, 0xcf, 0xb8, 0x8c, 0xad, 0x4e, 0x95, 0xb0, 0xff, 0x09, - 0x94, 0xae, 0x3e, 0x53, 0x24, 0x07, 0xe9, 0x4e, 0x77, 0x60, 0x9e, 0xb4, 0x07, 0xa5, 0x04, 0xc9, - 0x43, 0xa6, 0xdf, 0xfd, 0x54, 0x49, 0x9a, 0x90, 0x9e, 0x1f, 0xd2, 0x63, 0x29, 0xed, 0xec, 0x7f, - 0x08, 0x37, 0x5f, 0x7b, 0x34, 0x49, 0x01, 0xb2, 0x9f, 0xb5, 0xfb, 0x7d, 0x73, 0xf0, 0xfc, 0xb0, - 0x53, 0x4a, 0x90, 0x12, 0xe4, 0x9f, 0xd1, 0xf6, 0xe1, 0xa0, 0x4d, 0x95, 0x46, 0xdb, 0xff, 0x08, - 0x0a, 0x2b, 0x3f, 0x23, 0x84, 0x40, 0xb1, 0xd3, 0x3d, 0x6e, 0x9b, 0x47, 0xdd, 0xce, 0xf1, 0x8b, - 0xc1, 0x8b, 0xae, 0x38, 0x76, 0x13, 0x0a, 0x47, 0x1d, 0xba, 0xa4, 0xd2, 0x5a, 0xbf, 0xe8, 0x97, - 0xc5, 0xa5, 0x1a, 0x9a, 0x7c, 0x01, 0x99, 0xa8, 0xbc, 0x49, 0x75, 0x73, 0x6b, 0x89, 0x1f, 0xa8, - 0xca, 0xe6, 0x77, 0xfa, 0x6a, 0x87, 0x18, 0x09, 0x62, 0x42, 0x7e, 0x39, 0x2c, 0xd7, 0x1a, 0x7f, - 0xf0, 0x46, 0x3f, 0x01, 0x4b, 0x17, 0x7c, 0x07, 0xe4, 0xf5, 0xb7, 0x82, 0xb4, 0xb6, 0x73, 0x5c, - 0xf7, 0xa4, 0x56, 0x1e, 0xfe, 0xab, 0x33, 0x31, 0x81, 0x29, 0xe4, 0x97, 0xa7, 0x16, 0x79, 0x7f, - 0x9b, 0x99, 0xab, 0xe3, 0x72, 0x8b, 0xbf, 0xeb, 0x46, 0xa1, 0x91, 0x78, 0x5a, 0x7f, 0xf9, 0xaa, - 0xaa, 0xfd, 0xfe, 0xaa, 0x9a, 0xf8, 0xfe, 0xa2, 0xaa, 0xbd, 0xbc, 0xa8, 0x6a, 0xbf, 0x5d, 0x54, - 0xb5, 0x3f, 0x2e, 0xaa, 0xda, 0x0f, 0x7f, 0x56, 0x13, 0x5f, 0x41, 0xa3, 0x19, 0x19, 0x18, 0xa6, - 0xe4, 0x8f, 0xef, 0xc3, 0x7f, 0x02, 0x00, 0x00, 0xff, 0xff, 0x5e, 0x2f, 0x32, 0x4d, 0x7a, 0x0b, - 0x00, 0x00, + // 1168 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x56, 0xcd, 0x6e, 0x23, 0x45, + 0x10, 0xf6, 0x64, 0x1c, 0xff, 0x94, 0x7f, 0xd6, 0xdb, 0x1b, 0x6d, 0x8c, 0x0f, 0x5e, 0x33, 0x2b, + 0x58, 0x6f, 0xc4, 0xda, 0xc4, 0x41, 0x28, 0x02, 0x69, 0xb5, 0xd9, 0xc4, 0x24, 0x2b, 0x11, 0xdb, + 0x6a, 0x5b, 0x20, 0xb8, 0x8c, 0xc6, 0xd3, 0x1d, 0x7b, 0x14, 0xdb, 0x3d, 0xcc, 0xb4, 0x0d, 0x39, + 0xc1, 0x23, 0x70, 0xe6, 0xc2, 0x03, 0xf0, 0x12, 0x1c, 0x57, 0xe2, 0xc2, 0x91, 0x23, 0x1b, 0x9e, + 0x01, 0x71, 0x45, 0xdd, 0x3d, 0x33, 0xb1, 0x13, 0xdb, 0x59, 0xc8, 0x69, 0xa6, 0xaa, 0xbf, 0xaa, + 0xae, 0xaa, 0xaf, 0xba, 0xba, 0x01, 0xcd, 0x76, 0xad, 0x91, 0x3b, 0xb4, 0x76, 0xeb, 0x96, 0xeb, + 0xd4, 0x5c, 0x8f, 0x71, 0x86, 0xb6, 0xe9, 0xcc, 0xb1, 0xb9, 0xc3, 0x26, 0xee, 0x68, 0x3a, 0x70, + 0x26, 0xb5, 0x10, 0x52, 0x7a, 0x36, 0x70, 0xf8, 0x70, 0xda, 0xaf, 0xd9, 0x6c, 0x5c, 0x1f, 0xb0, + 0x01, 0xab, 0x4b, 0x7c, 0x7f, 0x7a, 0x26, 0x25, 0x29, 0xc8, 0x3f, 0xe5, 0xa7, 0x64, 0x9c, 0xef, + 0xfb, 0x35, 0x87, 0x09, 0xcf, 0x75, 0x9b, 0x79, 0xb4, 0x3e, 0xdb, 0xad, 0x0f, 0xe8, 0x84, 0x7a, + 0x16, 0xa7, 0x44, 0x61, 0x8c, 0x24, 0x6c, 0x36, 0xc7, 0x2e, 0xbf, 0x30, 0x7e, 0xd5, 0x20, 0x7d, + 0xc8, 0x26, 0xc4, 0x11, 0x1b, 0xa3, 0x53, 0xc8, 0xdb, 0xa1, 0x60, 0xf2, 0x0b, 0x97, 0x16, 0xb5, + 0x8a, 0x56, 0xcd, 0x37, 0xde, 0xaf, 0xad, 0x88, 0xad, 0x16, 0xd9, 0xf6, 0x2e, 0x5c, 0x8a, 0x73, + 0xf6, 0xbc, 0x88, 0x8a, 0x90, 0xa4, 0x67, 0x67, 0xd4, 0xe6, 0x7e, 0x71, 0xa3, 0xa2, 0x57, 0xd3, + 0x38, 0x14, 0xd1, 0x7b, 0xf3, 0x1b, 0x4d, 0xac, 0x31, 0x2d, 0xea, 0x15, 0xad, 0x9a, 0x9e, 0x73, + 0xd0, 0xb2, 0xc6, 0x14, 0x3d, 0x86, 0xdc, 0x98, 0x72, 0x33, 0x52, 0x16, 0xe3, 0x15, 0xad, 0x9a, + 0xc2, 0xd9, 0x31, 0xe5, 0xd1, 0xc6, 0x06, 0x86, 0x87, 0xc7, 0x94, 0xf7, 0x86, 0x1e, 0xf5, 0x87, + 0x6c, 0x44, 0x4e, 0x29, 0xc7, 0xf4, 0x9b, 0x29, 0xf5, 0x39, 0xda, 0x87, 0x8c, 0x65, 0x73, 0x67, + 0x46, 0x4d, 0x97, 0x11, 0xbf, 0xa8, 0x55, 0xf4, 0x6a, 0xa6, 0xb1, 0x5d, 0x53, 0xf5, 0xa9, 0x89, + 0xca, 0x8b, 0xfa, 0xd4, 0x66, 0xbb, 0xb5, 0x0e, 0x23, 0x18, 0x14, 0xb6, 0xc3, 0x88, 0x6f, 0x5c, + 0xea, 0xb0, 0xb5, 0xe8, 0xd1, 0x77, 0xd9, 0xc4, 0xa7, 0xe8, 0x09, 0xdc, 0xe3, 0xa1, 0xde, 0x9c, + 0x59, 0xa3, 0xa9, 0x2a, 0x91, 0x86, 0xf3, 0x91, 0xfa, 0x0b, 0xa1, 0x15, 0x19, 0xb2, 0xbe, 0x4f, + 0xbd, 0x19, 0x0d, 0x71, 0x1b, 0x12, 0x97, 0x0b, 0xb5, 0x0a, 0xf6, 0x15, 0xa0, 0x2b, 0x7f, 0xcc, + 0x15, 0x24, 0x31, 0x4f, 0x16, 0x23, 0xdf, 0xd8, 0x59, 0x59, 0xf5, 0x28, 0xb4, 0x76, 0x60, 0x81, + 0xef, 0xf3, 0xeb, 0x2a, 0x74, 0x04, 0x29, 0x51, 0x3c, 0x49, 0x63, 0x5c, 0x3a, 0x7c, 0x7a, 0xbb, + 0xc3, 0x53, 0xca, 0x25, 0x93, 0xc9, 0xb1, 0xfa, 0x11, 0x79, 0x84, 0x46, 0xa6, 0x6f, 0x33, 0x97, + 0x16, 0x37, 0x15, 0x53, 0xa1, 0xb6, 0x2b, 0x94, 0xe8, 0x43, 0xd8, 0x1a, 0x78, 0x96, 0x4d, 0x4d, + 0x97, 0x7a, 0x0e, 0x23, 0xa6, 0x4f, 0x05, 0x69, 0x7e, 0x31, 0x51, 0xd1, 0xaa, 0x3a, 0x46, 0x72, + 0xad, 0x23, 0x97, 0xba, 0x6a, 0x05, 0xbd, 0x80, 0xf4, 0x15, 0xaf, 0xc9, 0x8a, 0x56, 0xcd, 0x34, + 0x8c, 0xdb, 0xdb, 0x0c, 0x5f, 0x19, 0xa1, 0xe7, 0x90, 0xb7, 0xad, 0x09, 0x71, 0x88, 0xc5, 0x03, + 0x86, 0x53, 0xeb, 0x19, 0xce, 0x45, 0x70, 0x49, 0xf2, 0x3f, 0x1a, 0xbc, 0x23, 0x3a, 0x87, 0xb9, + 0xcd, 0x60, 0x5b, 0xa1, 0xbe, 0x73, 0xf3, 0x20, 0x04, 0x71, 0xce, 0xdc, 0x96, 0x24, 0x3c, 0x8e, + 0xe5, 0xff, 0x92, 0x32, 0xea, 0xcb, 0xca, 0x48, 0xa1, 0x74, 0x95, 0x52, 0x64, 0xe0, 0x51, 0x9b, + 0x79, 0xc4, 0x2f, 0xc6, 0x65, 0x0c, 0x4f, 0x56, 0x56, 0x29, 0x4c, 0x03, 0x4b, 0x3c, 0x2e, 0x46, + 0xae, 0x16, 0x17, 0x7c, 0xe3, 0x17, 0x0d, 0x4a, 0xcb, 0x32, 0x0f, 0x9a, 0x7c, 0x1f, 0x32, 0xdc, + 0xf2, 0x06, 0x94, 0xbf, 0x5d, 0xea, 0x0a, 0x2b, 0x53, 0xef, 0x42, 0x81, 0xd0, 0x11, 0x95, 0x51, + 0x33, 0x57, 0x7c, 0x7c, 0x59, 0x86, 0x4c, 0xa3, 0xba, 0x32, 0xea, 0xa3, 0xc0, 0xa0, 0xad, 0xf0, + 0xf8, 0x1e, 0x59, 0x54, 0x18, 0x7f, 0x6b, 0x90, 0x92, 0x71, 0x76, 0x18, 0x41, 0x4f, 0x41, 0x77, + 0x19, 0x91, 0x87, 0x6e, 0x4d, 0x4c, 0x02, 0x83, 0x1e, 0x42, 0xc2, 0xa3, 0x96, 0xcf, 0x26, 0x32, + 0x84, 0x34, 0x0e, 0xa4, 0xa5, 0x41, 0xea, 0x77, 0x0c, 0x12, 0x3d, 0x82, 0xcc, 0x19, 0xf3, 0xec, + 0x80, 0xb5, 0x60, 0x50, 0x81, 0x54, 0xc9, 0xd8, 0xc5, 0x09, 0x89, 0x08, 0x55, 0xde, 0xd5, 0xe0, + 0x53, 0xc7, 0x09, 0x85, 0x6b, 0x1d, 0xb9, 0x24, 0xa6, 0x9f, 0xd1, 0x86, 0x07, 0xc7, 0x94, 0x87, + 0x99, 0xdf, 0xbd, 0x31, 0x8d, 0x9f, 0x34, 0xd8, 0x5a, 0xf4, 0x18, 0x10, 0xfe, 0x02, 0x40, 0xee, + 0x3f, 0xef, 0xf1, 0xdd, 0xf5, 0x6d, 0x26, 0x7c, 0xa7, 0x69, 0xe8, 0x69, 0xf1, 0x34, 0x6f, 0xfc, + 0x8f, 0xd3, 0x6c, 0x54, 0xa1, 0x20, 0x5b, 0xf2, 0x9c, 0x4e, 0xa2, 0xb8, 0xb6, 0x60, 0x93, 0x0b, + 0x85, 0xa4, 0x3b, 0x8d, 0x95, 0x60, 0x1c, 0xc2, 0xbd, 0x6b, 0x74, 0xac, 0x1c, 0x3f, 0xda, 0xaa, + 0xf1, 0x63, 0xfc, 0xbc, 0x01, 0xf9, 0xc5, 0x63, 0x81, 0x0a, 0xa0, 0x4f, 0x1d, 0x12, 0xec, 0x25, + 0x7e, 0xd1, 0x36, 0x24, 0x87, 0x96, 0x6f, 0xba, 0xa4, 0x2f, 0x73, 0x4a, 0xe1, 0xc4, 0xd0, 0xf2, + 0x3b, 0xa4, 0x8f, 0x3e, 0x81, 0x64, 0x7f, 0x6a, 0x9f, 0x53, 0x1e, 0x76, 0x4e, 0x65, 0x65, 0xb2, + 0x2f, 0x15, 0x0e, 0x87, 0x06, 0xa8, 0x0e, 0x0f, 0x88, 0xe3, 0x7b, 0x53, 0x15, 0xba, 0x69, 0x8d, + 0x46, 0xec, 0x5b, 0x4a, 0x64, 0xc7, 0x6c, 0x62, 0x34, 0xb7, 0x74, 0xa0, 0x56, 0xc4, 0x9d, 0x63, + 0x4f, 0x3d, 0x8f, 0x4e, 0xb8, 0x39, 0xa4, 0xd6, 0x88, 0x0f, 0x2f, 0x64, 0xd3, 0x6c, 0xe2, 0x7c, + 0xa0, 0x3e, 0x51, 0x5a, 0x01, 0x24, 0xd4, 0x77, 0x3c, 0x4a, 0x22, 0x60, 0x42, 0x01, 0x03, 0x75, + 0x08, 0x7c, 0x0c, 0x39, 0xfa, 0x9d, 0x4b, 0x6d, 0x4e, 0x89, 0xa2, 0x3c, 0x29, 0x61, 0xd9, 0x50, + 0x29, 0xbb, 0xe5, 0x39, 0x24, 0x83, 0xd8, 0xd1, 0x1e, 0xc4, 0x47, 0x8e, 0xcf, 0x83, 0xce, 0x78, + 0x74, 0x4b, 0xae, 0x58, 0x82, 0x8d, 0x16, 0x24, 0x94, 0x2c, 0x07, 0xa2, 0x33, 0xa6, 0x01, 0x1b, + 0xf2, 0x1f, 0x95, 0x20, 0x45, 0xa6, 0x9e, 0x15, 0xf5, 0x8b, 0x8e, 0x23, 0x59, 0xd0, 0x6e, 0xb3, + 0xe9, 0x84, 0xcb, 0xda, 0xea, 0x58, 0x09, 0x3b, 0x9f, 0x42, 0xe1, 0xfa, 0x35, 0x85, 0x32, 0x90, + 0x6c, 0xb5, 0x7b, 0xe6, 0x69, 0xb3, 0x57, 0x88, 0xa1, 0x2c, 0xa4, 0xba, 0xed, 0xcf, 0x94, 0xa4, + 0x09, 0xe9, 0xe4, 0x00, 0x1f, 0x49, 0x69, 0x63, 0xe7, 0x23, 0xb8, 0x7f, 0xe3, 0xd2, 0x44, 0x39, + 0x48, 0x7f, 0xde, 0xec, 0x76, 0xcd, 0xde, 0xc9, 0x41, 0xab, 0x10, 0x43, 0x05, 0xc8, 0x1e, 0xe3, + 0xe6, 0x41, 0xaf, 0x89, 0x95, 0x46, 0xdb, 0xf9, 0x18, 0x72, 0x0b, 0x0f, 0x1c, 0x84, 0x20, 0xdf, + 0x6a, 0x1f, 0x35, 0xcd, 0xc3, 0x76, 0xeb, 0xe8, 0x55, 0xef, 0x55, 0x5b, 0x98, 0xdd, 0x87, 0xdc, + 0x61, 0x0b, 0xcf, 0xa9, 0xb4, 0xc6, 0x6f, 0xfa, 0x55, 0x73, 0xa9, 0x03, 0x8d, 0xbe, 0x84, 0x54, + 0xd8, 0xde, 0xa8, 0xbc, 0xfa, 0x68, 0x89, 0x47, 0x59, 0x69, 0xf5, 0x3d, 0x7d, 0xfd, 0x84, 0x18, + 0x31, 0xe4, 0x42, 0x76, 0xbe, 0x2c, 0xa8, 0xbe, 0xd6, 0xf8, 0xe6, 0x2b, 0xa9, 0xf4, 0xec, 0xad, + 0x5e, 0x05, 0x73, 0x3b, 0x7e, 0x0f, 0xe8, 0xe6, 0xe5, 0x81, 0x1a, 0xeb, 0x83, 0x5e, 0x76, 0xc7, + 0x96, 0xf6, 0xfe, 0x93, 0x4d, 0x14, 0xc0, 0x18, 0xb2, 0xf3, 0x63, 0x0c, 0x7d, 0xb0, 0xce, 0xcd, + 0xf5, 0xf9, 0xb9, 0x26, 0xdf, 0x65, 0xb3, 0xd1, 0x88, 0xbd, 0xac, 0xbe, 0x7e, 0x53, 0xd6, 0xfe, + 0x78, 0x53, 0x8e, 0xfd, 0x70, 0x59, 0xd6, 0x5e, 0x5f, 0x96, 0xb5, 0xdf, 0x2f, 0xcb, 0xda, 0x9f, + 0x97, 0x65, 0xed, 0xc7, 0xbf, 0xca, 0xb1, 0xaf, 0xa1, 0x56, 0x0f, 0x1d, 0xf4, 0x13, 0xf2, 0x75, + 0xbd, 0xf7, 0x6f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x3a, 0x0a, 0xd7, 0xb9, 0xdf, 0x0b, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -1029,7 +1075,7 @@ const _ = grpc.SupportPackageIsVersion4 // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream. type EvictionPluginClient interface { GetToken(ctx context.Context, in *Empty, opts ...grpc.CallOption) (*GetTokenResponse, error) - ThresholdMet(ctx context.Context, in *Empty, opts ...grpc.CallOption) (*ThresholdMetResponse, error) + ThresholdMet(ctx context.Context, in *GetThresholdMetRequest, opts ...grpc.CallOption) (*ThresholdMetResponse, error) GetTopEvictionPods(ctx context.Context, in *GetTopEvictionPodsRequest, opts ...grpc.CallOption) (*GetTopEvictionPodsResponse, error) GetEvictPods(ctx context.Context, in *GetEvictPodsRequest, opts ...grpc.CallOption) (*GetEvictPodsResponse, error) } @@ -1051,7 +1097,7 @@ func (c *evictionPluginClient) GetToken(ctx context.Context, in *Empty, opts ... return out, nil } -func (c *evictionPluginClient) ThresholdMet(ctx context.Context, in *Empty, opts ...grpc.CallOption) (*ThresholdMetResponse, error) { +func (c *evictionPluginClient) ThresholdMet(ctx context.Context, in *GetThresholdMetRequest, opts ...grpc.CallOption) (*ThresholdMetResponse, error) { out := new(ThresholdMetResponse) err := c.cc.Invoke(ctx, "/evictionplugin.v1alpha1.EvictionPlugin/ThresholdMet", in, out, opts...) if err != nil { @@ -1081,7 +1127,7 @@ func (c *evictionPluginClient) GetEvictPods(ctx context.Context, in *GetEvictPod // EvictionPluginServer is the server API for EvictionPlugin service. type EvictionPluginServer interface { GetToken(context.Context, *Empty) (*GetTokenResponse, error) - ThresholdMet(context.Context, *Empty) (*ThresholdMetResponse, error) + ThresholdMet(context.Context, *GetThresholdMetRequest) (*ThresholdMetResponse, error) GetTopEvictionPods(context.Context, *GetTopEvictionPodsRequest) (*GetTopEvictionPodsResponse, error) GetEvictPods(context.Context, *GetEvictPodsRequest) (*GetEvictPodsResponse, error) } @@ -1093,7 +1139,7 @@ type UnimplementedEvictionPluginServer struct { func (*UnimplementedEvictionPluginServer) GetToken(ctx context.Context, req *Empty) (*GetTokenResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method GetToken not implemented") } -func (*UnimplementedEvictionPluginServer) ThresholdMet(ctx context.Context, req *Empty) (*ThresholdMetResponse, error) { +func (*UnimplementedEvictionPluginServer) ThresholdMet(ctx context.Context, req *GetThresholdMetRequest) (*ThresholdMetResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method ThresholdMet not implemented") } func (*UnimplementedEvictionPluginServer) GetTopEvictionPods(ctx context.Context, req *GetTopEvictionPodsRequest) (*GetTopEvictionPodsResponse, error) { @@ -1126,7 +1172,7 @@ func _EvictionPlugin_GetToken_Handler(srv interface{}, ctx context.Context, dec } func _EvictionPlugin_ThresholdMet_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(Empty) + in := new(GetThresholdMetRequest) if err := dec(in); err != nil { return nil, err } @@ -1138,7 +1184,7 @@ func _EvictionPlugin_ThresholdMet_Handler(srv interface{}, ctx context.Context, FullMethod: "/evictionplugin.v1alpha1.EvictionPlugin/ThresholdMet", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(EvictionPluginServer).ThresholdMet(ctx, req.(*Empty)) + return srv.(EvictionPluginServer).ThresholdMet(ctx, req.(*GetThresholdMetRequest)) } return interceptor(ctx, in, info, handler) } @@ -1281,6 +1327,43 @@ func (m *Condition) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } +func (m *GetThresholdMetRequest) Marshal() (dAtA []byte, err error) { + size := m.Size() + dAtA = make([]byte, size) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) + if err != nil { + return nil, err + } + return dAtA[:n], nil +} + +func (m *GetThresholdMetRequest) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *GetThresholdMetRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if len(m.ActivePods) > 0 { + for iNdEx := len(m.ActivePods) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.ActivePods[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintApi(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0xa + } + } + return len(dAtA) - i, nil +} + func (m *ThresholdMetResponse) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) @@ -1883,6 +1966,21 @@ func (m *Condition) Size() (n int) { return n } +func (m *GetThresholdMetRequest) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if len(m.ActivePods) > 0 { + for _, e := range m.ActivePods { + l = e.Size() + n += 1 + l + sovApi(uint64(l)) + } + } + return n +} + func (m *ThresholdMetResponse) Size() (n int) { if m == nil { return 0 @@ -2148,6 +2246,21 @@ func (this *Condition) String() string { }, "") return s } +func (this *GetThresholdMetRequest) String() string { + if this == nil { + return "nil" + } + repeatedStringForActivePods := "[]*Pod{" + for _, f := range this.ActivePods { + repeatedStringForActivePods += strings.Replace(fmt.Sprintf("%v", f), "Pod", "v1.Pod", 1) + "," + } + repeatedStringForActivePods += "}" + s := strings.Join([]string{`&GetThresholdMetRequest{`, + `ActivePods:` + repeatedStringForActivePods + `,`, + `}`, + }, "") + return s +} func (this *ThresholdMetResponse) String() string { if this == nil { return "nil" @@ -2528,6 +2641,90 @@ func (m *Condition) Unmarshal(dAtA []byte) error { } return nil } +func (m *GetThresholdMetRequest) Unmarshal(dAtA []byte) error { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + preIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowApi + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: GetThresholdMetRequest: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: GetThresholdMetRequest: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field ActivePods", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowApi + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthApi + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthApi + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.ActivePods = append(m.ActivePods, &v1.Pod{}) + if err := m.ActivePods[len(m.ActivePods)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipApi(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthApi + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} func (m *ThresholdMetResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 diff --git a/pkg/protocol/evictionplugin/v1alpha1/api.proto b/pkg/protocol/evictionplugin/v1alpha1/api.proto index bc9ac440..d90af7e5 100644 --- a/pkg/protocol/evictionplugin/v1alpha1/api.proto +++ b/pkg/protocol/evictionplugin/v1alpha1/api.proto @@ -57,6 +57,10 @@ message Condition { bool met_condition = 4; } +message GetThresholdMetRequest { + repeated k8s.io.api.core.v1.Pod active_pods = 1; +} + message ThresholdMetResponse { double threshold_value = 1; double observed_value = 2; @@ -127,7 +131,7 @@ message Bucket { service EvictionPlugin { rpc GetToken(Empty) returns (GetTokenResponse) {} - rpc ThresholdMet(Empty) returns (ThresholdMetResponse) {} + rpc ThresholdMet(GetThresholdMetRequest) returns (ThresholdMetResponse) {} rpc GetTopEvictionPods(GetTopEvictionPodsRequest) returns (GetTopEvictionPodsResponse) {} rpc GetEvictPods(GetEvictPodsRequest) returns (GetEvictPodsResponse) {} } From d669ffd12fd2be6945b17c72392179fb9b27457a Mon Sep 17 00:00:00 2001 From: "zhangyadong.0808" Date: Wed, 17 Sep 2025 10:58:44 +0800 Subject: [PATCH 11/27] add numa level cpu/memory related metric --- pkg/metric/node/node.go | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkg/metric/node/node.go b/pkg/metric/node/node.go index ef44fed8..e4f10220 100644 --- a/pkg/metric/node/node.go +++ b/pkg/metric/node/node.go @@ -44,3 +44,9 @@ const ( CustomMetricNUMAMemoryBandwidthLocal = "numa_mbm_local" CustomMetricNUMAMemoryBandwidthVictim = "numa_mbm_victim" ) + +// real-time numa level cpu and memory related metric +const ( + CustomMetricNUMACPUUsage = "numa_cpu_usage" + CustomMetricNUMAMemoryUsage = "numa_memory_usage" +) From 8ebb9a9198de01616599f34021541c2a6373d162 Mon Sep 17 00:00:00 2001 From: linzhecheng Date: Mon, 13 Oct 2025 22:50:58 +0800 Subject: [PATCH 12/27] chore(*): add config for headroom Signed-off-by: linzhecheng --- ...katalyst.kubewharf.io_adminqosconfigurations.yaml | 12 ++++++++++++ pkg/apis/config/v1alpha1/adminqos.go | 12 ++++++++++++ pkg/apis/config/v1alpha1/zz_generated.deepcopy.go | 10 ++++++++++ 3 files changed, 34 insertions(+) diff --git a/config/crd/bases/config.katalyst.kubewharf.io_adminqosconfigurations.yaml b/config/crd/bases/config.katalyst.kubewharf.io_adminqosconfigurations.yaml index 902b4c64..7858e1bf 100644 --- a/config/crd/bases/config.katalyst.kubewharf.io_adminqosconfigurations.yaml +++ b/config/crd/bases/config.katalyst.kubewharf.io_adminqosconfigurations.yaml @@ -676,6 +676,18 @@ spec: maximum: 1 minimum: 0 type: number + nonReclaimUtilizationHigh: + description: NonReclaimUtilizationHigh is the high + CPU utilization threshold + maximum: 1 + minimum: 0 + type: number + nonReclaimUtilizationLow: + description: NonReclaimUtilizationLow is the low CPU + utilization threshold + maximum: 1 + minimum: 0 + type: number targetReclaimedCoreUtilization: description: |- TargetReclaimedCoreUtilization is the target reclaimed core utilization to be used for diff --git a/pkg/apis/config/v1alpha1/adminqos.go b/pkg/apis/config/v1alpha1/adminqos.go index edbbc484..e52ed0e1 100644 --- a/pkg/apis/config/v1alpha1/adminqos.go +++ b/pkg/apis/config/v1alpha1/adminqos.go @@ -309,6 +309,18 @@ type CPUHeadroomUtilBasedConfig struct { // +kubebuilder:validation:Minimum=0 // +optional MaxHeadroomCapacityRate *float64 `json:"maxHeadroomCapacityRate,omitempty"` + + // NonReclaimUtilizationHigh is the high CPU utilization threshold + // +kubebuilder:validation:Minimum=0 + // +kubebuilder:validation:Maximum=1 + // +optional + NonReclaimUtilizationHigh *float64 `json:"nonReclaimUtilizationHigh,omitempty"` + + // NonReclaimUtilizationLow is the low CPU utilization threshold + // +kubebuilder:validation:Minimum=0 + // +kubebuilder:validation:Maximum=1 + // +optional + NonReclaimUtilizationLow *float64 `json:"nonReclaimUtilizationLow,omitempty"` } type EvictionConfig struct { diff --git a/pkg/apis/config/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/config/v1alpha1/zz_generated.deepcopy.go index d8cf7f64..0e5e6179 100644 --- a/pkg/apis/config/v1alpha1/zz_generated.deepcopy.go +++ b/pkg/apis/config/v1alpha1/zz_generated.deepcopy.go @@ -460,6 +460,16 @@ func (in *CPUHeadroomUtilBasedConfig) DeepCopyInto(out *CPUHeadroomUtilBasedConf *out = new(float64) **out = **in } + if in.NonReclaimUtilizationHigh != nil { + in, out := &in.NonReclaimUtilizationHigh, &out.NonReclaimUtilizationHigh + *out = new(float64) + **out = **in + } + if in.NonReclaimUtilizationLow != nil { + in, out := &in.NonReclaimUtilizationLow, &out.NonReclaimUtilizationLow + *out = new(float64) + **out = **in + } return } From a21b699dcb0e522bb41ea9e629a90ad06abe2e6d Mon Sep 17 00:00:00 2001 From: "shuo.yang" Date: Wed, 15 Oct 2025 14:42:29 -0700 Subject: [PATCH 13/27] add CustomMetricNodeMemoryTotal --- pkg/metric/node/node.go | 1 + 1 file changed, 1 insertion(+) diff --git a/pkg/metric/node/node.go b/pkg/metric/node/node.go index e4f10220..6e9647fe 100644 --- a/pkg/metric/node/node.go +++ b/pkg/metric/node/node.go @@ -28,6 +28,7 @@ const ( // real-time memory related metric const ( + CustomMetricNodeMemoryTotal = "node_system_memory_total" CustomMetricNodeMemoryFree = "node_system_memory_free" CustomMetricNodeMemoryAvailable = "node_system_memory_available" ) From 4d28b3592e611ece7e5ba7f47b84cda1240afeba Mon Sep 17 00:00:00 2001 From: koufeixiang Date: Thu, 6 Nov 2025 11:31:18 +0800 Subject: [PATCH 14/27] feat(*): support disable xps conf --- ...config.katalyst.kubewharf.io_irqtuningconfigurations.yaml | 3 +++ pkg/apis/config/v1alpha1/irqtuning.go | 3 +++ pkg/apis/config/v1alpha1/zz_generated.deepcopy.go | 5 +++++ 3 files changed, 11 insertions(+) diff --git a/config/crd/bases/config.katalyst.kubewharf.io_irqtuningconfigurations.yaml b/config/crd/bases/config.katalyst.kubewharf.io_irqtuningconfigurations.yaml index 68cca29b..caec72ee 100644 --- a/config/crd/bases/config.katalyst.kubewharf.io_irqtuningconfigurations.yaml +++ b/config/crd/bases/config.katalyst.kubewharf.io_irqtuningconfigurations.yaml @@ -201,6 +201,9 @@ spec: maximum: 100 minimum: 0 type: integer + disableXPS: + description: DisableXPS indicates whether to disable the XPS function. + type: boolean enableRPS: description: |- EnableRPS indicates whether to enable the RPS function. diff --git a/pkg/apis/config/v1alpha1/irqtuning.go b/pkg/apis/config/v1alpha1/irqtuning.go index fc2c13b0..fd5744d5 100644 --- a/pkg/apis/config/v1alpha1/irqtuning.go +++ b/pkg/apis/config/v1alpha1/irqtuning.go @@ -82,6 +82,9 @@ type IRQTuningConfig struct { // EnableRPSCPUVSNicsQueue enable rps when (cpus count)/(nics queue count) greater than this config. // +optional EnableRPSCPUVSNicsQueue *float64 `json:"enableRPSCPUVSNicsQueue,omitempty"` + // DisableXPS indicates whether to disable the XPS function. + // +optional + DisableXPS *bool `json:"disableXPS,omitempty"` // NICAffinityPolicy represents the NICs's irqs affinity sockets policy. // One of CompleteMap, OverallBalance, PhysicalTopo. // +optional diff --git a/pkg/apis/config/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/config/v1alpha1/zz_generated.deepcopy.go index 0e5e6179..950e8155 100644 --- a/pkg/apis/config/v1alpha1/zz_generated.deepcopy.go +++ b/pkg/apis/config/v1alpha1/zz_generated.deepcopy.go @@ -1399,6 +1399,11 @@ func (in *IRQTuningConfig) DeepCopyInto(out *IRQTuningConfig) { *out = new(float64) **out = **in } + if in.DisableXPS != nil { + in, out := &in.DisableXPS, &out.DisableXPS + *out = new(bool) + **out = **in + } if in.ReniceKsoftirqd != nil { in, out := &in.ReniceKsoftirqd, &out.ReniceKsoftirqd *out = new(bool) From 12bfe9677a670245701a0a99d1cd6896e83907a2 Mon Sep 17 00:00:00 2001 From: "lihonghao.314" Date: Tue, 2 Sep 2025 21:15:11 +0800 Subject: [PATCH 15/27] feat(aqc): add numa level reclaim reserve config --- ...t.kubewharf.io_adminqosconfigurations.yaml | 24 +++++++++++++++++++ pkg/apis/config/v1alpha1/adminqos.go | 12 ++++++++++ .../config/v1alpha1/zz_generated.deepcopy.go | 22 +++++++++++++++++ 3 files changed, 58 insertions(+) diff --git a/config/crd/bases/config.katalyst.kubewharf.io_adminqosconfigurations.yaml b/config/crd/bases/config.katalyst.kubewharf.io_adminqosconfigurations.yaml index 7858e1bf..1d953a34 100644 --- a/config/crd/bases/config.katalyst.kubewharf.io_adminqosconfigurations.yaml +++ b/config/crd/bases/config.katalyst.kubewharf.io_adminqosconfigurations.yaml @@ -788,6 +788,30 @@ spec: MinReclaimedResourceForReport. For example, {"cpu": 4, "memory": 5Gi}. type: object + numaMinReclaimedResourceForAllocate: + 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: |- + NumaMinReclaimedResourceForAllocate is a resource reserved at numa level for reclaimed_cores pods，these resources will not be used + by shared_cores pods. + For example, {"cpu": 2, "memory": 0Gi}. + type: object + numaMinReclaimedResourceRatioForAllocate: + 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: |- + NumaMinReclaimedResourceRatioForAllocate is a resource reserved ratio at numa level for reclaimed_cores pods，these resources will not be used + by shared_cores pods. + For example, {"cpu": 0.1, "memory": 0.2}. + type: object reservedResourceForAllocate: additionalProperties: anyOf: diff --git a/pkg/apis/config/v1alpha1/adminqos.go b/pkg/apis/config/v1alpha1/adminqos.go index e52ed0e1..654cefb9 100644 --- a/pkg/apis/config/v1alpha1/adminqos.go +++ b/pkg/apis/config/v1alpha1/adminqos.go @@ -127,6 +127,18 @@ type ReclaimedResourceConfig struct { // +optional MinReclaimedResourceForAllocate *v1.ResourceList `json:"minReclaimedResourceForAllocate,omitempty"` + // NumaMinReclaimedResourceRatioForAllocate is a resource reserved ratio at numa level for reclaimed_cores pods，these resources will not be used + // by shared_cores pods. + // For example, {"cpu": 0.1, "memory": 0.2}. + // +optional + NumaMinReclaimedResourceRatioForAllocate *v1.ResourceList `json:"numaMinReclaimedResourceRatioForAllocate,omitempty"` + + // NumaMinReclaimedResourceForAllocate is a resource reserved at numa level for reclaimed_cores pods，these resources will not be used + // by shared_cores pods. + // For example, {"cpu": 2, "memory": 0Gi}. + // +optional + NumaMinReclaimedResourceForAllocate *v1.ResourceList `json:"numaMinReclaimedResourceForAllocate,omitempty"` + // CPUHeadroomConfig is a configuration for cpu headroom // +optional CPUHeadroomConfig *CPUHeadroomConfig `json:"cpuHeadroomConfig,omitempty"` diff --git a/pkg/apis/config/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/config/v1alpha1/zz_generated.deepcopy.go index 950e8155..44556dbb 100644 --- a/pkg/apis/config/v1alpha1/zz_generated.deepcopy.go +++ b/pkg/apis/config/v1alpha1/zz_generated.deepcopy.go @@ -2215,6 +2215,28 @@ func (in *ReclaimedResourceConfig) DeepCopyInto(out *ReclaimedResourceConfig) { } } } + if in.NumaMinReclaimedResourceRatioForAllocate != nil { + in, out := &in.NumaMinReclaimedResourceRatioForAllocate, &out.NumaMinReclaimedResourceRatioForAllocate + *out = new(corev1.ResourceList) + if **in != nil { + in, out := *in, *out + *out = make(map[corev1.ResourceName]resource.Quantity, len(*in)) + for key, val := range *in { + (*out)[key] = val.DeepCopy() + } + } + } + if in.NumaMinReclaimedResourceForAllocate != nil { + in, out := &in.NumaMinReclaimedResourceForAllocate, &out.NumaMinReclaimedResourceForAllocate + *out = new(corev1.ResourceList) + if **in != nil { + in, out := *in, *out + *out = make(map[corev1.ResourceName]resource.Quantity, len(*in)) + for key, val := range *in { + (*out)[key] = val.DeepCopy() + } + } + } if in.CPUHeadroomConfig != nil { in, out := &in.CPUHeadroomConfig, &out.CPUHeadroomConfig *out = new(CPUHeadroomConfig) From 9f43f44695aa49f37a662ae919cba6d55ad31686 Mon Sep 17 00:00:00 2001 From: koufeixiang Date: Wed, 16 Jul 2025 17:45:41 +0800 Subject: [PATCH 16/27] feat(*): add L3CacheGroup topology type --- pkg/apis/node/v1alpha1/types.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkg/apis/node/v1alpha1/types.go b/pkg/apis/node/v1alpha1/types.go index 9f2675bd..4964c434 100644 --- a/pkg/apis/node/v1alpha1/types.go +++ b/pkg/apis/node/v1alpha1/types.go @@ -215,6 +215,9 @@ const ( // TopologyTypeNuma indicates numa-level topology TopologyTypeNuma TopologyType = "Numa" + // TopologyTypeCacheGroup indicates cache-group-level topology + TopologyTypeCacheGroup TopologyType = "L3CacheGroup" + // TopologyTypeGPU indicates a zone for gpu device TopologyTypeGPU TopologyType = "GPU" From d26e9cc55fa64c850f44c2d621c47ab396d3d950 Mon Sep 17 00:00:00 2001 From: koufeixiang Date: Wed, 5 Nov 2025 16:21:59 +0800 Subject: [PATCH 17/27] feat(*): add numa sys cpu pressure eviction conf --- ...t.kubewharf.io_adminqosconfigurations.yaml | 52 ++++++++++++++ pkg/apis/config/v1alpha1/adminqos.go | 41 ++++++++++++ .../config/v1alpha1/zz_generated.deepcopy.go | 67 +++++++++++++++++++ 3 files changed, 160 insertions(+) diff --git a/config/crd/bases/config.katalyst.kubewharf.io_adminqosconfigurations.yaml b/config/crd/bases/config.katalyst.kubewharf.io_adminqosconfigurations.yaml index 1d953a34..3c0aea50 100644 --- a/config/crd/bases/config.katalyst.kubewharf.io_adminqosconfigurations.yaml +++ b/config/crd/bases/config.katalyst.kubewharf.io_adminqosconfigurations.yaml @@ -284,6 +284,58 @@ spec: minimum: 0 type: number type: object + numaSysCPUPressureEvictionConfig: + description: NumaSysCPUPressureEvictionConfig holds configurations + for NUMA-level system CPU pressure eviction. + properties: + enableEviction: + description: EnableEviction indicates whether to enable + NUMA-level system CPU pressure eviction. + type: boolean + gracePeriod: + description: |- + GracePeriod is the grace period (in seconds) after a pod starts before it can be considered for eviction + due to NUMA system CPU pressure. 0 means no grace period. + format: int64 + type: integer + metricRingSize: + description: MetricRingSize is the size of the metric + ring buffer for calculating NUMA system CPU pressure. + type: integer + numaCPUUsageHardThreshold: + description: NumaCPUUsageHardThreshold is the hard + threshold for NUMA system CPU pressure. + type: number + numaCPUUsageSoftThreshold: + description: NumaCPUUsageSoftThreshold is the soft + threshold for NUMA system CPU pressure. + type: number + numaSysOverTotalUsageEvictionThreshold: + description: NUMASysOverTotalUsageEvictionThreshold + is the eviction threshold for NUMA system CPU pressure + over total system CPU pressure. + type: number + numaSysOverTotalUsageHardThreshold: + description: NUMASysOverTotalUsageHardThreshold is + the hard threshold for NUMA system CPU pressure + over total system CPU pressure. + type: number + numaSysOverTotalUsageSoftThreshold: + description: NUMASysOverTotalUsageSoftThreshold is + the soft threshold for NUMA system CPU pressure + over total system CPU pressure. + type: number + syncPeriod: + description: SyncPeriod is the sync period (in seconds) + for updating NUMA system CPU pressure metrics. + format: int64 + type: integer + thresholdMetPercentage: + description: |- + ThresholdMetPercentage is the percentage of time the NUMA's system CPU pressure + must be above the threshold for an eviction to be triggered. + type: number + type: object type: object cpuSystemPressureEvictionConfig: description: CPUSystemPressureEvictionConfig is the config diff --git a/pkg/apis/config/v1alpha1/adminqos.go b/pkg/apis/config/v1alpha1/adminqos.go index 654cefb9..c2dcc5d2 100644 --- a/pkg/apis/config/v1alpha1/adminqos.go +++ b/pkg/apis/config/v1alpha1/adminqos.go @@ -455,6 +455,9 @@ type CPUPressureEvictionConfig struct { // NumaCPUPressureEvictionConfig holds configurations for NUMA-level CPU pressure eviction. NumaCPUPressureEvictionConfig NumaCPUPressureEvictionConfig `json:"numaCPUPressureEvictionConfig,omitempty"` + + // NumaSysCPUPressureEvictionConfig holds configurations for NUMA-level system CPU pressure eviction. + NumaSysCPUPressureEvictionConfig NumaSysCPUPressureEvictionConfig `json:"numaSysCPUPressureEvictionConfig,omitempty"` } // NumaCPUPressureEvictionConfig holds the configurations for NUMA-level CPU pressure eviction. @@ -497,6 +500,44 @@ type NumaCPUPressureEvictionConfig struct { SkippedPodKinds []string `json:"skippedPodKinds,omitempty"` } +// NumaSysCPUPressureEvictionConfig holds the configurations for NUMA-level system CPU pressure eviction. +type NumaSysCPUPressureEvictionConfig struct { + // EnableEviction indicates whether to enable NUMA-level system CPU pressure eviction. + // +optional + EnableEviction *bool `json:"enableEviction,omitempty"` + // MetricRingSize is the size of the metric ring buffer for calculating NUMA system CPU pressure. + // +optional + MetricRingSize *int `json:"metricRingSize,omitempty"` + + // GracePeriod is the grace period (in seconds) after a pod starts before it can be considered for eviction + // due to NUMA system CPU pressure. 0 means no grace period. + // +optional + GracePeriod *int64 `json:"gracePeriod,omitempty"` + // SyncPeriod is the sync period (in seconds) for updating NUMA system CPU pressure metrics. + // +optional + SyncPeriod *int64 `json:"syncPeriod,omitempty"` + + // ThresholdMetPercentage is the percentage of time the NUMA's system CPU pressure + // must be above the threshold for an eviction to be triggered. + // +optional + ThresholdMetPercentage *float64 `json:"thresholdMetPercentage,omitempty"` + // NumaCPUUsageSoftThreshold is the soft threshold for NUMA system CPU pressure. + // +optional + NumaCPUUsageSoftThreshold *float64 `json:"numaCPUUsageSoftThreshold,omitempty"` + // NumaCPUUsageHardThreshold is the hard threshold for NUMA system CPU pressure. + // +optional + NumaCPUUsageHardThreshold *float64 `json:"numaCPUUsageHardThreshold,omitempty"` + // NUMASysOverTotalUsageSoftThreshold is the soft threshold for NUMA system CPU pressure over total system CPU pressure. + // +optional + NUMASysOverTotalUsageSoftThreshold *float64 `json:"numaSysOverTotalUsageSoftThreshold,omitempty"` + // NUMASysOverTotalUsageHardThreshold is the hard threshold for NUMA system CPU pressure over total system CPU pressure. + // +optional + NUMASysOverTotalUsageHardThreshold *float64 `json:"numaSysOverTotalUsageHardThreshold,omitempty"` + // NUMASysOverTotalUsageEvictionThreshold is the eviction threshold for NUMA system CPU pressure over total system CPU pressure. + // +optional + NUMASysOverTotalUsageEvictionThreshold *float64 `json:"numaSysOverTotalUsageEvictionThreshold,omitempty"` +} + type MemoryPressureEvictionConfig struct { // EnableNumaLevelEviction is whether to enable numa-level eviction // +optional diff --git a/pkg/apis/config/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/config/v1alpha1/zz_generated.deepcopy.go index 44556dbb..b415d75c 100644 --- a/pkg/apis/config/v1alpha1/zz_generated.deepcopy.go +++ b/pkg/apis/config/v1alpha1/zz_generated.deepcopy.go @@ -537,6 +537,7 @@ func (in *CPUPressureEvictionConfig) DeepCopyInto(out *CPUPressureEvictionConfig **out = **in } in.NumaCPUPressureEvictionConfig.DeepCopyInto(&out.NumaCPUPressureEvictionConfig) + in.NumaSysCPUPressureEvictionConfig.DeepCopyInto(&out.NumaSysCPUPressureEvictionConfig) return } @@ -2011,6 +2012,72 @@ func (in *NumaCPUPressureEvictionConfig) DeepCopy() *NumaCPUPressureEvictionConf return out } +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *NumaSysCPUPressureEvictionConfig) DeepCopyInto(out *NumaSysCPUPressureEvictionConfig) { + *out = *in + if in.EnableEviction != nil { + in, out := &in.EnableEviction, &out.EnableEviction + *out = new(bool) + **out = **in + } + if in.MetricRingSize != nil { + in, out := &in.MetricRingSize, &out.MetricRingSize + *out = new(int) + **out = **in + } + if in.GracePeriod != nil { + in, out := &in.GracePeriod, &out.GracePeriod + *out = new(int64) + **out = **in + } + if in.SyncPeriod != nil { + in, out := &in.SyncPeriod, &out.SyncPeriod + *out = new(int64) + **out = **in + } + if in.ThresholdMetPercentage != nil { + in, out := &in.ThresholdMetPercentage, &out.ThresholdMetPercentage + *out = new(float64) + **out = **in + } + if in.NumaCPUUsageSoftThreshold != nil { + in, out := &in.NumaCPUUsageSoftThreshold, &out.NumaCPUUsageSoftThreshold + *out = new(float64) + **out = **in + } + if in.NumaCPUUsageHardThreshold != nil { + in, out := &in.NumaCPUUsageHardThreshold, &out.NumaCPUUsageHardThreshold + *out = new(float64) + **out = **in + } + if in.NUMASysOverTotalUsageSoftThreshold != nil { + in, out := &in.NUMASysOverTotalUsageSoftThreshold, &out.NUMASysOverTotalUsageSoftThreshold + *out = new(float64) + **out = **in + } + if in.NUMASysOverTotalUsageHardThreshold != nil { + in, out := &in.NUMASysOverTotalUsageHardThreshold, &out.NUMASysOverTotalUsageHardThreshold + *out = new(float64) + **out = **in + } + if in.NUMASysOverTotalUsageEvictionThreshold != nil { + in, out := &in.NUMASysOverTotalUsageEvictionThreshold, &out.NUMASysOverTotalUsageEvictionThreshold + *out = new(float64) + **out = **in + } + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new NumaSysCPUPressureEvictionConfig. +func (in *NumaSysCPUPressureEvictionConfig) DeepCopy() *NumaSysCPUPressureEvictionConfig { + if in == nil { + return nil + } + out := new(NumaSysCPUPressureEvictionConfig) + in.DeepCopyInto(out) + return out +} + // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *PSIPolicyConf) DeepCopyInto(out *PSIPolicyConf) { *out = *in From 96158e0e2d65f673b426f5881ce02aa41df09509 Mon Sep 17 00:00:00 2001 From: koufeixiang Date: Mon, 24 Nov 2025 20:26:44 +0800 Subject: [PATCH 18/27] feat(*): support static configuration of normal throughput nics --- ...onfig.katalyst.kubewharf.io_irqtuningconfigurations.yaml | 6 ++++++ pkg/apis/config/v1alpha1/irqtuning.go | 3 +++ pkg/apis/config/v1alpha1/zz_generated.deepcopy.go | 5 +++++ 3 files changed, 14 insertions(+) diff --git a/config/crd/bases/config.katalyst.kubewharf.io_irqtuningconfigurations.yaml b/config/crd/bases/config.katalyst.kubewharf.io_irqtuningconfigurations.yaml index caec72ee..6edb3471 100644 --- a/config/crd/bases/config.katalyst.kubewharf.io_irqtuningconfigurations.yaml +++ b/config/crd/bases/config.katalyst.kubewharf.io_irqtuningconfigurations.yaml @@ -269,6 +269,12 @@ spec: NICAffinityPolicy represents the NICs's irqs affinity sockets policy. One of CompleteMap, OverallBalance, PhysicalTopo. type: string + normalThroughputNics: + description: NormalThroughputNics describes static configured + normal throughput Nics. + items: + type: string + type: array reniceKsoftirqd: description: ReniceKsoftirqd indicates whether to renice ksoftirqd process. diff --git a/pkg/apis/config/v1alpha1/irqtuning.go b/pkg/apis/config/v1alpha1/irqtuning.go index fd5744d5..9f569d7c 100644 --- a/pkg/apis/config/v1alpha1/irqtuning.go +++ b/pkg/apis/config/v1alpha1/irqtuning.go @@ -109,6 +109,9 @@ type IRQTuningConfig struct { // +optional RPSExcludeIRQCoresThreshold *RPSExcludeIRQCoresThreshold `json:"rpsExcludeIRQCoresThreshold,omitempty"` + // NormalThroughputNics describes static configured normal throughput Nics. + // +optional + NormalThroughputNics []string `json:"normalThroughputNics,omitempty"` // ThroughputClassSwitch describes the switch configuration for a throughput class. // +optional ThroughputClassSwitch *ThroughputClassSwitchConfig `json:"throughputClassSwitch,omitempty"` diff --git a/pkg/apis/config/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/config/v1alpha1/zz_generated.deepcopy.go index b415d75c..0b1a2fd2 100644 --- a/pkg/apis/config/v1alpha1/zz_generated.deepcopy.go +++ b/pkg/apis/config/v1alpha1/zz_generated.deepcopy.go @@ -1425,6 +1425,11 @@ func (in *IRQTuningConfig) DeepCopyInto(out *IRQTuningConfig) { *out = new(RPSExcludeIRQCoresThreshold) (*in).DeepCopyInto(*out) } + if in.NormalThroughputNics != nil { + in, out := &in.NormalThroughputNics, &out.NormalThroughputNics + *out = make([]string, len(*in)) + copy(*out, *in) + } if in.ThroughputClassSwitch != nil { in, out := &in.ThroughputClassSwitch, &out.ThroughputClassSwitch *out = new(ThroughputClassSwitchConfig) From 05cbff7b861409fbc72b61b979c93f39e17c4a04 Mon Sep 17 00:00:00 2001 From: koufeixiang Date: Thu, 20 Nov 2025 14:31:01 +0800 Subject: [PATCH 19/27] chore(*): append memory eviction config --- ...t.kubewharf.io_adminqosconfigurations.yaml | 20 +++++++++++++++++++ pkg/apis/config/v1alpha1/adminqos.go | 19 ++++++++++++++++++ .../config/v1alpha1/zz_generated.deepcopy.go | 10 ++++++++++ 3 files changed, 49 insertions(+) diff --git a/config/crd/bases/config.katalyst.kubewharf.io_adminqosconfigurations.yaml b/config/crd/bases/config.katalyst.kubewharf.io_adminqosconfigurations.yaml index 3c0aea50..45dc81af 100644 --- a/config/crd/bases/config.katalyst.kubewharf.io_adminqosconfigurations.yaml +++ b/config/crd/bases/config.katalyst.kubewharf.io_adminqosconfigurations.yaml @@ -436,6 +436,14 @@ spec: description: EnableSystemLevelEviction is whether to enable system-level eviction type: boolean + evictNonReclaimedAnnotationSelector: + description: EvictNonReclaimedAnnotationSelector is a + non-reclaimed pod eviction anno selector + type: string + evictNonReclaimedLabelSelector: + description: EvictNonReclaimedLabelSelector is a non-reclaimed + pod eviction label selector + type: string gracePeriod: description: GracePeriod is the grace period of memory pressure eviction @@ -457,12 +465,24 @@ spec: type: string minItems: 1 type: array + numaFreeBelowWatermarkTimesReclaimedThreshold: + description: |- + NumaFreeBelowWatermarkTimesReclaimedThreshold is the threshold for the number of + times NUMA's free memory of the reclaimed instance falls below the watermark + minimum: 0 + type: integer numaFreeBelowWatermarkTimesThreshold: description: |- NumaFreeBelowWatermarkTimesThreshold is the threshold for the number of times NUMA's free memory falls below the watermark minimum: 0 type: integer + numaFreeConstraintFastEvictionWaitCycle: + description: NumaFreeConstraintFastEvictionWaitCycle is + the wait cycle for fast eviction when numa memory is + extremely tight + minimum: 0 + type: integer numaVictimMinimumUtilizationThreshold: description: |- NumaVictimMinimumUtilizationThreshold is the victim's minimum memory usage on a NUMA node, if a pod diff --git a/pkg/apis/config/v1alpha1/adminqos.go b/pkg/apis/config/v1alpha1/adminqos.go index c2dcc5d2..a4b26b58 100644 --- a/pkg/apis/config/v1alpha1/adminqos.go +++ b/pkg/apis/config/v1alpha1/adminqos.go @@ -558,6 +558,17 @@ type MemoryPressureEvictionConfig struct { // +optional NumaFreeBelowWatermarkTimesThreshold *int `json:"numaFreeBelowWatermarkTimesThreshold,omitempty"` + // NumaFreeBelowWatermarkTimesReclaimedThreshold is the threshold for the number of + // times NUMA's free memory of the reclaimed instance falls below the watermark + // +kubebuilder:validation:Minimum=0 + // +optional + NumaFreeBelowWatermarkTimesReclaimedThreshold *int `json:"numaFreeBelowWatermarkTimesReclaimedThreshold,omitempty"` + + // NumaFreeConstraintFastEvictionWaitCycle is the wait cycle for fast eviction when numa memory is extremely tight + // +kubebuilder:validation:Minimum=0 + // +optional + NumaFreeConstraintFastEvictionWaitCycle *int `json:"numaFreeConstraintFastEvictionWaitCycle,omitempty"` + // NumaFreeBelowWatermarkTimesThreshold is the threshold for the rate of // kswapd reclaiming rate // +kubebuilder:validation:Minimum=0 @@ -604,6 +615,14 @@ type MemoryPressureEvictionConfig struct { // +kubebuilder:validation:Minimum=0 // +optional ReclaimedGracePeriod *int64 `json:"reclaimedGracePeriod,omitempty"` + + // EvictNonReclaimedAnnotationSelector is a non-reclaimed pod eviction anno selector + // +optional + EvictNonReclaimedAnnotationSelector string `json:"evictNonReclaimedAnnotationSelector,omitempty"` + + // EvictNonReclaimedLabelSelector is a non-reclaimed pod eviction label selector + // +optional + EvictNonReclaimedLabelSelector string `json:"evictNonReclaimedLabelSelector,omitempty"` } type SystemLoadPressureEvictionConfig struct { diff --git a/pkg/apis/config/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/config/v1alpha1/zz_generated.deepcopy.go index 0b1a2fd2..91f03d7d 100644 --- a/pkg/apis/config/v1alpha1/zz_generated.deepcopy.go +++ b/pkg/apis/config/v1alpha1/zz_generated.deepcopy.go @@ -1851,6 +1851,16 @@ func (in *MemoryPressureEvictionConfig) DeepCopyInto(out *MemoryPressureEviction *out = new(int) **out = **in } + if in.NumaFreeBelowWatermarkTimesReclaimedThreshold != nil { + in, out := &in.NumaFreeBelowWatermarkTimesReclaimedThreshold, &out.NumaFreeBelowWatermarkTimesReclaimedThreshold + *out = new(int) + **out = **in + } + if in.NumaFreeConstraintFastEvictionWaitCycle != nil { + in, out := &in.NumaFreeConstraintFastEvictionWaitCycle, &out.NumaFreeConstraintFastEvictionWaitCycle + *out = new(int) + **out = **in + } if in.SystemKswapdRateThreshold != nil { in, out := &in.SystemKswapdRateThreshold, &out.SystemKswapdRateThreshold *out = new(int) From b69b3abfe9c992b0f94534e15abc0910b329340c Mon Sep 17 00:00:00 2001 From: luomingmeng Date: Wed, 24 Sep 2025 21:06:21 +0800 Subject: [PATCH 20/27] feat(api): add dedicated QoS region type and mark dedicated-numa-exclusive as deprecated --- pkg/apis/config/v1alpha1/adminqos.go | 3 +++ pkg/utils/adminqos.go | 28 ++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+) create mode 100644 pkg/utils/adminqos.go diff --git a/pkg/apis/config/v1alpha1/adminqos.go b/pkg/apis/config/v1alpha1/adminqos.go index a4b26b58..ab824ea9 100644 --- a/pkg/apis/config/v1alpha1/adminqos.go +++ b/pkg/apis/config/v1alpha1/adminqos.go @@ -178,11 +178,14 @@ const ( // QoSRegionTypeShare for each share pool QoSRegionTypeShare QoSRegionType = "share" + QoSRegionTypeDedicated QoSRegionType = "dedicated" + // QoSRegionTypeIsolation for each isolation pool QoSRegionTypeIsolation QoSRegionType = "isolation" // QoSRegionTypeDedicatedNumaExclusive for each dedicated core with numa binding // and numa exclusive container + // deprecated, will be removed later, use QoSRegionTypeDedicated instead QoSRegionTypeDedicatedNumaExclusive QoSRegionType = "dedicated-numa-exclusive" ) diff --git a/pkg/utils/adminqos.go b/pkg/utils/adminqos.go new file mode 100644 index 00000000..b50d7f53 --- /dev/null +++ b/pkg/utils/adminqos.go @@ -0,0 +1,28 @@ +/* +Copyright 2022 The Katalyst Authors. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package utils + +import "github.com/kubewharf/katalyst-api/pkg/apis/config/v1alpha1" + +// CompatibleLegacyRegionType convert deprecated region type to new one +func CompatibleLegacyRegionType(regionType v1alpha1.QoSRegionType) v1alpha1.QoSRegionType { + if regionType == v1alpha1.QoSRegionTypeDedicatedNumaExclusive { + return v1alpha1.QoSRegionTypeDedicated + } + + return regionType +} From 5f6e7d77aa721b12bb922ab4f88598549c0c443f Mon Sep 17 00:00:00 2001 From: "justin.cheng" Date: Thu, 6 Nov 2025 11:47:29 +0800 Subject: [PATCH 21/27] feat: add annotation keys for cpu burst feat: add annotation keys for cpu burst --- pkg/consts/qos.go | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/pkg/consts/qos.go b/pkg/consts/qos.go index 5890f7ec..21c4bbef 100644 --- a/pkg/consts/qos.go +++ b/pkg/consts/qos.go @@ -114,6 +114,26 @@ const ( // // - this enhancement is only supported for reclaimed-cores, for now and foreseeable future PodAnnotationCPUEnhancementSuppressionToleranceRate = "suppression_tolerance_rate" + + // PodAnnotationCPUEnhancementCPUBurstPolicy is the policy for setting the cpu burst value. + // There are 3 possible values for this: none, static, dynamic. + // + // - None: cpu burst is not set + // - Static: cpu burst value does not change + // - Dynamic: cpu burst value is only enabled when pod cpu utilisation is lower than the threshold set + PodAnnotationCPUEnhancementCPUBurstPolicy = "cpu_burst_policy" + PodAnnotationCPUEnhancementCPUBurstPolicyNone = "none" + PodAnnotationCPUEnhancementCPUBurstPolicyStatic = "static" + PodAnnotationCPUEnhancementCPUBurstPolicyDynamic = "dynamic" + + // PodAnnotationCPUEnhancementCPUBurstThreshold is the value such that when pod cpu utilisation becomes lower than + // the threshold, cpu burst is dynamically enabled. Only enabled when cpu burst policy is dynamic + PodAnnotationCPUEnhancementCPUBurstThreshold = "cpu_burst_threshold" + + // PodAnnotationCPUEnhancementCPUBurstPercent determines the cpu burst value to be set. + // For cgroup v1, the cpu burst value is calculated using cpu.cfs_quota_us * (cpu_burst_percent / 100) + // For cgroup v2, the cpu burst value is calculated using cpu.max * (cpu_burst_percent / 100) + PodAnnotationCPUEnhancementCPUBurstPercent = "cpu_burst_percent" ) // const variables for pod annotations about qos level enhancement in network From e86baddac7540e57d6cac066d43e587f424e65fb Mon Sep 17 00:00:00 2001 From: "justin.cheng" Date: Wed, 12 Nov 2025 16:19:15 +0800 Subject: [PATCH 22/27] feat(cpu): add fine-grained resource config in AdminQoSConfiguration for cpu burst support --- ...t.kubewharf.io_adminqosconfigurations.yaml | 21 ++++++++ pkg/apis/config/v1alpha1/adminqos.go | 22 ++++++++ .../config/v1alpha1/zz_generated.deepcopy.go | 52 +++++++++++++++++++ 3 files changed, 95 insertions(+) diff --git a/config/crd/bases/config.katalyst.kubewharf.io_adminqosconfigurations.yaml b/config/crd/bases/config.katalyst.kubewharf.io_adminqosconfigurations.yaml index 45dc81af..b0b3a84e 100644 --- a/config/crd/bases/config.katalyst.kubewharf.io_adminqosconfigurations.yaml +++ b/config/crd/bases/config.katalyst.kubewharf.io_adminqosconfigurations.yaml @@ -713,6 +713,27 @@ spec: type: number type: object type: object + fineGrainedResourceConfig: + description: FineGrainedResourceConfig is a configuration for + more fine-grained resource control + properties: + cpuBurstConfig: + description: CPUBurstConfig has cpu burst related configurations + properties: + defaultCPUBurstPercent: + description: DefaultCPUBurstPercent is the default cpu + burst percent to be set for pods with dedicated cores. + format: int64 + maximum: 100 + minimum: 0 + type: integer + enableDedicatedCoresDefaultCPUBurst: + description: EnableDedicatedCoresDefaultCPUBurst indicates + whether cpu burst should be enabled by default for pods + with dedicated cores. + type: boolean + type: object + type: object reclaimedResourceConfig: description: ReclaimedResourceConfig is a configuration for reclaim resource diff --git a/pkg/apis/config/v1alpha1/adminqos.go b/pkg/apis/config/v1alpha1/adminqos.go index ab824ea9..a3cd48b9 100644 --- a/pkg/apis/config/v1alpha1/adminqos.go +++ b/pkg/apis/config/v1alpha1/adminqos.go @@ -80,6 +80,10 @@ type AdminQoSConfig struct { // +optional AdvisorConfig *AdvisorConfig `json:"advisorConfig,omitempty"` + + // FineGrainedResourceConfig is a configuration for more fine-grained resource control + // +optional + FineGrainedResourceConfig *FineGrainedResourceConfig `json:"fineGrainedResourceConfig,omitempty"` } type ReclaimedResourceConfig struct { @@ -905,3 +909,21 @@ const ( // Use this when you want to disable resource reclaiming only for specific pods. DisableReclaimLevelPod DisableReclaimLevel = "Pod" ) + +type FineGrainedResourceConfig struct { + // CPUBurstConfig has cpu burst related configurations + // +optional + CPUBurstConfig *CPUBurstConfig `json:"cpuBurstConfig,omitempty"` +} + +type CPUBurstConfig struct { + // EnableDedicatedCoresDefaultCPUBurst indicates whether cpu burst should be enabled by default for pods with dedicated cores. + // +optional + EnableDedicatedCoresDefaultCPUBurst *bool `json:"enableDedicatedCoresDefaultCPUBurst,omitempty"` + + // DefaultCPUBurstPercent is the default cpu burst percent to be set for pods with dedicated cores. + // +kubebuilder:validation:Minimum=0 + // +kubebuilder:validation:Maximum=100 + // +optional + DefaultCPUBurstPercent *int64 `json:"defaultCPUBurstPercent,omitempty"` +} diff --git a/pkg/apis/config/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/config/v1alpha1/zz_generated.deepcopy.go index 91f03d7d..219f43e8 100644 --- a/pkg/apis/config/v1alpha1/zz_generated.deepcopy.go +++ b/pkg/apis/config/v1alpha1/zz_generated.deepcopy.go @@ -87,6 +87,11 @@ func (in *AdminQoSConfig) DeepCopyInto(out *AdminQoSConfig) { *out = new(AdvisorConfig) (*in).DeepCopyInto(*out) } + if in.FineGrainedResourceConfig != nil { + in, out := &in.FineGrainedResourceConfig, &out.FineGrainedResourceConfig + *out = new(FineGrainedResourceConfig) + (*in).DeepCopyInto(*out) + } return } @@ -411,6 +416,32 @@ func (in *CPUAdvisorConfig) DeepCopy() *CPUAdvisorConfig { return out } +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *CPUBurstConfig) DeepCopyInto(out *CPUBurstConfig) { + *out = *in + if in.EnableDedicatedCoresDefaultCPUBurst != nil { + in, out := &in.EnableDedicatedCoresDefaultCPUBurst, &out.EnableDedicatedCoresDefaultCPUBurst + *out = new(bool) + **out = **in + } + if in.DefaultCPUBurstPercent != nil { + in, out := &in.DefaultCPUBurstPercent, &out.DefaultCPUBurstPercent + *out = new(int64) + **out = **in + } + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new CPUBurstConfig. +func (in *CPUBurstConfig) DeepCopy() *CPUBurstConfig { + if in == nil { + return nil + } + out := new(CPUBurstConfig) + in.DeepCopyInto(out) + return out +} + // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *CPUHeadroomConfig) DeepCopyInto(out *CPUHeadroomConfig) { *out = *in @@ -959,6 +990,27 @@ func (in *EvictionConfig) DeepCopy() *EvictionConfig { return out } +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *FineGrainedResourceConfig) DeepCopyInto(out *FineGrainedResourceConfig) { + *out = *in + if in.CPUBurstConfig != nil { + in, out := &in.CPUBurstConfig, &out.CPUBurstConfig + *out = new(CPUBurstConfig) + (*in).DeepCopyInto(*out) + } + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new FineGrainedResourceConfig. +func (in *FineGrainedResourceConfig) DeepCopy() *FineGrainedResourceConfig { + if in == nil { + return nil + } + out := new(FineGrainedResourceConfig) + in.DeepCopyInto(out) + return out +} + // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *GenericConfigCondition) DeepCopyInto(out *GenericConfigCondition) { *out = *in From ee73c3bf5807229fa3bdfce6db22af42350ea947 Mon Sep 17 00:00:00 2001 From: "justin.cheng" Date: Fri, 21 Nov 2025 16:23:39 +0800 Subject: [PATCH 23/27] feat(cpu): add a new cpu burst policy closed --- pkg/apis/config/v1alpha1/adminqos.go | 3 +++ pkg/consts/qos.go | 6 ++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/pkg/apis/config/v1alpha1/adminqos.go b/pkg/apis/config/v1alpha1/adminqos.go index a3cd48b9..70e40c4f 100644 --- a/pkg/apis/config/v1alpha1/adminqos.go +++ b/pkg/apis/config/v1alpha1/adminqos.go @@ -918,6 +918,9 @@ type FineGrainedResourceConfig struct { type CPUBurstConfig struct { // EnableDedicatedCoresDefaultCPUBurst indicates whether cpu burst should be enabled by default for pods with dedicated cores. + // If set to true, it means that cpu burst should be enabled by default for pods with dedicated cores (cpu burst value is calculated and set). + // If set to false, it means that cpu burst should be disabled for pods with dedicated cores (cpu burst value is set to 0). + // If set to nil, it means that no operation is done on the cpu burst value. // +optional EnableDedicatedCoresDefaultCPUBurst *bool `json:"enableDedicatedCoresDefaultCPUBurst,omitempty"` diff --git a/pkg/consts/qos.go b/pkg/consts/qos.go index 21c4bbef..0e6fd40b 100644 --- a/pkg/consts/qos.go +++ b/pkg/consts/qos.go @@ -118,11 +118,13 @@ const ( // PodAnnotationCPUEnhancementCPUBurstPolicy is the policy for setting the cpu burst value. // There are 3 possible values for this: none, static, dynamic. // - // - None: cpu burst is not set - // - Static: cpu burst value does not change + // - None: There is no change to cpu burst value + // - Closed: cpu burst value is always set to 0 + // - Static: cpu burst value is set to a constant value // - Dynamic: cpu burst value is only enabled when pod cpu utilisation is lower than the threshold set PodAnnotationCPUEnhancementCPUBurstPolicy = "cpu_burst_policy" PodAnnotationCPUEnhancementCPUBurstPolicyNone = "none" + PodAnnotationCPUEnhancementCPUBurstPolicyClosed = "closed" PodAnnotationCPUEnhancementCPUBurstPolicyStatic = "static" PodAnnotationCPUEnhancementCPUBurstPolicyDynamic = "dynamic" From 5e2cb7755a623f534b1de920038e499b805a53e6 Mon Sep 17 00:00:00 2001 From: "justin.cheng" Date: Mon, 29 Dec 2025 14:50:24 +0800 Subject: [PATCH 24/27] fix: change none policy to default --- pkg/consts/qos.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/consts/qos.go b/pkg/consts/qos.go index 0e6fd40b..0fd54d47 100644 --- a/pkg/consts/qos.go +++ b/pkg/consts/qos.go @@ -116,14 +116,14 @@ const ( PodAnnotationCPUEnhancementSuppressionToleranceRate = "suppression_tolerance_rate" // PodAnnotationCPUEnhancementCPUBurstPolicy is the policy for setting the cpu burst value. - // There are 3 possible values for this: none, static, dynamic. + // There are 3 possible values for this: default, static, dynamic. // - // - None: There is no change to cpu burst value + // - Default: There is no change to cpu burst value // - Closed: cpu burst value is always set to 0 // - Static: cpu burst value is set to a constant value // - Dynamic: cpu burst value is only enabled when pod cpu utilisation is lower than the threshold set PodAnnotationCPUEnhancementCPUBurstPolicy = "cpu_burst_policy" - PodAnnotationCPUEnhancementCPUBurstPolicyNone = "none" + PodAnnotationCPUEnhancementCPUBurstPolicyDefault = "default" PodAnnotationCPUEnhancementCPUBurstPolicyClosed = "closed" PodAnnotationCPUEnhancementCPUBurstPolicyStatic = "static" PodAnnotationCPUEnhancementCPUBurstPolicyDynamic = "dynamic" From 70d71946d637f0fac473189d6dd27e7a19a7b9d9 Mon Sep 17 00:00:00 2001 From: "justin.cheng" Date: Thu, 8 Jan 2026 11:37:12 +0800 Subject: [PATCH 25/27] fix(aqc): generate new aqc crd --- ...nfig.katalyst.kubewharf.io_adminqosconfigurations.yaml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/config/crd/bases/config.katalyst.kubewharf.io_adminqosconfigurations.yaml b/config/crd/bases/config.katalyst.kubewharf.io_adminqosconfigurations.yaml index b0b3a84e..cbf8e7c6 100644 --- a/config/crd/bases/config.katalyst.kubewharf.io_adminqosconfigurations.yaml +++ b/config/crd/bases/config.katalyst.kubewharf.io_adminqosconfigurations.yaml @@ -728,9 +728,11 @@ spec: minimum: 0 type: integer enableDedicatedCoresDefaultCPUBurst: - description: EnableDedicatedCoresDefaultCPUBurst indicates - whether cpu burst should be enabled by default for pods - with dedicated cores. + description: |- + EnableDedicatedCoresDefaultCPUBurst indicates whether cpu burst should be enabled by default for pods with dedicated cores. + If set to true, it means that cpu burst should be enabled by default for pods with dedicated cores (cpu burst value is calculated and set). + If set to false, it means that cpu burst should be disabled for pods with dedicated cores (cpu burst value is set to 0). + If set to nil, it means that no operation is done on the cpu burst value. type: boolean type: object type: object From bbf0869824b442b2a02d91be56708fbcca7b11b1 Mon Sep 17 00:00:00 2001 From: koufeixiang Date: Thu, 8 Jan 2026 11:24:07 +0800 Subject: [PATCH 26/27] chore(*): add qrm conf to aqc --- ...t.kubewharf.io_adminqosconfigurations.yaml | 13 +++++ pkg/apis/config/v1alpha1/adminqos.go | 17 ++++++ .../config/v1alpha1/zz_generated.deepcopy.go | 54 +++++++++++++++++++ .../clientset/versioned/fake/register.go | 14 ++--- .../clientset/versioned/scheme/register.go | 14 ++--- 5 files changed, 98 insertions(+), 14 deletions(-) diff --git a/config/crd/bases/config.katalyst.kubewharf.io_adminqosconfigurations.yaml b/config/crd/bases/config.katalyst.kubewharf.io_adminqosconfigurations.yaml index cbf8e7c6..5726fceb 100644 --- a/config/crd/bases/config.katalyst.kubewharf.io_adminqosconfigurations.yaml +++ b/config/crd/bases/config.katalyst.kubewharf.io_adminqosconfigurations.yaml @@ -736,6 +736,19 @@ spec: type: boolean type: object type: object + qrmPluginConfig: + description: QRMPluginConfig is a configuration for qrm plugin + properties: + cpuPluginConfig: + description: CPUPluginConfig is the config for cpu plugin + properties: + preferUseExistNUMAHintResult: + description: |- + PreferUseExistNUMAHintResult prefer to use existing numa hint results + The calculation results may originate from upstream components and be recorded in the pod annotation + type: boolean + type: object + type: object reclaimedResourceConfig: description: ReclaimedResourceConfig is a configuration for reclaim resource diff --git a/pkg/apis/config/v1alpha1/adminqos.go b/pkg/apis/config/v1alpha1/adminqos.go index 70e40c4f..82eecb17 100644 --- a/pkg/apis/config/v1alpha1/adminqos.go +++ b/pkg/apis/config/v1alpha1/adminqos.go @@ -74,6 +74,10 @@ type AdminQoSConfig struct { // +optional ReclaimedResourceConfig *ReclaimedResourceConfig `json:"reclaimedResourceConfig,omitempty"` + // QRMPluginConfig is a configuration for qrm plugin + // +optional + QRMPluginConfig *QRMPluginConfig `json:"qrmPluginConfig,omitempty"` + // EvictionConfig is a configuration for eviction // +optional EvictionConfig *EvictionConfig `json:"evictionConfig,omitempty"` @@ -342,6 +346,19 @@ type CPUHeadroomUtilBasedConfig struct { NonReclaimUtilizationLow *float64 `json:"nonReclaimUtilizationLow,omitempty"` } +type QRMPluginConfig struct { + // CPUPluginConfig is the config for cpu plugin + // +optional + CPUPluginConfig *CPUPluginConfig `json:"cpuPluginConfig,omitempty"` +} + +type CPUPluginConfig struct { + // PreferUseExistNUMAHintResult prefer to use existing numa hint results + // The calculation results may originate from upstream components and be recorded in the pod annotation + // +optional + PreferUseExistNUMAHintResult *bool `json:"preferUseExistNUMAHintResult,omitempty"` +} + type EvictionConfig struct { // DryRun is the list of eviction plugins to dryRun // '*' means "all dry-run by default" diff --git a/pkg/apis/config/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/config/v1alpha1/zz_generated.deepcopy.go index 219f43e8..2e1790c2 100644 --- a/pkg/apis/config/v1alpha1/zz_generated.deepcopy.go +++ b/pkg/apis/config/v1alpha1/zz_generated.deepcopy.go @@ -77,6 +77,11 @@ func (in *AdminQoSConfig) DeepCopyInto(out *AdminQoSConfig) { *out = new(ReclaimedResourceConfig) (*in).DeepCopyInto(*out) } + if in.QRMPluginConfig != nil { + in, out := &in.QRMPluginConfig, &out.QRMPluginConfig + *out = new(QRMPluginConfig) + (*in).DeepCopyInto(*out) + } if in.EvictionConfig != nil { in, out := &in.EvictionConfig, &out.EvictionConfig *out = new(EvictionConfig) @@ -514,6 +519,27 @@ func (in *CPUHeadroomUtilBasedConfig) DeepCopy() *CPUHeadroomUtilBasedConfig { return out } +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *CPUPluginConfig) DeepCopyInto(out *CPUPluginConfig) { + *out = *in + if in.PreferUseExistNUMAHintResult != nil { + in, out := &in.PreferUseExistNUMAHintResult, &out.PreferUseExistNUMAHintResult + *out = new(bool) + **out = **in + } + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new CPUPluginConfig. +func (in *CPUPluginConfig) DeepCopy() *CPUPluginConfig { + if in == nil { + return nil + } + out := new(CPUPluginConfig) + in.DeepCopyInto(out) + return out +} + // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *CPUPressureEvictionConfig) DeepCopyInto(out *CPUPressureEvictionConfig) { *out = *in @@ -2213,6 +2239,27 @@ func (in *PriorityNodeLabelSelectorAllowedKeyList) DeepCopy() *PriorityNodeLabel return out } +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *QRMPluginConfig) DeepCopyInto(out *QRMPluginConfig) { + *out = *in + if in.CPUPluginConfig != nil { + in, out := &in.CPUPluginConfig, &out.CPUPluginConfig + *out = new(CPUPluginConfig) + (*in).DeepCopyInto(*out) + } + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new QRMPluginConfig. +func (in *QRMPluginConfig) DeepCopy() *QRMPluginConfig { + if in == nil { + return nil + } + out := new(QRMPluginConfig) + in.DeepCopyInto(out) + return out +} + // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *QoSLevelConfig) DeepCopyInto(out *QoSLevelConfig) { *out = *in @@ -2404,6 +2451,13 @@ func (in *ReclaimedResourcesEvictionConfig) DeepCopyInto(out *ReclaimedResources (*out)[key] = val } } + if in.SoftEvictionThreshold != nil { + in, out := &in.SoftEvictionThreshold, &out.SoftEvictionThreshold + *out = make(map[corev1.ResourceName]float64, len(*in)) + for key, val := range *in { + (*out)[key] = val + } + } if in.GracePeriod != nil { in, out := &in.GracePeriod, &out.GracePeriod *out = new(int64) diff --git a/pkg/client/clientset/versioned/fake/register.go b/pkg/client/clientset/versioned/fake/register.go index c0bb97ad..8d83696c 100644 --- a/pkg/client/clientset/versioned/fake/register.go +++ b/pkg/client/clientset/versioned/fake/register.go @@ -51,14 +51,14 @@ var localSchemeBuilder = runtime.SchemeBuilder{ // AddToScheme adds all types of this clientset into the given scheme. This allows composition // of clientsets, like in: // -// import ( -// "k8s.io/client-go/kubernetes" -// clientsetscheme "k8s.io/client-go/kubernetes/scheme" -// aggregatorclientsetscheme "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/scheme" -// ) +// import ( +// "k8s.io/client-go/kubernetes" +// clientsetscheme "k8s.io/client-go/kubernetes/scheme" +// aggregatorclientsetscheme "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/scheme" +// ) // -// kclientset, _ := kubernetes.NewForConfig(c) -// _ = aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme) +// kclientset, _ := kubernetes.NewForConfig(c) +// _ = aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme) // // After this, RawExtensions in Kubernetes types will serialize kube-aggregator types // correctly. diff --git a/pkg/client/clientset/versioned/scheme/register.go b/pkg/client/clientset/versioned/scheme/register.go index ffa9cdb4..17ad6fb2 100644 --- a/pkg/client/clientset/versioned/scheme/register.go +++ b/pkg/client/clientset/versioned/scheme/register.go @@ -51,14 +51,14 @@ var localSchemeBuilder = runtime.SchemeBuilder{ // AddToScheme adds all types of this clientset into the given scheme. This allows composition // of clientsets, like in: // -// import ( -// "k8s.io/client-go/kubernetes" -// clientsetscheme "k8s.io/client-go/kubernetes/scheme" -// aggregatorclientsetscheme "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/scheme" -// ) +// import ( +// "k8s.io/client-go/kubernetes" +// clientsetscheme "k8s.io/client-go/kubernetes/scheme" +// aggregatorclientsetscheme "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/scheme" +// ) // -// kclientset, _ := kubernetes.NewForConfig(c) -// _ = aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme) +// kclientset, _ := kubernetes.NewForConfig(c) +// _ = aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme) // // After this, RawExtensions in Kubernetes types will serialize kube-aggregator types // correctly. From df871f1e91af156a41f213a48730587ebe55e07a Mon Sep 17 00:00:00 2001 From: luomingmeng Date: Mon, 2 Feb 2026 20:57:25 +0800 Subject: [PATCH 27/27] feat(types): add attributes field to ResourcePackage and ResourcePool Add optional Attributes field to both structs to support custom metadata. The field uses patch merge strategy with name as the merge key. --- ...lyst.kubewharf.io_customnoderesources.yaml | 56 +++++++++++++++++++ pkg/apis/node/v1alpha1/types.go | 10 ++++ .../node/v1alpha1/zz_generated.deepcopy.go | 10 ++++ 3 files changed, 76 insertions(+) diff --git a/config/crd/bases/node.katalyst.kubewharf.io_customnoderesources.yaml b/config/crd/bases/node.katalyst.kubewharf.io_customnoderesources.yaml index 8dba6883..3de89fa0 100644 --- a/config/crd/bases/node.katalyst.kubewharf.io_customnoderesources.yaml +++ b/config/crd/bases/node.katalyst.kubewharf.io_customnoderesources.yaml @@ -341,6 +341,20 @@ spec: Allocatable defines the total resources available for this package. Keys usually include "cpu" and "memory" (e.g. cpu: "64", memory: "128Gi"). type: object + attributes: + items: + description: Attribute records the resource-specified + info with name-value pairs + properties: + name: + type: string + value: + type: string + required: + - name + - value + type: object + type: array packageName: description: |- PackageName is the identifier for this package, e.g. "x2", "x8". @@ -385,6 +399,20 @@ spec: - ResourcePools are derived from metrics reported in a NodeProfileDescriptor CRD. - These metrics are mapped into MinAllocatable/MaxAllocatable values. properties: + attributes: + items: + description: Attribute records the resource-specified + info with name-value pairs + properties: + name: + type: string + value: + type: string + required: + - name + - value + type: object + type: array maxAllocatable: additionalProperties: anyOf: @@ -564,6 +592,20 @@ spec: Allocatable defines the total resources available for this package. Keys usually include "cpu" and "memory" (e.g. cpu: "64", memory: "128Gi"). type: object + attributes: + items: + description: Attribute records the resource-specified + info with name-value pairs + properties: + name: + type: string + value: + type: string + required: + - name + - value + type: object + type: array packageName: description: |- PackageName is the identifier for this package, e.g. "x2", "x8". @@ -608,6 +650,20 @@ spec: - ResourcePools are derived from metrics reported in a NodeProfileDescriptor CRD. - These metrics are mapped into MinAllocatable/MaxAllocatable values. properties: + attributes: + items: + description: Attribute records the resource-specified + info with name-value pairs + properties: + name: + type: string + value: + type: string + required: + - name + - value + type: object + type: array maxAllocatable: additionalProperties: anyOf: diff --git a/pkg/apis/node/v1alpha1/types.go b/pkg/apis/node/v1alpha1/types.go index 4964c434..03809648 100644 --- a/pkg/apis/node/v1alpha1/types.go +++ b/pkg/apis/node/v1alpha1/types.go @@ -385,6 +385,11 @@ type ResourcePackage struct { // Allocatable defines the total resources available for this package. // Keys usually include "cpu" and "memory" (e.g. cpu: "64", memory: "128Gi"). Allocatable *v1.ResourceList `json:"allocatable,omitempty"` + + // +optional + // +patchMergeKey=name + // +patchStrategy=merge + Attributes []Attribute `json:"attributes,omitempty" patchStrategy:"merge" patchMergeKey:"name"` } // ResourcePool represents a pool of resources reserved for a specific workload type. @@ -417,6 +422,11 @@ type ResourcePool struct { // resources are available on the node. // - Supports resource sharing between pools, but with clear limits. MaxAllocatable *v1.ResourceList `json:"maxAllocatable,omitempty"` + + // +optional + // +patchMergeKey=name + // +patchStrategy=merge + Attributes []Attribute `json:"attributes,omitempty" patchStrategy:"merge" patchMergeKey:"name"` } // +genclient diff --git a/pkg/apis/node/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/node/v1alpha1/zz_generated.deepcopy.go index 5afb0c5a..11a68294 100644 --- a/pkg/apis/node/v1alpha1/zz_generated.deepcopy.go +++ b/pkg/apis/node/v1alpha1/zz_generated.deepcopy.go @@ -543,6 +543,11 @@ func (in *ResourcePackage) DeepCopyInto(out *ResourcePackage) { } } } + if in.Attributes != nil { + in, out := &in.Attributes, &out.Attributes + *out = make([]Attribute, len(*in)) + copy(*out, *in) + } return } @@ -581,6 +586,11 @@ func (in *ResourcePool) DeepCopyInto(out *ResourcePool) { } } } + if in.Attributes != nil { + in, out := &in.Attributes, &out.Attributes + *out = make([]Attribute, len(*in)) + copy(*out, *in) + } return }