Skip to content

chore: backport 2026/07/09 #1330

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
michaelawyu merged 2 commits into from
Jul 10, 2026
Merged

chore: backport 2026/07/09 #1330

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ed5b14f
feat: add CEL based validation to placement API definitions (#751)
michaelawyu Jul 9, 2026
d081429
Merge remote-tracking branch 'cncf/main' into backport/20260709
michaelawyu Jul 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions apis/placement/v1/clusterresourceplacement_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,12 +132,16 @@ type PlacementSpec struct {
// +kubebuilder:validation:Required
// +kubebuilder:validation:MinItems=1
// +kubebuilder:validation:MaxItems=100
// +kubebuilder:validation:XValidation:rule="self.all(x, !(has(x.name) && size(x.name) > 0 && has(x.labelSelector)))",message="name and labelSelector are mutually exclusive in a resource selector"
ResourceSelectors []ResourceSelectorTerm `json:"resourceSelectors"`

// Policy defines how to select member clusters to place the selected resources.
// If unspecified, all the joined member clusters are selected.
// +kubebuilder:validation:Optional
// +kubebuilder:validation:XValidation:rule="!(self.placementType != oldSelf.placementType)",message="placement type is immutable"
// +kubebuilder:validation:XValidation:rule="self.placementType != 'PickFixed' || (!has(self.affinity) && !has(self.numberOfClusters) && !has(self.topologySpreadConstraints) && !has(self.tolerations))",message="affinity, numberOfClusters, topologySpreadConstraints, and tolerations cannot be set when placementType is PickFixed"
// +kubebuilder:validation:XValidation:rule="self.placementType != 'PickAll' || (!has(self.clusterNames) && !has(self.numberOfClusters) && !has(self.topologySpreadConstraints))",message="clusterNames, numberOfClusters, and topologySpreadConstraints cannot be set when placementType is PickAll"
// +kubebuilder:validation:XValidation:rule="self.placementType != 'PickN' || (!has(self.clusterNames) && has(self.numberOfClusters))",message="clusterNames cannot be set and numberOfClusters must be set when placementType is PickN"
Policy *PlacementPolicy `json:"policy,omitempty"`

// The rollout strategy to use to replace existing placement with new ones.
Expand Down Expand Up @@ -341,6 +345,8 @@ type PlacementPolicy struct {
// This field is beta-level and is for the taints and tolerations feature.
// +kubebuilder:validation:MaxItems=100
// +kubebuilder:validation:Optional
// +kubebuilder:validation:XValidation:rule="self.all(x, x.operator != 'Exists' || !has(x.value) || size(x.value) == 0)",message="value must be empty when operator is Exists"
// +kubebuilder:validation:XValidation:rule="self.all(x, (has(x.key) && size(x.key) > 0) || x.operator == 'Exists')",message="operator must be Exists when key is empty"
Tolerations []Toleration `json:"tolerations,omitempty"`
}

Expand Down Expand Up @@ -499,6 +505,7 @@ type PropertySorter struct {
// SortOrder explains how Fleet should perform the sort; specifically, whether Fleet should
// sort in ascending or descending order.
// +kubebuilder:validation:Required
// +kubebuilder:validation:Enum=Ascending;Descending
SortOrder PropertySortOrder `json:"sortOrder"`
}

Expand Down Expand Up @@ -564,6 +571,8 @@ type TopologySpreadConstraint struct {
// but giving higher precedence to topologies that would help reduce the skew.
// It's an optional field.
// +kubebuilder:validation:Optional
// +kubebuilder:default=DoNotSchedule
// +kubebuilder:validation:Enum=DoNotSchedule;ScheduleAnyway
WhenUnsatisfiable UnsatisfiableConstraintAction `json:"whenUnsatisfiable,omitempty"`
}

Expand Down Expand Up @@ -989,6 +998,7 @@ type RollingUpdateConfig struct {
// Default is 60.
// +kubebuilder:default=60
// +kubebuilder:validation:Optional
// +kubebuilder:validation:Minimum=0
UnavailablePeriodSeconds *int `json:"unavailablePeriodSeconds,omitempty"`
}

Expand Down
10 changes: 10 additions & 0 deletions apis/placement/v1beta1/clusterresourceplacement_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,12 +133,16 @@ type PlacementSpec struct {
// +kubebuilder:validation:Required
// +kubebuilder:validation:MinItems=1
// +kubebuilder:validation:MaxItems=100
// +kubebuilder:validation:XValidation:rule="self.all(x, !(has(x.name) && size(x.name) > 0 && has(x.labelSelector)))",message="name and labelSelector are mutually exclusive in a resource selector"
ResourceSelectors []ResourceSelectorTerm `json:"resourceSelectors"`

// Policy defines how to select member clusters to place the selected resources.
// If unspecified, all the joined member clusters are selected.
// +kubebuilder:validation:Optional
// +kubebuilder:validation:XValidation:rule="!(self.placementType != oldSelf.placementType)",message="placement type is immutable"
// +kubebuilder:validation:XValidation:rule="self.placementType != 'PickFixed' || (!has(self.affinity) && !has(self.numberOfClusters) && !has(self.topologySpreadConstraints) && !has(self.tolerations))",message="affinity, numberOfClusters, topologySpreadConstraints, and tolerations cannot be set when placementType is PickFixed"
// +kubebuilder:validation:XValidation:rule="self.placementType != 'PickAll' || (!has(self.clusterNames) && !has(self.numberOfClusters) && !has(self.topologySpreadConstraints))",message="clusterNames, numberOfClusters, and topologySpreadConstraints cannot be set when placementType is PickAll"
// +kubebuilder:validation:XValidation:rule="self.placementType != 'PickN' || (!has(self.clusterNames) && has(self.numberOfClusters))",message="clusterNames cannot be set and numberOfClusters must be set when placementType is PickN"
Policy *PlacementPolicy `json:"policy,omitempty"`

// The rollout strategy to use to replace existing placement with new ones.
Expand Down Expand Up @@ -349,6 +353,8 @@ type PlacementPolicy struct {
// This field is beta-level and is for the taints and tolerations feature.
// +kubebuilder:validation:MaxItems=100
// +kubebuilder:validation:Optional
// +kubebuilder:validation:XValidation:rule="self.all(x, x.operator != 'Exists' || !has(x.value) || size(x.value) == 0)",message="value must be empty when operator is Exists"
// +kubebuilder:validation:XValidation:rule="self.all(x, (has(x.key) && size(x.key) > 0) || x.operator == 'Exists')",message="operator must be Exists when key is empty"
Tolerations []Toleration `json:"tolerations,omitempty"`
}

Expand Down Expand Up @@ -507,6 +513,7 @@ type PropertySorter struct {
// SortOrder explains how Fleet should perform the sort; specifically, whether Fleet should
// sort in ascending or descending order.
// +kubebuilder:validation:Required
// +kubebuilder:validation:Enum=Ascending;Descending
SortOrder PropertySortOrder `json:"sortOrder"`
}

Expand Down Expand Up @@ -572,6 +579,8 @@ type TopologySpreadConstraint struct {
// but giving higher precedence to topologies that would help reduce the skew.
// It's an optional field.
// +kubebuilder:validation:Optional
// +kubebuilder:default=DoNotSchedule
// +kubebuilder:validation:Enum=DoNotSchedule;ScheduleAnyway
WhenUnsatisfiable UnsatisfiableConstraintAction `json:"whenUnsatisfiable,omitempty"`
}

Expand Down Expand Up @@ -1004,6 +1013,7 @@ type RollingUpdateConfig struct {
// Default is 60.
// +kubebuilder:default=60
// +kubebuilder:validation:Optional
// +kubebuilder:validation:Minimum=0
UnavailablePeriodSeconds *int `json:"unavailablePeriodSeconds,omitempty"`
}

Expand Down
9 changes: 9 additions & 0 deletions config/crd/bases/placement.kubernetes-fleet.io_clusterresourceoverrides.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -342,6 +342,9 @@ spec:
description: |-
SortOrder explains how Fleet should perform the sort; specifically, whether Fleet should
sort in ascending or descending order.
enum:
- Ascending
- Descending
type: string
required:
- name
Expand Down Expand Up @@ -746,6 +749,9 @@ spec:
description: |-
SortOrder explains how Fleet should perform the sort; specifically, whether Fleet should
sort in ascending or descending order.
enum:
- Ascending
- Descending
type: string
required:
- name
Expand Down Expand Up @@ -1146,6 +1152,9 @@ spec:
description: |-
SortOrder explains how Fleet should perform the sort; specifically, whether Fleet should
sort in ascending or descending order.
enum:
- Ascending
- Descending
type: string
required:
- name
Expand Down
9 changes: 9 additions & 0 deletions config/crd/bases/placement.kubernetes-fleet.io_clusterresourceoverridesnapshots.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -356,6 +356,9 @@ spec:
description: |-
SortOrder explains how Fleet should perform the sort; specifically, whether Fleet should
sort in ascending or descending order.
enum:
- Ascending
- Descending
type: string
required:
- name
Expand Down Expand Up @@ -774,6 +777,9 @@ spec:
description: |-
SortOrder explains how Fleet should perform the sort; specifically, whether Fleet should
sort in ascending or descending order.
enum:
- Ascending
- Descending
type: string
required:
- name
Expand Down Expand Up @@ -1188,6 +1194,9 @@ spec:
description: |-
SortOrder explains how Fleet should perform the sort; specifically, whether Fleet should
sort in ascending or descending order.
enum:
- Ascending
- Descending
type: string
required:
- name
Expand Down
Loading
Loading