Skip to content
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

Jump to bottom

Add the helm chart for vineyard runtime. #3624

Merged
merged 3 commits into from
Dec 22, 2023
Merged

Add the helm chart for vineyard runtime. #3624

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
604f676
* Add the helm chart for Vineyard Runtime.
dashanji Dec 14, 2023
1a252b6
Add the app.kubernetes.io/instance label to the vineyard worker.
dashanji Dec 21, 2023
bd96909
Change the short name of vineyard to v6d.
dashanji Dec 21, 2023
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
8 changes: 4 additions & 4 deletions api/v1alpha1/openapi_generated.go
View file
Open in desktop

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

8 changes: 4 additions & 4 deletions api/v1alpha1/swagger.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1420,7 +1420,7 @@
}
},
"options": {
"description": "Configurable options for External Etcd cluster. Support the following options.\n\n etcd.prefix: (String) the prefix of etcd key for vineyard objects\n\nDefault value is as follows.\n\n etcd.prefix: \"/vineyard\"",
"description": "Configurable options for External Etcd cluster.",
"type": "object",
"additionalProperties": {
"type": "string",
Expand Down Expand Up @@ -2497,7 +2497,7 @@
}
},
"options": {
"description": "Configurable options for Vineyard component. For Master, there is no configurable options. For Worker, support the following options.\n\n vineyardd.reserve.memory: (Bool) where to reserve memory for vineyardd\n If set to true, the memory quota will be counted to the vineyardd rather than the application.\n etcd.prefix: (String) the prefix of etcd key for vineyard objects\n\n Default value is as follows.\n\n vineyardd.reserve.memory: \"true\"\n etcd.prefix: \"/vineyard\"",
"description": "Configurable options for Vineyard component. For Master, there is no configurable options. For Worker, support the following options.\n\n vineyardd.reserve.memory: (Bool) where to reserve memory for vineyardd\n If set to true, the memory quota will be counted to the vineyardd rather than the application.\n etcd.prefix: (String) the prefix of etcd key for vineyard objects\n wait.etcd.timeout: (String) the timeout period before waiting the etcd to be ready, in seconds\n\n Default value is as follows.\n\n vineyardd.reserve.memory: \"true\"\n etcd.prefix: \"/vineyard\"\n wait.etcd.timeout: \"120\"",
"type": "object",
"additionalProperties": {
"type": "string",
Expand Down Expand Up @@ -3606,7 +3606,7 @@
}
},
"options": {
"description": "Configurable options for Vineyard component. For Master, there is no configurable options. For Worker, support the following options.\n\n vineyardd.reserve.memory: (Bool) where to reserve memory for vineyardd\n If set to true, the memory quota will be counted to the vineyardd rather than the application.\n etcd.prefix: (String) the prefix of etcd key for vineyard objects\n\n Default value is as follows.\n\n vineyardd.reserve.memory: \"true\"\n etcd.prefix: \"/vineyard\"",
"description": "Configurable options for Vineyard component. For Master, there is no configurable options. For Worker, support the following options.\n\n vineyardd.reserve.memory: (Bool) where to reserve memory for vineyardd\n If set to true, the memory quota will be counted to the vineyardd rather than the application.\n etcd.prefix: (String) the prefix of etcd key for vineyard objects\n wait.etcd.timeout: (String) the timeout period before waiting the etcd to be ready, in seconds\n\n Default value is as follows.\n\n vineyardd.reserve.memory: \"true\"\n etcd.prefix: \"/vineyard\"\n wait.etcd.timeout: \"120\"",
"type": "object",
"additionalProperties": {
"type": "string",
Expand Down Expand Up @@ -3643,7 +3643,7 @@
}
},
".VineyardRuntime": {
"description": "VineyardRuntime is the Schema for the vineyardruntimes API",
"description": "VineyardRuntime is the Schema for the VineyardRuntimes API",
"type": "object",
"properties": {
"apiVersion": {
Expand Down
36 changes: 23 additions & 13 deletions api/v1alpha1/vineyardruntime_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,12 +71,14 @@ type VineyardCompTemplateSpec struct {
// vineyardd.reserve.memory: (Bool) where to reserve memory for vineyardd
// If set to true, the memory quota will be counted to the vineyardd rather than the application.
// etcd.prefix: (String) the prefix of etcd key for vineyard objects
// wait.etcd.timeout: (String) the timeout period before waiting the etcd to be ready, in seconds
//
//
// Default value is as follows.
//
// vineyardd.reserve.memory: "true"
// etcd.prefix: "/vineyard"
// wait.etcd.timeout: "120"
//
// +optional
Options map[string]string `json:"options,omitempty"`
Expand Down Expand Up @@ -108,14 +110,6 @@ type ExternalEndpointSpec struct {
EncryptOptions []EncryptOption `json:"encryptOptions,omitempty"`

// Configurable options for External Etcd cluster.
// Support the following options.
//
// etcd.prefix: (String) the prefix of etcd key for vineyard objects
//
// Default value is as follows.
//
// etcd.prefix: "/vineyard"
//
// +optional
Options map[string]string `json:"options,omitempty"`
}
Expand Down Expand Up @@ -235,10 +229,25 @@ type VineyardRuntimeSpec struct {
Volumes []corev1.Volume `json:"volumes,omitempty"`
}

//+kubebuilder:object:root=true
//+kubebuilder:subresource:status

// VineyardRuntime is the Schema for the vineyardruntimes API
// +kubebuilder:object:root=true
// +kubebuilder:subresource:status
// +kubebuilder:subresource:scale:specpath=.spec.replicas,statuspath=.status.currentWorkerNumberScheduled,selectorpath=.status.selector
// +kubebuilder:printcolumn:name="Ready Masters",type="integer",JSONPath=`.status.masterNumberReady`,priority=10
// +kubebuilder:printcolumn:name="Desired Masters",type="integer",JSONPath=`.status.desiredMasterNumberScheduled`,priority=10
// +kubebuilder:printcolumn:name="Master Phase",type="string",JSONPath=`.status.masterPhase`,priority=0
// +kubebuilder:printcolumn:name="Ready Workers",type="integer",JSONPath=`.status.workerNumberReady`,priority=10
// +kubebuilder:printcolumn:name="Desired Workers",type="integer",JSONPath=`.status.desiredWorkerNumberScheduled`,priority=10
// +kubebuilder:printcolumn:name="Worker Phase",type="string",JSONPath=`.status.workerPhase`,priority=0
// +kubebuilder:printcolumn:name="Ready Fuses",type="integer",JSONPath=`.status.fuseNumberReady`,priority=10
// +kubebuilder:printcolumn:name="Desired Fuses",type="integer",JSONPath=`.status.desiredFuseNumberScheduled`,priority=10
// +kubebuilder:printcolumn:name="Fuse Phase",type="string",JSONPath=`.status.fusePhase`,priority=0
// +kubebuilder:printcolumn:name="API Gateway",type="string",JSONPath=`.status.apiGateway.endpoint`,priority=10
// +kubebuilder:printcolumn:name="Age",type="date",JSONPath=`.metadata.creationTimestamp`,priority=0
// +kubebuilder:resource:scope=Namespaced
// +kubebuilder:resource:categories={fluid},shortName=v6d
// +genclient

// VineyardRuntime is the Schema for the VineyardRuntimes API
type VineyardRuntime struct {
metav1.TypeMeta `json:",inline"`
metav1.ObjectMeta `json:"metadata,omitempty"`
Expand All @@ -247,7 +256,8 @@ type VineyardRuntime struct {
Status RuntimeStatus `json:"status,omitempty"`
}

//+kubebuilder:object:root=true
// +kubebuilder:object:root=true
// +kubebuilder:resource:scope=Namespaced

// VineyardRuntimeList contains a list of VineyardRuntime
type VineyardRuntimeList struct {
Expand Down
5 changes: 0 additions & 5 deletions charts/alluxio/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,11 +129,6 @@ master:
# mountPath: /data/secrets/mySecretVolume/
# - name: myConfigMapVolume
# mountPath: /data/configmap/myConfigMapVolume/
# volumeMounts:
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why do you need to change alluxio chart?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I find it's a dummy part here.

# - name: mySecretVolume
# mountPath: /data/secrets/mySecretVolume/
# - name: myConfigMapVolume
# mountPath: /data/configmap/myConfigMapVolume/
volumes: []

mountConfigStorage:
Expand Down
70 changes: 60 additions & 10 deletions charts/fluid/fluid/crds/data.fluid.io_vineyardruntimes.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,61 @@ metadata:
spec:
group: data.fluid.io
names:
categories:
- fluid
kind: VineyardRuntime
listKind: VineyardRuntimeList
plural: vineyardruntimes
shortNames:
- v6d
singular: vineyardruntime
scope: Namespaced
versions:
- name: v1alpha1
- additionalPrinterColumns:
- jsonPath: .status.masterNumberReady
name: Ready Masters
priority: 10
type: integer
- jsonPath: .status.desiredMasterNumberScheduled
name: Desired Masters
priority: 10
type: integer
- jsonPath: .status.masterPhase
name: Master Phase
type: string
- jsonPath: .status.workerNumberReady
name: Ready Workers
priority: 10
type: integer
- jsonPath: .status.desiredWorkerNumberScheduled
name: Desired Workers
priority: 10
type: integer
- jsonPath: .status.workerPhase
name: Worker Phase
type: string
- jsonPath: .status.fuseNumberReady
name: Ready Fuses
priority: 10
type: integer
- jsonPath: .status.desiredFuseNumberScheduled
name: Desired Fuses
priority: 10
type: integer
- jsonPath: .status.fusePhase
name: Fuse Phase
type: string
- jsonPath: .status.apiGateway.endpoint
name: API Gateway
priority: 10
type: string
- jsonPath: .metadata.creationTimestamp
name: Age
type: date
name: v1alpha1
schema:
openAPIV3Schema:
description: VineyardRuntime is the Schema for the vineyardruntimes API
description: VineyardRuntime is the Schema for the VineyardRuntimes API
properties:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation
Expand Down Expand Up @@ -133,10 +178,7 @@ spec:
options:
additionalProperties:
type: string
description: "Configurable options for External Etcd cluster.
Support the following options. \n etcd.prefix: (String)
the prefix of etcd key for vineyard objects \n Default value
is as follows. \n etcd.prefix: \"/vineyard\""
description: Configurable options for External Etcd cluster.
type: object
uri:
description: URI specifies the endpoint of external Etcd cluster
Expand Down Expand Up @@ -182,8 +224,10 @@ spec:
to reserve memory for vineyardd If set to true, the memory quota
will be counted to the vineyardd rather than the application.
etcd.prefix: (String) the prefix of etcd key for vineyard objects
\n Default value is as follows. \n vineyardd.reserve.memory:
\"true\" etcd.prefix: \"/vineyard\""
wait.etcd.timeout: (String) the timeout period before waiting
the etcd to be ready, in seconds \n Default value is as follows.
\n vineyardd.reserve.memory: \"true\" etcd.prefix: \"/vineyard\"
wait.etcd.timeout: \"120\""
type: object
ports:
additionalProperties:
Expand Down Expand Up @@ -3462,8 +3506,10 @@ spec:
to reserve memory for vineyardd If set to true, the memory quota
will be counted to the vineyardd rather than the application.
etcd.prefix: (String) the prefix of etcd key for vineyard objects
\n Default value is as follows. \n vineyardd.reserve.memory:
\"true\" etcd.prefix: \"/vineyard\""
wait.etcd.timeout: (String) the timeout period before waiting
the etcd to be ready, in seconds \n Default value is as follows.
\n vineyardd.reserve.memory: \"true\" etcd.prefix: \"/vineyard\"
wait.etcd.timeout: \"120\""
type: object
ports:
additionalProperties:
Expand Down Expand Up @@ -3983,6 +4029,10 @@ spec:
served: true
storage: true
subresources:
scale:
labelSelectorPath: .status.selector
specReplicasPath: .spec.replicas
statusReplicasPath: .status.currentWorkerNumberScheduled
status: {}
status:
acceptedNames:
Expand Down
17 changes: 17 additions & 0 deletions charts/vineyard/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
apiVersion: v1
appVersion: 0.18.2
version: 0.18.2
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Better not relate version to appVersion according to Helm‘s doc .

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Make sense. Thanks.

description: an In-Memory Data Manager for Data-Intensive Analytics
home: https://v6d.io/
keywords:
- data/object manager
- shared memory
- cloud native
maintainers:
- name: Tao He
email: [email protected]
- name: Shumin Yuan
email: [email protected]
- name: Ye Cao
email: [email protected]
name: vineyard
Loading
Loading