Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
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.1.0-alpha.2
version: 1.1.0-alpha.3

# 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.1.0-2abd6b3
appVersion: 1.1.0-5cc67db6
home: https://github.com/fluid-cloudnative/fluid
keywords:
- category:data
Expand Down
10,193 changes: 10,193 additions & 0 deletions charts/fluid/crds/data.fluid.io_cacheruntimeclasses.yaml

Large diffs are not rendered by default.

1,863 changes: 1,863 additions & 0 deletions charts/fluid/crds/data.fluid.io_cacheruntimes.yaml

Large diffs are not rendered by default.

11 changes: 0 additions & 11 deletions charts/fluid/crds/data.fluid.io_thinruntimeprofiles.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -329,17 +329,6 @@ spec:
additionalProperties:
type: string
type: object
podMetadata:
properties:
annotations:
additionalProperties:
type: string
type: object
labels:
additionalProperties:
type: string
type: object
type: object
ports:
items:
properties:
Expand Down
11 changes: 0 additions & 11 deletions charts/fluid/crds/data.fluid.io_thinruntimes.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -329,17 +329,6 @@ spec:
additionalProperties:
type: string
type: object
podMetadata:
properties:
annotations:
additionalProperties:
type: string
type: object
labels:
additionalProperties:
type: string
type: object
type: object
ports:
items:
properties:
Expand Down
8 changes: 0 additions & 8 deletions charts/fluid/templates/_helpers.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -161,11 +161,3 @@ Check if feature gate DataflowAffinity is enabled in the featureGates.
{{- end -}}
{{- $found -}}
{{- end -}}

{{/* Common syncScheduleInfoNodeExcludeSelector env for all runtime controllers*/}}
{{- define "fluid.controllers.envs.syncScheduleInfoNodeExcludeSelector" -}}
{{- if .Values.runtime.syncScheduleInfoNodeExcludeSelector }}
- name: FLUID_SCHEDULE_INFO_EXCLUDE_NODE_SELECTOR
value: {{ .Values.runtime.syncScheduleInfoNodeExcludeSelector | quote }}
{{- end }}
{{- end -}}
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ spec:
#hostNetwork: true
containers:
- image: {{ include "fluid.controlplane.imageTransform" (list .Values.runtime.alluxio.controller.imagePrefix .Values.runtime.alluxio.controller.imageName .Values.runtime.alluxio.controller.imageTag . ) }}
imagePullPolicy: IfNotPresent
name: manager
command: ["alluxioruntime-controller", "start"]
args:
Expand Down Expand Up @@ -81,7 +80,6 @@ spec:
- name: FLUID_SYNC_RETRY_DURATION
value: {{ .Values.runtime.syncRetryDuration | quote }}
{{- end }}
{{- include "fluid.controllers.envs.syncScheduleInfoNodeExcludeSelector" . | nindent 10 }}
{{- if .Values.image.imagePullSecrets }}
- name: IMAGE_PULL_SECRETS
{{- $secretList := list }}
Expand Down
65 changes: 65 additions & 0 deletions charts/fluid/templates/controller/cacheruntime_controller.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
---
apiVersion: apps/v1
kind: Deployment
metadata:
name: cacheruntime-controller
namespace: {{ include "fluid.namespace" . }}
labels:
control-plane: cacheruntime-controller
spec:
selector:
matchLabels:
control-plane: cacheruntime-controller
replicas: {{ .Values.runtime.cache.replicas }}
template:
metadata:
labels:
control-plane: cacheruntime-controller
annotations:
{{ if gt (.Values.runtime.cache.replicas | int) 1 -}}
controller.runtime.fluid.io/replicas: {{ .Values.runtime.cache.replicas | quote }}
{{- end }}
spec:
{{- with .Values.image.imagePullSecrets }}
imagePullSecrets:
{{- toYaml . | nindent 8 }}
{{- end }}
serviceAccountName: cacheruntime-controller
{{ include "fluid.controlplane.affinity" . | nindent 6}}
{{- if .Values.runtime.cache.tolerations }}
tolerations:
{{ toYaml .Values.runtime.cache.tolerations | indent 6 }}
{{- end }}
#hostNetwork: true
containers:
- image: {{ include "fluid.controlplane.imageTransform" (list .Values.runtime.cache.controller.imagePrefix .Values.runtime.cache.controller.imageName .Values.runtime.cache.controller.imageTag . ) }}
name: manager
args:
- --development=false
- --pprof-addr=:6060
- --enable-leader-election
- --runtime-workers={{ .Values.runtime.cache.runtimeWorkers }}
- --leader-election-namespace={{ include "fluid.namespace" . }}
command: ["cacheruntime-controller", "start"]
env:
{{- if .Values.runtime.mountRoot }}
- name: MOUNT_ROOT
value: {{ .Values.runtime.mountRoot | quote }}
{{- end }}
{{- if .Values.runtime.criticalFusePod }}
- name: CRITICAL_FUSE_POD
value: {{ ternary "true" "false" (semverCompare ">=1.16.0-0" .Capabilities.KubeVersion.Version) | 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:
{{- include "fluid.controlplane.resources" (list $ .Values.runtime.cache.resources) | nindent 10 }}
terminationGracePeriodSeconds: 10
1 change: 0 additions & 1 deletion charts/fluid/templates/controller/dataset_controller.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ spec:
#hostNetwork: true
containers:
- image: {{ include "fluid.controlplane.imageTransform" (list .Values.dataset.controller.imagePrefix .Values.dataset.controller.imageName .Values.dataset.controller.imageTag . ) }}
imagePullPolicy: IfNotPresent
name: manager
command: ["dataset-controller", "start"]
args:
Expand Down
3 changes: 1 addition & 2 deletions charts/fluid/templates/controller/efcruntime_controller.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ spec:
#hostNetwork: true
containers:
- image: {{ include "fluid.controlplane.imageTransform" (list .Values.runtime.efc.controller.imagePrefix .Values.runtime.efc.controller.imageName .Values.runtime.efc.controller.imageTag . ) }}
imagePullPolicy: IfNotPresent
imagePullPolicy: {{ .Values.runtime.efc.controller.imagePullPolicy }}
name: manager
args:
- --development=true
Expand All @@ -63,7 +63,6 @@ spec:
- name: FLUID_SYNC_RETRY_DURATION
value: {{ .Values.runtime.syncRetryDuration | quote }}
{{- end }}
{{- include "fluid.controllers.envs.syncScheduleInfoNodeExcludeSelector" . | nindent 10 }}
{{- if .Values.runtime.efc.init.imageName }}
- name: EFC_INIT_FUSE_IMAGE_ENV
value: {{ include "fluid.runtime.imageTransform" (list .Values.runtime.efc.init.imagePrefix .Values.runtime.efc.init.imageName .Values.runtime.efc.init.imageTag . ) }}
Expand Down
1 change: 0 additions & 1 deletion charts/fluid/templates/controller/fluidapp_controller.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ spec:
#hostNetwork: true
containers:
- image: {{ include "fluid.controlplane.imageTransform" (list .Values.fluidapp.controller.imagePrefix .Values.fluidapp.controller.imageName .Values.fluidapp.controller.imageTag . ) }}
imagePullPolicy: IfNotPresent
name: manager
command: ["fluidapp-controller", "start"]
args:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ spec:
#hostNetwork: true
containers:
- image: {{ include "fluid.controlplane.imageTransform" (list .Values.runtime.goosefs.controller.imagePrefix .Values.runtime.goosefs.controller.imageName .Values.runtime.goosefs.controller.imageTag . ) }}
imagePullPolicy: IfNotPresent
imagePullPolicy: Always
name: manager
command: ["goosefsruntime-controller", "start"]
args:
Expand Down Expand Up @@ -79,7 +79,6 @@ spec:
- name: FLUID_SYNC_RETRY_DURATION
value: {{ .Values.runtime.syncRetryDuration | quote }}
{{- end }}
{{- include "fluid.controllers.envs.syncScheduleInfoNodeExcludeSelector" . | nindent 10 }}
{{- if .Values.runtime.goosefs.env }}
{{ toYaml .Values.runtime.goosefs.env | nindent 10 }}
{{- end }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ spec:
{{- end }}
containers:
- image: {{ include "fluid.controlplane.imageTransform" (list .Values.runtime.jindo.controller.imagePrefix .Values.runtime.jindo.controller.imageName .Values.runtime.jindo.controller.imageTag . ) }}
imagePullPolicy: IfNotPresent
name: manager
command: ["jindoruntime-controller", "start"]
args:
Expand Down Expand Up @@ -84,7 +83,6 @@ spec:
- name: FLUID_SYNC_RETRY_DURATION
value: {{ .Values.runtime.syncRetryDuration | quote }}
{{- end }}
{{- include "fluid.controllers.envs.syncScheduleInfoNodeExcludeSelector" . | nindent 8 }}
{{- if .Values.runtime.jindo.engine }}
- name: JINDO_ENGINE_TYPE
value: {{ .Values.runtime.jindo.engine | quote }}
Expand All @@ -96,7 +94,7 @@ spec:
- name: HELM_DRIVER
value: {{ template "fluid.helmDriver" . }}
{{- if .Values.runtime.jindo.env }}
{{ toYaml .Values.runtime.jindo.env | nindent 8 }}
{{ toYaml .Values.runtime.jindo.env | nindent 10 }}
{{- end }}
ports:
- containerPort: 8080
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ spec:
#hostNetwork: true
containers:
- image: {{ include "fluid.controlplane.imageTransform" (list .Values.runtime.juicefs.controller.imagePrefix .Values.runtime.juicefs.controller.imageName .Values.runtime.juicefs.controller.imageTag . ) }}
imagePullPolicy: IfNotPresent
name: manager
args:
- --development=false
Expand Down Expand Up @@ -81,7 +80,6 @@ spec:
- name: FLUID_SYNC_RETRY_DURATION
value: {{ .Values.runtime.syncRetryDuration | quote }}
{{- end }}
{{- include "fluid.controllers.envs.syncScheduleInfoNodeExcludeSelector" . | nindent 10 }}
- name: HELM_DRIVER
value: {{ template "fluid.helmDriver" . }}
{{- if .Values.runtime.juicefs.env }}
Expand Down
6 changes: 2 additions & 4 deletions charts/fluid/templates/controller/thinruntime_controller.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ spec:
#hostNetwork: true
containers:
- image: {{ include "fluid.controlplane.imageTransform" (list .Values.runtime.thin.controller.imagePrefix .Values.runtime.thin.controller.imageName .Values.runtime.thin.controller.imageTag . ) }}
imagePullPolicy: IfNotPresent
name: manager
args:
- --development=false
Expand All @@ -59,11 +58,10 @@ spec:
- name: CRITICAL_FUSE_POD
value: {{ ternary "true" "false" (semverCompare ">=1.16.0-0" .Capabilities.KubeVersion.Version) | quote }}
{{- end }}
{{- if .Values.runtime.thin.syncRetryRateLimitDuration }}
{{- if .Values.runtime.syncRetryDuration }}
- name: FLUID_SYNC_RETRY_DURATION
value: {{ .Values.runtime.thin.syncRetryRateLimitDuration | quote }}
value: {{ .Values.runtime.syncRetryDuration | quote }}
{{- end }}
{{- include "fluid.controllers.envs.syncScheduleInfoNodeExcludeSelector" . | nindent 10 }}
- name: HELM_DRIVER
value: {{ template "fluid.helmDriver" . }}
- name: THIN_FUSE_CONFIG_STORAGE
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ spec:
{{- end }}
containers:
- image: {{ include "fluid.controlplane.imageTransform" (list .Values.runtime.vineyard.controller.imagePrefix .Values.runtime.vineyard.controller.imageName .Values.runtime.vineyard.controller.imageTag . ) }}
imagePullPolicy: IfNotPresent
name: manager
command: ["vineyardruntime-controller", "start"]
args:
Expand Down Expand Up @@ -75,11 +74,10 @@ spec:
- name: FLUID_SYNC_RETRY_DURATION
value: {{ .Values.runtime.syncRetryDuration | quote }}
{{- end }}
{{- include "fluid.controllers.envs.syncScheduleInfoNodeExcludeSelector" . | nindent 8 }}
- name: HELM_DRIVER
value: {{ template "fluid.helmDriver" . }}
{{- if .Values.runtime.vineyard.env }}
{{ toYaml .Values.runtime.vineyard.env | nindent 8 }}
{{ toYaml .Values.runtime.vineyard.env | nindent 10 }}
{{- end }}
ports:
- containerPort: 8080
Expand Down
4 changes: 0 additions & 4 deletions charts/fluid/templates/csi/daemonset.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
{{ if .Values.csi.enabled -}}
kind: DaemonSet
apiVersion: apps/v1
metadata:
Expand Down Expand Up @@ -42,7 +41,6 @@ spec:
containers:
- name: node-driver-registrar
image: {{ include "fluid.controlplane.imageTransform" (list .Values.csi.registrar.imagePrefix .Values.csi.registrar.imageName .Values.csi.registrar.imageTag . ) }}
imagePullPolicy: IfNotPresent
args:
- --v=5
- --csi-address={{ .Values.csi.kubelet.rootDir }}/csi-plugins/fuse.csi.fluid.io/csi.sock
Expand All @@ -66,7 +64,6 @@ spec:
add: ["SYS_ADMIN"]
allowPrivilegeEscalation: true
image: {{ include "fluid.controlplane.imageTransform" (list .Values.csi.plugins.imagePrefix .Values.csi.plugins.imageName .Values.csi.plugins.imageTag . ) }}
imagePullPolicy: IfNotPresent
command: ["/usr/local/bin/entrypoint.sh"]
args:
- "--nodeid=$(NODE_ID)"
Expand Down Expand Up @@ -170,4 +167,3 @@ spec:
path: /etc/updatedb.conf.backup
type: FileOrCreate
name: updatedb-conf-bak
{{- end }}
Loading
Loading