Merge branch 'kubernetes-sigs:main' into more-tracing-spans

Author: waterloong

Makefile

@@ -134,6 +134,7 @@ fmt-verify:
 vet: ## Run go vet against code.
 	go vet ./...
 
+#If you are running in local and your helm dependency is outdated, you can run `make test MODE=local`
 .PHONY: test
 test: generate fmt vet envtest image-build verify-crds verify-helm-charts ## Run tests.
 	CGO_ENABLED=1 KUBEBUILDER_ASSETS="$(shell $(ENVTEST) use $(ENVTEST_K8S_VERSION) --bin-dir $(LOCALBIN) -p path)" go test $$(go list ./... | grep -v /e2e | grep -v /conformance) -race -coverprofile cover.out
@@ -180,9 +181,10 @@ verify: vet fmt-verify generate ci-lint api-lint verify-all
 verify-crds: kubectl-validate
 	hack/verify-manifests.sh
 
+#If you are running in local and your helm dependency is outdated, you can run `make verify-helm-charts MODE=local`
 .PHONY: verify-helm-charts
 verify-helm-charts: helm-install
-	hack/verify-helm.sh
+	hack/verify-helm.sh $(MODE)
 
 # Run static analysis.
 .PHONY: verify-all

apix/config/v1alpha1/endpointpickerconfig_types.go

@@ -54,16 +54,22 @@ type EndpointPickerConfig struct {
 	// +optional
 	// Data configures the DataLayer. It is required if the new DataLayer is enabled.
 	Data *DataLayerConfig `json:"data"`
+
+	// +optional
+	// FlowControl configures the Flow Control layer.
+	// This configuration is only respected if the "flowControl" FeatureGate is enabled.
+	FlowControl *FlowControlConfig `json:"flowControl,omitempty"`
 }
 
 func (cfg EndpointPickerConfig) String() string {
 	return fmt.Sprintf(
-		"{FeatureGates: %v, Plugins: %v, SchedulingProfiles: %v, Data: %v, SaturationDetector: %v}",
+		"{FeatureGates: %v, Plugins: %v, SchedulingProfiles: %v, Data: %v, SaturationDetector: %v, FlowControl: %v}",
 		cfg.FeatureGates,
 		cfg.Plugins,
 		cfg.SchedulingProfiles,
 		cfg.Data,
 		cfg.SaturationDetector,
+		cfg.FlowControl,
 	)
 }
 
@@ -126,13 +132,13 @@ type SchedulingPlugin struct {
 
 	// +optional
 	// Weight is the weight fo be used if this plugin is a Scorer.
-	Weight *int `json:"weight"`
+	Weight *float64 `json:"weight"`
 }
 
 func (sp SchedulingPlugin) String() string {
 	var weight string
 	if sp.Weight != nil {
-		weight = fmt.Sprintf(", Weight: %d", *sp.Weight)
+		weight = fmt.Sprintf(", Weight: %f", *sp.Weight)
 	}
 	return fmt.Sprintf("{PluginRef: %s%s}", sp.PluginRef, weight)
 }
@@ -245,3 +251,70 @@ type DataLayerExtractor struct {
 func (dle DataLayerExtractor) String() string {
 	return "{PluginRef: " + dle.PluginRef + "}"
 }
+
+// FlowControlConfig configures the Flow Control layer.
+type FlowControlConfig struct {
+	// +optional
+	// MaxBytes defines the global capacity limit for the Flow Control system.
+	// It represents the maximum aggregate byte size of all active requests across all priority
+	// levels. If this limit is exceeded, new requests will be rejected even if their specific
+	// priority band has capacity.
+	// If 0 or omitted, no global limit is enforced (unlimited).
+	// Default: 0 (unlimited).
+	MaxBytes *int64 `json:"maxBytes,omitempty"`
+
+	// +optional
+	// DefaultRequestTTL serves as a fallback timeout for requests that do not specify their own
+	// deadline.
+	// It ensures that requests do not hang indefinitely in the queue.
+	// If 0 or omitted, it defaults to the client context deadline, meaning requests may wait
+	// indefinitely unless cancelled by the client.
+	DefaultRequestTTL *metav1.Duration `json:"defaultRequestTTL,omitempty"`
+
+	// +optional
+	// DefaultPriorityBand allows you to define a template for handling traffic with priority levels
+	// that are not explicitly configured in `PriorityBands`.
+	// This ensures that unforeseen traffic classes are still managed (e.g., given a default capacity
+	// limit) rather than being rejected or treated arbitrarily.
+	// If not specified, a system-default template is used to dynamically provision bands for new
+	// priority levels. This template cascades to the standard `PriorityBandConfig` defaults.
+	DefaultPriorityBand *PriorityBandConfig `json:"defaultPriorityBand,omitempty"`
+
+	// PriorityBands allows you to explicitly define policies (like capacity limits) for specific
+	// priority levels. Traffic matching these priorities will be handled according to these rules.
+	// If a priority band is not specified, it uses specific defaults.
+	PriorityBands []PriorityBandConfig `json:"priorityBands,omitempty"`
+}
+
+func (fcc *FlowControlConfig) String() string {
+	return fmt.Sprintf("{MaxBytes: %v, DefaultPriorityBand: %v, PriorityBands: %v}",
+		fcc.MaxBytes, fcc.DefaultPriorityBand, fcc.PriorityBands)
+}
+
+// PriorityBandConfig configures a single priority band.
+type PriorityBandConfig struct {
+	// Priority is the integer priority level for this band.
+	// Higher values indicate higher priority.
+	Priority int `json:"priority"`
+
+	// +optional
+	// MaxBytes is the maximum number of bytes allowed for this priority band.
+	// If 0 or omitted, the system default is used.
+	// Default: 1 GB.
+	MaxBytes *int64 `json:"maxBytes,omitempty"`
+
+	// +optional
+	// FairnessPolicyRef specifies the name of the policy that governs flow selection.
+	// If omitted, the system default ("global-strict-fairness-policy") is used.
+	FairnessPolicyRef string `json:"fairnessPolicyRef,omitempty"`
+
+	// +optional
+	// OrderingPolicyRef specifies the name of the policy that governs request selection within a flow.
+	// If omitted, the system default ("fcfs-ordering-policy") is used.
+	OrderingPolicyRef string `json:"orderingPolicyRef,omitempty"`
+}
+
+func (pbc PriorityBandConfig) String() string {
+	return fmt.Sprintf("{Priority: %d, MaxBytes: %v, FairnessPolicyRef: %s, OrderingPolicyRef: %s}",
+		pbc.Priority, pbc.MaxBytes, pbc.FairnessPolicyRef, pbc.OrderingPolicyRef)
+}