Skip to content

Commit

Permalink
Merge pull request #44 from cheyang/helm-chart-fluid-1.0.0-alpha.16
Browse files Browse the repository at this point in the history
Update helm-chart-fluid-1.0.0-alpha.16
  • Loading branch information
cheyang authored Jan 9, 2024
2 parents af1858f + dd074a9 commit bcf9deb
Show file tree
Hide file tree
Showing 9 changed files with 245 additions and 20 deletions.
4 changes: 2 additions & 2 deletions charts/fluid/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@ type: application

# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
version: 1.0.0-alpha.15
version: 1.0.0-alpha.16

# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application.
appVersion: 1.0.0-7221cf3
appVersion: 1.0.0-f913136
home: https://github.com/fluid-cloudnative/fluid
keywords:
- category:data
Expand Down
8 changes: 5 additions & 3 deletions charts/fluid/crds/data.fluid.io_vineyardruntimes.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ spec:
runtime is deleted Defaults to OnRuntimeDeleted'
type: string
image:
description: Image for Vineyard Fuse Default is `vineyardcloudnative/vineyard-mount-socket`
description: Image for Vineyard Fuse Default is `vineyardcloudnative/vineyard-fluid-fuse`
type: string
imagePullPolicy:
description: Image pull policy for Vineyard Fuse Default is `IfNotPresent`
Expand Down Expand Up @@ -234,7 +234,8 @@ spec:
type: integer
description: Ports used by Vineyard component. For Master, the
default client port is 2379 and peer port is 2380. For Worker,
the default rpc port is 9600.
the default rpc port is 9600 and the default exporter port is
9144.
type: object
replicas:
description: The replicas of Vineyard component. If not specified,
Expand Down Expand Up @@ -3516,7 +3517,8 @@ spec:
type: integer
description: Ports used by Vineyard component. For Master, the
default client port is 2379 and peer port is 2380. For Worker,
the default rpc port is 9600.
the default rpc port is 9600 and the default exporter port is
9144.
type: object
replicas:
description: The replicas of Vineyard component. If not specified,
Expand Down
4 changes: 4 additions & 0 deletions charts/fluid/templates/controller/dataset_controller.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,10 @@ spec:
- name: FLUID_WORKDIR
value: {{ .Values.workdir | quote }}
{{- end }}
{{- if .Values.runtime.jindo.engine }}
- name: JINDO_ENGINE_TYPE
value: {{ .Values.runtime.jindo.engine | quote }}
{{- end }}
{{- if .Values.runtime.alluxio.runtime.image }}
- name: ALLUXIO_RUNTIME_IMAGE_ENV
value: {{ .Values.runtime.alluxio.runtime.image | quote }}
Expand Down
80 changes: 80 additions & 0 deletions charts/fluid/templates/controller/vineyardruntime_controller.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
---
apiVersion: apps/v1
kind: Deployment
metadata:
name: vineyardruntime-controller
namespace: {{ include "fluid.namespace" . }}
labels:
control-plane: vineyardruntime-controller
spec:
selector:
matchLabels:
control-plane: vineyardruntime-controller
{{ if .Values.runtime.vineyard.enabled -}}
replicas: {{ .Values.runtime.vineyard.replicas }}
{{- else }}
replicas: 0
{{- end }}
template:
metadata:
labels:
control-plane: vineyardruntime-controller
annotations:
{{ if gt (.Values.runtime.vineyard.replicas | int) 1 -}}
controller.runtime.fluid.io/replicas: {{ .Values.runtime.vineyard.replicas | quote }}
{{- end }}
spec:
{{- with .Values.image.imagePullSecrets }}
imagePullSecrets:
{{- toYaml . | nindent 8 }}
{{- end }}
serviceAccountName: vineyardruntime-controller
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: type
operator: NotIn
values:
- virtual-kubelet
{{- if .Values.runtime.vineyard.tolerations }}
tolerations:
{{ toYaml .Values.runtime.vineyard.tolerations | indent 6 }}
{{- end }}
containers:
- image: {{ .Values.runtime.vineyard.controller.image | quote }}
name: manager
command: ["vineyardruntime-controller", "start"]
args:
- --development=false
- --pprof-addr=:6060
- --enable-leader-election
- --leader-election-namespace={{ include "fluid.namespace" . }}
env:
{{- if .Values.workdir }}
- name: FLUID_WORKDIR
value: {{ .Values.workdir | quote }}
{{- end }}
{{- if .Values.runtime.mountRoot }}
- name: MOUNT_ROOT
value: {{ .Values.runtime.mountRoot | quote }}
{{- end }}
{{- if .Values.runtime.syncRetryDuration }}
- name: FLUID_SYNC_RETRY_DURATION
value: {{ .Values.runtime.syncRetryDuration | quote }}
{{- end }}
- name: HELM_DRIVER
value: {{ template "fluid.helmDriver" . }}
ports:
- containerPort: 8080
name: metrics
protocol: TCP
resources:
limits:
cpu: 100m
memory: 1536Mi
requests:
cpu: 100m
memory: 200Mi
terminationGracePeriodSeconds: 10
2 changes: 2 additions & 0 deletions charts/fluid/templates/role/csi/rbac.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,15 @@ rules:
- thinruntimes
- efcruntimes
- datasets
- vineyardruntimes
- alluxioruntimes/status
- jindoruntimes/status
- goosefsruntimes/status
- juicefsruntimes/status
- thinruntimes/status
- efcruntimes/status
- datasets/status
- vineyardruntimes/status
verbs: ["get", "list", "watch"]
- apiGroups: [""]
resources: ["persistentvolumes"]
Expand Down
2 changes: 2 additions & 0 deletions charts/fluid/templates/role/dataset/rbac.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,8 @@ rules:
- thinruntimes/status
- efcruntimes
- efcruntimes/status
- vineyardruntimes
- vineyardruntimes/status
verbs:
- '*'
- apiGroups:
Expand Down
126 changes: 126 additions & 0 deletions charts/fluid/templates/role/vineyard/rbac.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,126 @@
---
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
name: vineyardruntime-controller
rules:
- apiGroups:
- ""
resources:
- namespaces
verbs:
- get
- list
- watch
- apiGroups:
- ""
resources:
- configmaps
verbs:
- get
- list
- watch
- create
- update
- delete
- apiGroups:
- ""
resources:
- persistentvolumeclaims
verbs:
- get
- list
- watch
- create
- update
- delete
- apiGroups:
- ""
resources:
- persistentvolumes
verbs:
- get
- list
- watch
- create
- delete
- apiGroups:
- ""
resources:
- pods
verbs:
- create
- delete
- get
- list
- watch
- apiGroups:
- ""
resources:
- nodes
verbs:
- get
- list
- watch
- patch
- apiGroups:
- ""
resources:
- events
verbs:
- create
- patch
{{- template "fluid.helmDriver.rbacs" . }}
- apiGroups:
- ""
resources:
- services
verbs:
- create
- delete
- list
- watch
- get
- apiGroups:
- data.fluid.io
resources:
- vineyardruntimes
- datasets
- vineyardruntimes/status
- datasets/status
verbs:
- '*'
- apiGroups:
- apps
resources:
- daemonsets
- statefulsets
- daemonsets/status
- statefulsets/status
verbs:
- '*'
- apiGroups:
- coordination.k8s.io
resources:
- leases
verbs:
- '*'
---
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
metadata:
name: vineyardruntime-clusterrolebinding
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: ClusterRole
name: vineyardruntime-controller
subjects:
- kind: ServiceAccount
name: vineyardruntime-controller
namespace: {{ include "fluid.namespace" . }}
---
apiVersion: v1
kind: ServiceAccount
metadata:
name: vineyardruntime-controller
namespace: {{ include "fluid.namespace" . }}
1 change: 1 addition & 0 deletions charts/fluid/templates/role/webhook/rabc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ rules:
- goosefsruntimes
- thinruntimes
- efcruntimes
- vineyardruntimes
verbs:
- get
- list
Expand Down
Loading

0 comments on commit bcf9deb

Please sign in to comment.