Skip to content

Commit

Permalink
Merge pull request #221 from duanmengkk/impl_leaf_model
Browse files Browse the repository at this point in the history 
Impl leaf model
  • Loading branch information
@kosmos-robot
kosmos-robot authored Nov 10, 2023
2 parents 2803550 + 71f5c0e commit 73a0592
Show file tree
Hide file tree
Showing 8 changed files with 273 additions and 98 deletions.
110 changes: 60 additions & 50 deletions deploy/crds/kosmos.io_clusters.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -115,59 +115,10 @@ spec:
default: true
type: boolean
leafModel:
description: LeafModel provide an api to arrange the member cluster
description: LeafModels provide an api to arrange the member cluster
with some rules to pretend one or more leaf node
items:
properties:
labelSelector:
description: LabelSelector is a filter to select member
cluster nodes to pretend a leaf node in clusterTree by
labels. If nil or empty, the hole member cluster nodes
will pretend one leaf node.
properties:
matchExpressions:
description: matchExpressions is a list of label selector
requirements. The requirements are ANDed.
items:
description: A label selector requirement is a selector
that contains values, a key, and an operator that
relates the key and values.
properties:
key:
description: key is the label key that the selector
applies to.
type: string
operator:
description: operator represents a key's relationship
to a set of values. Valid operators are In,
NotIn, Exists and DoesNotExist.
type: string
values:
description: values is an array of string values.
If the operator is In or NotIn, the values array
must be non-empty. If the operator is Exists
or DoesNotExist, the values array must be empty.
This array is replaced during a strategic merge
patch.
items:
type: string
type: array
required:
- key
- operator
type: object
type: array
matchLabels:
additionalProperties:
type: string
description: matchLabels is a map of {key,value} pairs.
A single {key,value} in the matchLabels map is equivalent
to an element of matchExpressions, whose key field
is "key", the operator is "In", and the values array
contains only "value". The requirements are ANDed.
type: object
type: object
x-kubernetes-map-type: atomic
labels:
additionalProperties:
type: string
Expand All @@ -179,6 +130,65 @@ spec:
the leaf node name will generate by controller and fill
in cluster link status
type: string
nodeSelector:
description: NodeSelector is a selector to select member
cluster nodes to pretend a leaf node in clusterTree.
properties:
labelSelector:
description: 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.
properties:
matchExpressions:
description: matchExpressions is a list of label
selector requirements. The requirements are ANDed.
items:
description: A label selector requirement is a
selector that contains values, a key, and an
operator that relates the key and values.
properties:
key:
description: key is the label key that the
selector applies to.
type: string
operator:
description: operator represents a key's relationship
to a set of values. Valid operators are
In, NotIn, Exists and DoesNotExist.
type: string
values:
description: values is an array of string
values. If the operator is In or NotIn,
the values array must be non-empty. If the
operator is Exists or DoesNotExist, the
values array must be empty. This array is
replaced during a strategic merge patch.
items:
type: string
type: array
required:
- key
- operator
type: object
type: array
matchLabels:
additionalProperties:
type: string
description: matchLabels is a map of {key,value}
pairs. A single {key,value} in the matchLabels
map is equivalent to an element of matchExpressions,
whose key field is "key", the operator is "In",
and the values array contains only "value". The
requirements are ANDed.
type: object
type: object
x-kubernetes-map-type: atomic
nodeName:
description: NodeName is Member cluster origin node
Name
type: string
type: object
taints:
description: Taints attached to the leaf pretended Node.
If nil or empty, controller will set the default no-schedule
Expand Down
127 changes: 127 additions & 0 deletions deploy/crds/kosmos.io_knodes.yaml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,127 @@
---
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.11.0
creationTimestamp: null
name: knodes.kosmos.io
spec:
group: kosmos.io
names:
kind: Knode
listKind: KnodeList
plural: knodes
singular: knode
scope: Cluster
versions:
- name: v1alpha1
schema:
openAPIV3Schema:
properties:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation
of an object. Servers should convert recognized schemas to the latest
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
type: string
kind:
description: 'Kind is a string value representing the REST resource this
object represents. Servers may infer this from the endpoint the client
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
type: string
metadata:
type: object
spec:
properties:
disableTaint:
type: boolean
kubeAPIBurst:
default: 100
type: integer
kubeconfig:
format: byte
type: string
nodeName:
type: string
type:
default: k8s
type: string
type: object
status:
properties:
apiserver:
type: string
conditions:
items:
description: "Condition contains details for one aspect of the current
state of this API Resource. --- This struct is intended for direct
use as an array at the field path .status.conditions. For example,
\n type FooStatus struct{ // Represents the observations of a
foo's current state. // Known .status.conditions.type are: \"Available\",
\"Progressing\", and \"Degraded\" // +patchMergeKey=type // +patchStrategy=merge
// +listType=map // +listMapKey=type Conditions []metav1.Condition
`json:\"conditions,omitempty\" patchStrategy:\"merge\" patchMergeKey:\"type\"
protobuf:\"bytes,1,rep,name=conditions\"` \n // other fields }"
properties:
lastTransitionTime:
description: lastTransitionTime is the last time the condition
transitioned from one status to another. This should be when
the underlying condition changed. If that is not known, then
using the time when the API field changed is acceptable.
format: date-time
type: string
message:
description: message is a human readable message indicating
details about the transition. This may be an empty string.
maxLength: 32768
type: string
observedGeneration:
description: observedGeneration represents the .metadata.generation
that the condition was set based upon. For instance, if .metadata.generation
is currently 12, but the .status.conditions[x].observedGeneration
is 9, the condition is out of date with respect to the current
state of the instance.
format: int64
minimum: 0
type: integer
reason:
description: reason contains a programmatic identifier indicating
the reason for the condition's last transition. Producers
of specific condition types may define expected values and
meanings for this field, and whether the values are considered
a guaranteed API. The value should be a CamelCase string.
This field may not be empty.
maxLength: 1024
minLength: 1
pattern: ^[A-Za-z]([A-Za-z0-9_,:]*[A-Za-z0-9_])?$
type: string
status:
description: status of the condition, one of True, False, Unknown.
enum:
- "True"
- "False"
- Unknown
type: string
type:
description: type of condition in CamelCase or in foo.example.com/CamelCase.
--- Many .condition.type values are consistent across resources
like Available, but because arbitrary conditions can be useful
(see .node.status.conditions), the ability to deconflict is
important. The regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt)
maxLength: 316
pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$
type: string
required:
- lastTransitionTime
- message
- reason
- status
- type
type: object
type: array
version:
type: string
type: object
type: object
served: true
storage: true
5 changes: 2 additions & 3 deletions pkg/apis/kosmos/v1alpha1/cluster_types.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,10 +98,9 @@ type ClusterTreeOptions struct {
// +optional
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.
// LeafModels provide an api to arrange the member cluster with some rules to pretend one or more leaf node
// +optional
LeafModel []LeafModel `json:"leafModel,omitempty"`
LeafModels []LeafModel `json:"leafModel,omitempty"`
}

type LeafModel struct {
Expand Down
4 changes: 2 additions & 2 deletions pkg/apis/kosmos/v1alpha1/zz_generated.deepcopy.go
View file

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

Loading

0 comments on commit 73a0592

Please sign in to comment.