Skip to content

Commit

Permalink
modify leaf mod and add node name
Browse files Browse the repository at this point in the history
Signed-off-by: wuyingjun <[email protected]>
  • Loading branch information
wuyingjun-lucky committed Nov 10, 2023
1 parent 3d210f5 commit be92826
Show file tree
Hide file tree
Showing 3 changed files with 67 additions and 11 deletions.
12 changes: 11 additions & 1 deletion pkg/apis/kosmos/v1alpha1/cluster_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,7 @@ type ClusterTreeOptions struct {
Enable bool `json:"enable"`

// LeafModel provide an api to arrange the member cluster with some rules to pretend one or more leaf node
// If nil or empty, the hole member cluster nodes will pretend one leaf node.
// +optional
LeafModel []LeafModel `json:"leafModel,omitempty"`
}
Expand All @@ -118,9 +119,18 @@ type LeafModel struct {
// +optional
Taints []corev1.Taint `json:"taints,omitempty"`

// NodeSelector is a selector to select member cluster nodes to pretend a leaf node in clusterTree.
// +optional
NodeSelector NodeSelector `json:"nodeSelector,omitempty"`
}

type NodeSelector struct {
// NodeName is Member cluster origin node Name
// +optional
NodeName string `json:"nodeName,omitempty"`

// LabelSelector is a filter to select member cluster nodes to pretend a leaf node in clusterTree by labels.
// It will work on second level schedule on pod create in member clusters.
// If nil or empty, the hole member cluster nodes will pretend one leaf node.
// +optional
LabelSelector *metav1.LabelSelector `json:"labelSelector,omitempty"`
}
Expand Down
27 changes: 22 additions & 5 deletions pkg/apis/kosmos/v1alpha1/zz_generated.deepcopy.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

39 changes: 34 additions & 5 deletions pkg/generated/openapi/zz_generated.openapi.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit be92826

Please sign in to comment.