Skip to content

Commit 9143e19

Browse files
authored
remove cel from placement decision group (#371)
Signed-off-by: Qing Hao <[email protected]>
1 parent 6c5efe2 commit 9143e19

File tree

4 files changed

+41
-11
lines changed

4 files changed

+41
-11
lines changed

cluster/v1beta1/0000_02_clusters.open-cluster-management.io_placements.crd.yaml

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -121,16 +121,6 @@ spec:
121121
description: LabelSelector to select clusters subset
122122
by label.
123123
properties:
124-
celSelector:
125-
description: CelSelector represents a selector of
126-
ManagedClusters by CEL expressions on ManagedCluster
127-
fields
128-
properties:
129-
celExpressions:
130-
items:
131-
type: string
132-
type: array
133-
type: object
134124
claimSelector:
135125
description: ClaimSelector represents a selector
136126
of ManagedClusters by clusterClaims in status

cluster/v1beta1/types_placement.go

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,19 @@ type DecisionGroup struct {
112112
// LabelSelector to select clusters subset by label.
113113
// +kubebuilder:validation:Required
114114
// +required
115-
ClusterSelector ClusterSelector `json:"groupClusterSelector,omitempty"`
115+
ClusterSelector GroupClusterSelector `json:"groupClusterSelector,omitempty"`
116+
}
117+
118+
// GroupClusterSelector represents the AND of the containing selectors for groupClusterSelector. An empty group cluster selector matches all objects.
119+
// A null group cluster selector matches no objects.
120+
type GroupClusterSelector struct {
121+
// LabelSelector represents a selector of ManagedClusters by label
122+
// +optional
123+
LabelSelector metav1.LabelSelector `json:"labelSelector,omitempty"`
124+
125+
// ClaimSelector represents a selector of ManagedClusters by clusterClaims in status
126+
// +optional
127+
ClaimSelector ClusterClaimSelector `json:"claimSelector,omitempty"`
116128
}
117129

118130
// Group the created placementDecision into decision groups based on the number of clusters per decision group.

cluster/v1beta1/zz_generated.deepcopy.go

Lines changed: 18 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

cluster/v1beta1/zz_generated.swagger_doc_generated.go

Lines changed: 10 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)