diff --git a/charts/alluxio/templates/fuse/daemonset.yaml b/charts/alluxio/templates/fuse/daemonset.yaml index 3328547c0f5..1ff2a21d047 100644 --- a/charts/alluxio/templates/fuse/daemonset.yaml +++ b/charts/alluxio/templates/fuse/daemonset.yaml @@ -46,7 +46,6 @@ spec: template: metadata: annotations: - sidecar.istio.io/inject: "false" {{- if .Values.fuse.annotations }} {{- range $key, $val := .Values.fuse.annotations }} {{ $key | quote }}: {{ $val | quote }} @@ -58,6 +57,7 @@ spec: release: {{ .Release.Name }} heritage: {{ .Release.Service }} role: alluxio-fuse + sidecar.istio.io/inject: "false" {{- if .Values.fuse.labels }} {{- range $key, $val := .Values.fuse.labels }} {{ $key | quote }}: {{ $val | quote }} diff --git a/charts/alluxio/templates/master/statefulset.yaml b/charts/alluxio/templates/master/statefulset.yaml index 600ab277ac8..0c5c05a45f9 100644 --- a/charts/alluxio/templates/master/statefulset.yaml +++ b/charts/alluxio/templates/master/statefulset.yaml @@ -53,7 +53,6 @@ spec: template: metadata: annotations: - sidecar.istio.io/inject: "false" {{- if .Values.master.annotations }} {{- range $key, $val := .Values.master.annotations }} {{ $key | quote }}: {{ $val | quote }} @@ -66,6 +65,7 @@ spec: release: {{ .Release.Name }} heritage: {{ .Release.Service }} role: alluxio-master + sidecar.istio.io/inject: "false" {{- if .Values.master.labels }} {{- range $key, $val := .Values.master.labels }} {{ $key | quote }}: {{ $val | quote }} diff --git a/charts/alluxio/templates/worker/statefulset.yaml b/charts/alluxio/templates/worker/statefulset.yaml index a725661a399..95958609de3 100644 --- a/charts/alluxio/templates/worker/statefulset.yaml +++ b/charts/alluxio/templates/worker/statefulset.yaml @@ -47,7 +47,6 @@ spec: template: metadata: annotations: - sidecar.istio.io/inject: "false" {{- if .Values.worker.annotations }} {{- range $key, $val := .Values.worker.annotations }} {{ $key | quote }}: {{ $val | quote }} @@ -59,6 +58,7 @@ spec: release: {{ .Release.Name }} heritage: {{ .Release.Service }} role: alluxio-worker + sidecar.istio.io/inject: "false" fluid.io/dataset: {{ .Release.Namespace }}-{{ .Release.Name }} fluid.io/dataset-placement: {{ .Values.placement }} {{- if .Values.worker.labels }} diff --git a/charts/efc/templates/fuse/daemonset.yaml b/charts/efc/templates/fuse/daemonset.yaml index 2031c53067e..5530beadf61 100644 --- a/charts/efc/templates/fuse/daemonset.yaml +++ b/charts/efc/templates/fuse/daemonset.yaml @@ -31,7 +31,6 @@ spec: template: metadata: annotations: - sidecar.istio.io/inject: "false" {{- if .Values.fuse.annotations }} {{- range $key, $val := .Values.fuse.annotations }} {{ $key | quote }}: {{ $val | quote }} @@ -43,6 +42,7 @@ spec: release: {{ .Release.Name }} heritage: {{ .Release.Service }} role: efc-fuse + sidecar.istio.io/inject: "false" {{- if .Values.fuse.labels }} {{- range $key, $val := .Values.fuse.labels }} {{ $key | quote }}: {{ $val | quote }} diff --git a/charts/efc/templates/master/statefulset.yaml b/charts/efc/templates/master/statefulset.yaml index dade12e190d..9aa2486f08c 100644 --- a/charts/efc/templates/master/statefulset.yaml +++ b/charts/efc/templates/master/statefulset.yaml @@ -30,7 +30,6 @@ spec: template: metadata: annotations: - sidecar.istio.io/inject: "false" {{- if .Values.master.annotations }} {{- range $key, $val := .Values.master.annotations }} {{ $key | quote }}: {{ $val | quote }} @@ -43,6 +42,7 @@ spec: release: {{ .Release.Name }} heritage: {{ .Release.Service }} role: efc-master + sidecar.istio.io/inject: "false" {{- if .Values.master.labels }} {{- range $key, $val := .Values.master.labels }} {{ $key | quote }}: {{ $val | quote }} diff --git a/charts/efc/templates/worker/statefulset.yaml b/charts/efc/templates/worker/statefulset.yaml index cdde970ad16..94094bee4c9 100644 --- a/charts/efc/templates/worker/statefulset.yaml +++ b/charts/efc/templates/worker/statefulset.yaml @@ -32,7 +32,6 @@ spec: template: metadata: annotations: - sidecar.istio.io/inject: "false" {{- if .Values.worker.annotations }} {{- range $key, $val := .Values.worker.annotations }} {{ $key | quote }}: {{ $val | quote }} @@ -44,6 +43,7 @@ spec: release: {{ .Release.Name }} heritage: {{ .Release.Service }} role: efc-worker + sidecar.istio.io/inject: "false" fluid.io/dataset: {{ .Release.Namespace }}-{{ .Release.Name }} fluid.io/dataset-placement: {{ .Values.placement }} {{- if .Values.worker.labels }} diff --git a/charts/fluid-dataloader/alluxio/templates/cronjob.yaml b/charts/fluid-dataloader/alluxio/templates/cronjob.yaml index 57618a11953..6c5756cc2fc 100644 --- a/charts/fluid-dataloader/alluxio/templates/cronjob.yaml +++ b/charts/fluid-dataloader/alluxio/templates/cronjob.yaml @@ -43,7 +43,6 @@ spec: metadata: name: {{ printf "%s-loader" .Release.Name }} annotations: - sidecar.istio.io/inject: "false" {{- if .Values.dataloader.annotations }} {{- range $key, $val := .Values.dataloader.annotations }} {{ $key | quote }}: {{ $val | quote }} @@ -53,6 +52,7 @@ spec: release: {{ .Release.Name }} role: dataload-pod app: alluxio + sidecar.istio.io/inject: "false" cronjob: {{ printf "%s-job" .Release.Name }} targetDataset: {{ required "targetDataset should be set" .Values.dataloader.targetDataset }} {{- if .Values.dataloader.labels }} diff --git a/charts/fluid-dataloader/alluxio/templates/job.yaml b/charts/fluid-dataloader/alluxio/templates/job.yaml index e0db06b2885..853e5806407 100644 --- a/charts/fluid-dataloader/alluxio/templates/job.yaml +++ b/charts/fluid-dataloader/alluxio/templates/job.yaml @@ -38,7 +38,6 @@ spec: metadata: name: {{ printf "%s-loader" .Release.Name }} annotations: - sidecar.istio.io/inject: "false" {{- if .Values.dataloader.annotations }} {{- range $key, $val := .Values.dataloader.annotations }} {{ $key | quote }}: {{ $val | quote }} @@ -48,6 +47,7 @@ spec: release: {{ .Release.Name }} role: dataload-pod app: alluxio + sidecar.istio.io/inject: "false" targetDataset: {{ required "targetDataset should be set" .Values.dataloader.targetDataset }} {{- include "library.fluid.labels" . | nindent 8 }} {{- if .Values.dataloader.labels }} diff --git a/charts/fluid-dataloader/goosefs/templates/cronjob.yaml b/charts/fluid-dataloader/goosefs/templates/cronjob.yaml index d23959a0569..2ec42832a6b 100644 --- a/charts/fluid-dataloader/goosefs/templates/cronjob.yaml +++ b/charts/fluid-dataloader/goosefs/templates/cronjob.yaml @@ -39,12 +39,11 @@ spec: template: metadata: name: {{ printf "%s-loader" .Release.Name }} - annotations: - sidecar.istio.io/inject: "false" labels: release: {{ .Release.Name }} role: dataload-pod app: goosefs + sidecar.istio.io/inject: "false" cronjob: {{ printf "%s-job" .Release.Name }} targetDataset: {{ required "targetDataset should be set" .Values.dataloader.targetDataset }} spec: diff --git a/charts/fluid-dataloader/goosefs/templates/job.yaml b/charts/fluid-dataloader/goosefs/templates/job.yaml index 0ec468a2ac8..065a1c31561 100644 --- a/charts/fluid-dataloader/goosefs/templates/job.yaml +++ b/charts/fluid-dataloader/goosefs/templates/job.yaml @@ -34,12 +34,11 @@ spec: template: metadata: name: {{ printf "%s-loader" .Release.Name }} - annotations: - sidecar.istio.io/inject: "false" labels: release: {{ .Release.Name }} role: dataload-pod app: goosefs + sidecar.istio.io/inject: "false" targetDataset: {{ required "targetDataset should be set" .Values.dataloader.targetDataset }} {{- include "library.fluid.labels" . | nindent 8 }} spec: diff --git a/charts/fluid-dataloader/jindo/templates/cronjob.yaml b/charts/fluid-dataloader/jindo/templates/cronjob.yaml index 47255ec4d25..b54a221acc3 100644 --- a/charts/fluid-dataloader/jindo/templates/cronjob.yaml +++ b/charts/fluid-dataloader/jindo/templates/cronjob.yaml @@ -42,12 +42,11 @@ spec: template: metadata: name: {{ printf "%s-loader" .Release.Name }} - annotations: - sidecar.istio.io/inject: "false" labels: release: {{ .Release.Name }} role: dataload-pod app: jindofs + sidecar.istio.io/inject: "false" cronjob: {{ printf "%s-job" .Release.Name }} targetDataset: {{ required "targetDataset should be set" .Values.dataloader.targetDataset }} spec: @@ -163,4 +162,4 @@ spec: path: jindo_dataload.sh mode: 365 -{{- end }} \ No newline at end of file +{{- end }} diff --git a/charts/fluid-dataloader/jindo/templates/job.yaml b/charts/fluid-dataloader/jindo/templates/job.yaml index ba362babaa8..30a6ba3a238 100644 --- a/charts/fluid-dataloader/jindo/templates/job.yaml +++ b/charts/fluid-dataloader/jindo/templates/job.yaml @@ -37,12 +37,11 @@ spec: template: metadata: name: {{ printf "%s-loader" .Release.Name }} - annotations: - sidecar.istio.io/inject: "false" labels: release: {{ .Release.Name }} role: dataload-pod app: jindofs + sidecar.istio.io/inject: "false" targetDataset: {{ required "targetDataset should be set" .Values.dataloader.targetDataset }} {{- include "library.fluid.labels" . | nindent 8 }} spec: diff --git a/charts/fluid-dataloader/jindocache/templates/cronjob.yaml b/charts/fluid-dataloader/jindocache/templates/cronjob.yaml index 0d40402b6b7..b4dd2fea627 100644 --- a/charts/fluid-dataloader/jindocache/templates/cronjob.yaml +++ b/charts/fluid-dataloader/jindocache/templates/cronjob.yaml @@ -43,7 +43,6 @@ spec: metadata: name: {{ printf "%s-loader" .Release.Name }} annotations: - sidecar.istio.io/inject: "false" {{- if .Values.dataloader.annotations }} {{- range $key, $val := .Values.dataloader.annotations }} {{ $key | quote }}: {{ $val | quote }} @@ -53,6 +52,7 @@ spec: release: {{ .Release.Name }} role: dataload-pod app: jindocache + sidecar.istio.io/inject: "false" cronjob: {{ printf "%s-job" .Release.Name }} targetDataset: {{ required "targetDataset should be set" .Values.dataloader.targetDataset }} {{- if .Values.dataloader.labels }} diff --git a/charts/fluid-dataloader/jindocache/templates/job.yaml b/charts/fluid-dataloader/jindocache/templates/job.yaml index 41d209d7141..7e905e470ff 100644 --- a/charts/fluid-dataloader/jindocache/templates/job.yaml +++ b/charts/fluid-dataloader/jindocache/templates/job.yaml @@ -38,7 +38,6 @@ spec: metadata: name: {{ printf "%s-loader" .Release.Name }} annotations: - sidecar.istio.io/inject: "false" {{- if .Values.dataloader.annotations }} {{- range $key, $val := .Values.dataloader.annotations }} {{ $key | quote }}: {{ $val | quote }} @@ -48,6 +47,7 @@ spec: release: {{ .Release.Name }} role: dataload-pod app: jindocache + sidecar.istio.io/inject: "false" targetDataset: {{ required "targetDataset should be set" .Values.dataloader.targetDataset }} {{- include "library.fluid.labels" . | nindent 8 }} {{- if .Values.dataloader.labels }} diff --git a/charts/fluid-dataloader/jindofsx/templates/cronjob.yaml b/charts/fluid-dataloader/jindofsx/templates/cronjob.yaml index 1d2d6248aa8..d945c8e7e93 100644 --- a/charts/fluid-dataloader/jindofsx/templates/cronjob.yaml +++ b/charts/fluid-dataloader/jindofsx/templates/cronjob.yaml @@ -43,7 +43,6 @@ spec: metadata: name: {{ printf "%s-loader" .Release.Name }} annotations: - sidecar.istio.io/inject: "false" {{- if .Values.dataloader.annotations }} {{- range $key, $val := .Values.dataloader.annotations }} {{ $key | quote }}: {{ $val | quote }} @@ -53,6 +52,7 @@ spec: release: {{ .Release.Name }} role: dataload-pod app: jondofsx + sidecar.istio.io/inject: "false" cronjob: {{ printf "%s-job" .Release.Name }} targetDataset: {{ required "targetDataset should be set" .Values.dataloader.targetDataset }} {{- if .Values.dataloader.labels }} diff --git a/charts/fluid-dataloader/jindofsx/templates/job.yaml b/charts/fluid-dataloader/jindofsx/templates/job.yaml index 3803294c435..59d5b211339 100644 --- a/charts/fluid-dataloader/jindofsx/templates/job.yaml +++ b/charts/fluid-dataloader/jindofsx/templates/job.yaml @@ -38,7 +38,6 @@ spec: metadata: name: {{ printf "%s-loader" .Release.Name }} annotations: - sidecar.istio.io/inject: "false" {{- if .Values.dataloader.annotations }} {{- range $key, $val := .Values.dataloader.annotations }} {{ $key | quote }}: {{ $val | quote }} @@ -48,6 +47,7 @@ spec: release: {{ .Release.Name }} role: dataload-pod app: jindofsx + sidecar.istio.io/inject: "false" targetDataset: {{ required "targetDataset should be set" .Values.dataloader.targetDataset }} {{- include "library.fluid.labels" . | nindent 8 }} {{- if .Values.dataloader.labels }} diff --git a/charts/fluid-dataloader/juicefs/templates/cronjob.yaml b/charts/fluid-dataloader/juicefs/templates/cronjob.yaml index 90282ec4cc8..65f9d436eb5 100644 --- a/charts/fluid-dataloader/juicefs/templates/cronjob.yaml +++ b/charts/fluid-dataloader/juicefs/templates/cronjob.yaml @@ -43,7 +43,6 @@ spec: metadata: name: {{ printf "%s-loader" .Release.Name }} annotations: - sidecar.istio.io/inject: "false" {{- if .Values.dataloader.annotations }} {{- range $key, $val := .Values.dataloader.annotations }} {{ $key | quote }}: {{ $val | quote }} @@ -53,6 +52,7 @@ spec: release: {{ .Release.Name }} role: dataload-pod app: juicefs + sidecar.istio.io/inject: "false" cronjob: {{ printf "%s-job" .Release.Name }} targetDataset: {{ required "targetDataset should be set" .Values.dataloader.targetDataset }} {{- if .Values.dataloader.labels }} diff --git a/charts/fluid-dataloader/juicefs/templates/job.yaml b/charts/fluid-dataloader/juicefs/templates/job.yaml index 796da8502d3..6f934788fea 100644 --- a/charts/fluid-dataloader/juicefs/templates/job.yaml +++ b/charts/fluid-dataloader/juicefs/templates/job.yaml @@ -38,7 +38,6 @@ spec: metadata: name: {{ printf "%s-loader" .Release.Name }} annotations: - sidecar.istio.io/inject: "false" {{- if .Values.dataloader.annotations }} {{- range $key, $val := .Values.dataloader.annotations }} {{ $key | quote }}: {{ $val | quote }} @@ -48,6 +47,7 @@ spec: release: {{ .Release.Name }} role: dataload-pod app: juicefs + sidecar.istio.io/inject: "false" targetDataset: {{ required "targetDataset should be set" .Values.dataloader.targetDataset }} {{- include "library.fluid.labels" . | nindent 8 }} {{- if .Values.dataloader.labels }} diff --git a/charts/fluid-datamigrate/juicefs/templates/cronjob.yaml b/charts/fluid-datamigrate/juicefs/templates/cronjob.yaml index a9673452e32..3b5628dcdd9 100644 --- a/charts/fluid-datamigrate/juicefs/templates/cronjob.yaml +++ b/charts/fluid-datamigrate/juicefs/templates/cronjob.yaml @@ -35,7 +35,6 @@ spec: metadata: name: {{ printf "%s-migrate" .Release.Name }} annotations: - sidecar.istio.io/inject: "false" {{- if .Values.datamigrate.annotations }} {{- range $key, $val := .Values.datamigrate.annotations }} {{ $key | quote }}: {{ $val | quote }} @@ -45,6 +44,7 @@ spec: release: {{ .Release.Name }} role: datamigrate-pod app: juicefs + sidecar.istio.io/inject: "false" cronjob: {{ printf "%s-migrate" .Release.Name }} targetDataset: {{ required "targetDataset should be set" .Values.datamigrate.targetDataset }} {{- if .Values.datamigrate.labels }} diff --git a/charts/fluid-datamigrate/juicefs/templates/job.yaml b/charts/fluid-datamigrate/juicefs/templates/job.yaml index 73f71244991..876cd88c47d 100644 --- a/charts/fluid-datamigrate/juicefs/templates/job.yaml +++ b/charts/fluid-datamigrate/juicefs/templates/job.yaml @@ -28,7 +28,6 @@ spec: metadata: name: {{ printf "%s-migrate" .Release.Name }} annotations: - sidecar.istio.io/inject: "false" {{- if .Values.datamigrate.annotations }} {{- range $key, $val := .Values.datamigrate.annotations }} {{ $key | quote }}: {{ $val | quote }} @@ -38,6 +37,7 @@ spec: release: {{ .Release.Name }} role: datamigrate-pod app: juicefs + sidecar.istio.io/inject: "false" targetDataset: {{ required "targetDataset should be set" .Values.datamigrate.targetDataset }} fluid.io/operation: migrate-{{ .Release.Namespace }}-{{ .Release.Name }} {{- include "library.fluid.labels" . | nindent 8 }} diff --git a/charts/fluid-dataprocess/common/templates/job.yaml b/charts/fluid-dataprocess/common/templates/job.yaml index f2d8d78d0a7..3ff5a21e014 100644 --- a/charts/fluid-dataprocess/common/templates/job.yaml +++ b/charts/fluid-dataprocess/common/templates/job.yaml @@ -25,7 +25,6 @@ spec: metadata: name: {{ printf "%s-process" .Release.Name }} annotations: - sidecar.istio.io/inject: "false" {{- if .Values.dataProcess.annotations }} {{ toYaml .Values.dataProcess.annotations | nindent 8 }} {{- end }} @@ -33,6 +32,7 @@ spec: release: {{ .Release.Name }} role: dataprocess-pod app: fluid-dataprocess + sidecar.istio.io/inject: "false" targetDataset: {{ required "targetDataset should be set" .Values.dataProcess.targetDataset }} {{- include "library.fluid.labels" . | nindent 8 }} {{- if .Values.dataProcess.labels }} diff --git a/charts/goosefs/templates/fuse/daemonset.yaml b/charts/goosefs/templates/fuse/daemonset.yaml index 11e654fffd5..d76a712068e 100644 --- a/charts/goosefs/templates/fuse/daemonset.yaml +++ b/charts/goosefs/templates/fuse/daemonset.yaml @@ -24,16 +24,16 @@ spec: template: metadata: annotations: - sidecar.istio.io/inject: "false" - {{- if .Values.fuse.annotations }} -{{ toYaml .Values.fuse.annotations | trim | indent 8 }} - {{- end }} + {{- if .Values.fuse.annotations }} + {{ toYaml .Values.fuse.annotations | nindent 8 }} + {{- end }} labels: app: {{ template "goosefs.name" . }} chart: {{ template "goosefs.chart" . }} release: {{ .Release.Name }} heritage: {{ .Release.Service }} role: goosefs-fuse + sidecar.istio.io/inject: "false" spec: {{- if .Values.fuse.criticalPod }} priorityClassName: system-node-critical diff --git a/charts/goosefs/templates/master/statefulset.yaml b/charts/goosefs/templates/master/statefulset.yaml index bf1929cdca0..df776a14130 100644 --- a/charts/goosefs/templates/master/statefulset.yaml +++ b/charts/goosefs/templates/master/statefulset.yaml @@ -32,10 +32,9 @@ spec: template: metadata: annotations: - sidecar.istio.io/inject: "false" - {{- if .Values.master.annotations }} -{{ toYaml .Values.master.annotations | trim | indent 8 }} - {{- end }} + {{- if .Values.master.annotations }} + {{ toYaml .Values.master.annotations | nindent 8 }} + {{- end }} labels: name: {{ $fullName }}-master app: {{ $name }} @@ -43,6 +42,7 @@ spec: release: {{ .Release.Name }} heritage: {{ .Release.Service }} role: goosefs-master + sidecar.istio.io/inject: "false" spec: enableServiceLinks: false hostNetwork: {{ $hostNetwork }} diff --git a/charts/goosefs/templates/worker/statefulset.yaml b/charts/goosefs/templates/worker/statefulset.yaml index 4d2141f8a34..3cd4f12dc57 100644 --- a/charts/goosefs/templates/worker/statefulset.yaml +++ b/charts/goosefs/templates/worker/statefulset.yaml @@ -26,7 +26,6 @@ spec: template: metadata: annotations: - sidecar.istio.io/inject: "false" {{- if .Values.worker.annotations }} {{ toYaml .Values.worker.annotations | trim | indent 8 }} {{- end }} @@ -36,6 +35,7 @@ spec: release: {{ .Release.Name }} heritage: {{ .Release.Service }} role: goosefs-worker + sidecar.istio.io/inject: "false" fluid.io/dataset: {{ .Release.Namespace }}-{{ .Release.Name }} fluid.io/dataset-placement: {{ .Values.placement }} spec: diff --git a/charts/jindocache/templates/fuse/daemonset.yaml b/charts/jindocache/templates/fuse/daemonset.yaml index fc20a0818a3..142865ad339 100755 --- a/charts/jindocache/templates/fuse/daemonset.yaml +++ b/charts/jindocache/templates/fuse/daemonset.yaml @@ -33,7 +33,6 @@ spec: template: metadata: annotations: - sidecar.istio.io/inject: "false" {{- if .Values.fuse.annotations }} {{- range $key, $val := .Values.fuse.annotations }} {{ $key | quote }}: {{ $val | quote }} @@ -45,6 +44,7 @@ spec: release: {{ .Release.Name }} heritage: {{ .Release.Service }} role: jindofs-fuse + sidecar.istio.io/inject: "false" {{- if .Values.fuse.labels }} {{- range $key, $val := .Values.fuse.labels }} {{ $key | quote }}: {{ $val | quote }} diff --git a/charts/jindocache/templates/master/statefulset.yaml b/charts/jindocache/templates/master/statefulset.yaml index 4bc55058615..58d03663128 100755 --- a/charts/jindocache/templates/master/statefulset.yaml +++ b/charts/jindocache/templates/master/statefulset.yaml @@ -35,7 +35,6 @@ spec: template: metadata: annotations: - sidecar.istio.io/inject: "false" {{- if .Values.master.annotations }} {{- range $key, $val := .Values.master.annotations }} {{ $key | quote }}: {{ $val | quote }} @@ -48,6 +47,7 @@ spec: release: {{ .Release.Name }} heritage: {{ .Release.Service }} role: jindofs-master + sidecar.istio.io/inject: "false" {{- if .Values.master.labels }} {{- range $key, $val := .Values.master.labels }} {{ $key | quote }}: {{ $val | quote }} diff --git a/charts/jindocache/templates/worker/statefulset.yaml b/charts/jindocache/templates/worker/statefulset.yaml index 7dff6313b15..af207f3d354 100755 --- a/charts/jindocache/templates/worker/statefulset.yaml +++ b/charts/jindocache/templates/worker/statefulset.yaml @@ -37,7 +37,6 @@ spec: template: metadata: annotations: - sidecar.istio.io/inject: "false" {{- if .Values.worker.annotations }} {{- range $key, $val := .Values.worker.annotations }} {{ $key | quote }}: {{ $val | quote }} @@ -49,6 +48,7 @@ spec: release: {{ .Release.Name }} heritage: {{ .Release.Service }} role: jindofs-worker + sidecar.istio.io/inject: "false" fluid.io/dataset: {{ .Release.Namespace }}-{{ .Release.Name }} fluid.io/dataset-placement: {{ .Values.placement }} {{- if .Values.worker.labels }} diff --git a/charts/jindofsx/templates/fuse/daemonset.yaml b/charts/jindofsx/templates/fuse/daemonset.yaml index d2f99e1c513..862e58df488 100755 --- a/charts/jindofsx/templates/fuse/daemonset.yaml +++ b/charts/jindofsx/templates/fuse/daemonset.yaml @@ -33,7 +33,6 @@ spec: template: metadata: annotations: - sidecar.istio.io/inject: "false" {{- if .Values.fuse.annotations }} {{- range $key, $val := .Values.fuse.annotations }} {{ $key | quote }}: {{ $val | quote }} @@ -45,6 +44,7 @@ spec: release: {{ .Release.Name }} heritage: {{ .Release.Service }} role: jindofs-fuse + sidecar.istio.io/inject: "false" {{- if .Values.fuse.labels }} {{- range $key, $val := .Values.fuse.labels }} {{ $key | quote }}: {{ $val | quote }} diff --git a/charts/jindofsx/templates/master/statefulset.yaml b/charts/jindofsx/templates/master/statefulset.yaml index 4cc2e459939..d1a1889ac6e 100755 --- a/charts/jindofsx/templates/master/statefulset.yaml +++ b/charts/jindofsx/templates/master/statefulset.yaml @@ -35,7 +35,6 @@ spec: template: metadata: annotations: - sidecar.istio.io/inject: "false" {{- if .Values.master.annotations }} {{- range $key, $val := .Values.master.annotations }} {{ $key | quote }}: {{ $val | quote }} @@ -48,6 +47,7 @@ spec: release: {{ .Release.Name }} heritage: {{ .Release.Service }} role: jindofs-master + sidecar.istio.io/inject: "false" {{- if .Values.master.labels }} {{- range $key, $val := .Values.master.labels }} {{ $key | quote }}: {{ $val | quote }} diff --git a/charts/jindofsx/templates/worker/statefulset.yaml b/charts/jindofsx/templates/worker/statefulset.yaml index d4e2b503de0..a3fe35ce4d9 100755 --- a/charts/jindofsx/templates/worker/statefulset.yaml +++ b/charts/jindofsx/templates/worker/statefulset.yaml @@ -37,7 +37,6 @@ spec: template: metadata: annotations: - sidecar.istio.io/inject: "false" {{- if .Values.worker.annotations }} {{- range $key, $val := .Values.worker.annotations }} {{ $key | quote }}: {{ $val | quote }} @@ -49,6 +48,7 @@ spec: release: {{ .Release.Name }} heritage: {{ .Release.Service }} role: jindofs-worker + sidecar.istio.io/inject: "false" fluid.io/dataset: {{ .Release.Namespace }}-{{ .Release.Name }} fluid.io/dataset-placement: {{ .Values.placement }} {{- if .Values.worker.labels }} diff --git a/charts/juicefs/templates/fuse/daemonset.yaml b/charts/juicefs/templates/fuse/daemonset.yaml index 3a190fdadd7..90f038d1149 100644 --- a/charts/juicefs/templates/fuse/daemonset.yaml +++ b/charts/juicefs/templates/fuse/daemonset.yaml @@ -32,7 +32,6 @@ spec: template: metadata: annotations: - sidecar.istio.io/inject: "false" {{- if .Values.fuse.annotations }} {{- range $key, $val := .Values.fuse.annotations}} {{ $key | quote }}: {{ $val | quote }} @@ -44,6 +43,7 @@ spec: release: {{ .Release.Name }} heritage: {{ .Release.Service }} role: juicefs-fuse + sidecar.istio.io/inject: "false" {{- if .Values.fuse.labels }} {{- range $key, $val := .Values.fuse.labels }} {{ $key | quote }}: {{ $val | quote }} diff --git a/charts/juicefs/templates/worker/statefulset.yaml b/charts/juicefs/templates/worker/statefulset.yaml index 78735ce26ea..bd78ddcde15 100644 --- a/charts/juicefs/templates/worker/statefulset.yaml +++ b/charts/juicefs/templates/worker/statefulset.yaml @@ -35,7 +35,6 @@ spec: template: metadata: annotations: - sidecar.istio.io/inject: "false" {{- if .Values.worker.annotations }} {{- range $key, $val := .Values.worker.annotations}} {{ $key | quote }}: {{ $val | quote }} @@ -47,6 +46,7 @@ spec: release: {{ .Release.Name }} heritage: {{ .Release.Service }} role: juicefs-worker + sidecar.istio.io/inject: "false" fluid.io/dataset: {{ .Release.Namespace }}-{{ .Release.Name }} fluid.io/dataset-placement: {{ .Values.placement }} {{- if .Values.worker.labels }} diff --git a/charts/thin/templates/fuse/daemonset.yaml b/charts/thin/templates/fuse/daemonset.yaml index cec31814690..61c23e8465b 100644 --- a/charts/thin/templates/fuse/daemonset.yaml +++ b/charts/thin/templates/fuse/daemonset.yaml @@ -29,14 +29,13 @@ spec: role: thin-fuse template: metadata: - annotations: - sidecar.istio.io/inject: "false" labels: app: {{ template "thin.name" . }} chart: {{ template "thin.chart" . }} release: {{ .Release.Name }} heritage: {{ .Release.Service }} role: thin-fuse + sidecar.istio.io/inject: "false" spec: {{- if .Values.fuse.imagePullSecrets }} imagePullSecrets: diff --git a/charts/thin/templates/worker/statefuleset.yaml b/charts/thin/templates/worker/statefuleset.yaml index 43e58285128..eec1b46a61c 100644 --- a/charts/thin/templates/worker/statefuleset.yaml +++ b/charts/thin/templates/worker/statefuleset.yaml @@ -32,14 +32,13 @@ spec: role: thin-worker template: metadata: - annotations: - sidecar.istio.io/inject: "false" labels: app: {{ template "thin.name" . }} chart: {{ template "thin.chart" . }} release: {{ .Release.Name }} heritage: {{ .Release.Service }} role: thin-worker + sidecar.istio.io/inject: "false" fluid.io/dataset: {{ .Release.Namespace }}-{{ .Release.Name }} fluid.io/dataset-placement: {{ .Values.placement }} spec: diff --git a/charts/vineyard/templates/fuse/daemonset.yaml b/charts/vineyard/templates/fuse/daemonset.yaml index f2b533b7e61..e03b3adb1fd 100644 --- a/charts/vineyard/templates/fuse/daemonset.yaml +++ b/charts/vineyard/templates/fuse/daemonset.yaml @@ -46,7 +46,6 @@ spec: template: metadata: annotations: - sidecar.istio.io/inject: "false" {{- if .Values.fuse.annotations }} {{- range $key, $val := .Values.fuse.annotations }} {{ $key | quote }}: {{ $val | quote }} @@ -57,6 +56,7 @@ spec: chart: {{ $chart }} release: {{ .Release.Name }} role: vineyard-fuse + sidecar.istio.io/inject: "false" {{- if .Values.fuse.labels }} {{- range $key, $val := .Values.fuse.labels }} {{ $key | quote }}: {{ $val | quote }} diff --git a/charts/vineyard/templates/master/statefulset.yaml b/charts/vineyard/templates/master/statefulset.yaml index 9e24bf99d07..6336efc051b 100644 --- a/charts/vineyard/templates/master/statefulset.yaml +++ b/charts/vineyard/templates/master/statefulset.yaml @@ -54,7 +54,6 @@ spec: template: metadata: annotations: - sidecar.istio.io/inject: "false" {{- if .Values.master.annotations }} {{- range $key, $val := .Values.master.annotations }} {{ $key | quote }}: {{ $val | quote }} @@ -66,6 +65,7 @@ spec: release: {{ .Release.Name }} heritage: {{ .Release.Service }} role: vineyard-master + sidecar.istio.io/inject: "false" {{- if .Values.master.labels }} {{- range $key, $val := .Values.master.labels }} {{ $key | quote }}: {{ $val | quote }} diff --git a/charts/vineyard/templates/worker/statefulset.yaml b/charts/vineyard/templates/worker/statefulset.yaml index 7feada86bf5..30d8ab9b2c9 100644 --- a/charts/vineyard/templates/worker/statefulset.yaml +++ b/charts/vineyard/templates/worker/statefulset.yaml @@ -50,7 +50,6 @@ spec: template: metadata: annotations: - sidecar.istio.io/inject: "false" {{- if .Values.worker.annotations }} {{- range $key, $val := .Values.worker.annotations }} {{ $key | quote }}: {{ $val | quote }} @@ -62,6 +61,7 @@ spec: release: {{ .Release.Name }} heritage: {{ .Release.Service }} role: vineyard-worker + sidecar.istio.io/inject: "false" fluid.io/dataset: {{ .Release.Namespace }}-{{ .Release.Name }} app.kubernetes.io/instance: {{ .Release.Namespace }}-{{ $fullName }}-worker {{- if .Values.worker.labels }}