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

Fix sidecar.istio.io/inject: false use label instead of annotation #4420

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Fix sidecar.istio.io/inject: false use label instead of annotation #4420

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a426ef5
Fix sidecar.istio.io/inject: false use label instead of annotation
SecretSun Nov 28, 2024
4a5bf7d
Update cronjob.yaml
SecretSun Nov 28, 2024
144012d
Update statefulset.yaml
SecretSun Nov 28, 2024
1be341c
Update daemonset.yaml
SecretSun Nov 28, 2024
8590913
Update statefulset.yaml
SecretSun Nov 28, 2024
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
2 changes: 1 addition & 1 deletion charts/alluxio/templates/fuse/daemonset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ spec:
template:
metadata:
annotations:
sidecar.istio.io/inject: "false"
SecretSun marked this conversation as resolved.
Show resolved Hide resolved
{{- if .Values.fuse.annotations }}
{{- range $key, $val := .Values.fuse.annotations }}
{{ $key | quote }}: {{ $val | quote }}
Expand All @@ -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 }}
Expand Down
2 changes: 1 addition & 1 deletion charts/alluxio/templates/master/statefulset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand All @@ -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 }}
Expand Down
2 changes: 1 addition & 1 deletion charts/alluxio/templates/worker/statefulset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand All @@ -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 }}
Expand Down
2 changes: 1 addition & 1 deletion charts/efc/templates/fuse/daemonset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand All @@ -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 }}
Expand Down
2 changes: 1 addition & 1 deletion charts/efc/templates/master/statefulset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand All @@ -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 }}
Expand Down
2 changes: 1 addition & 1 deletion charts/efc/templates/worker/statefulset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand All @@ -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 }}
Expand Down
2 changes: 1 addition & 1 deletion charts/fluid-dataloader/alluxio/templates/cronjob.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand All @@ -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 }}
Expand Down
2 changes: 1 addition & 1 deletion charts/fluid-dataloader/alluxio/templates/job.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand All @@ -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 }}
Expand Down
3 changes: 1 addition & 2 deletions charts/fluid-dataloader/goosefs/templates/cronjob.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
3 changes: 1 addition & 2 deletions charts/fluid-dataloader/goosefs/templates/job.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
5 changes: 2 additions & 3 deletions charts/fluid-dataloader/jindo/templates/cronjob.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -163,4 +162,4 @@ spec:
path: jindo_dataload.sh
mode: 365

{{- end }}
{{- end }}
3 changes: 1 addition & 2 deletions charts/fluid-dataloader/jindo/templates/job.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion charts/fluid-dataloader/jindocache/templates/cronjob.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand All @@ -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 }}
Expand Down
2 changes: 1 addition & 1 deletion charts/fluid-dataloader/jindocache/templates/job.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand All @@ -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 }}
Expand Down
2 changes: 1 addition & 1 deletion charts/fluid-dataloader/jindofsx/templates/cronjob.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand All @@ -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 }}
Expand Down
2 changes: 1 addition & 1 deletion charts/fluid-dataloader/jindofsx/templates/job.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand All @@ -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 }}
Expand Down
2 changes: 1 addition & 1 deletion charts/fluid-dataloader/juicefs/templates/cronjob.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand All @@ -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 }}
Expand Down
2 changes: 1 addition & 1 deletion charts/fluid-dataloader/juicefs/templates/job.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand All @@ -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 }}
Expand Down
2 changes: 1 addition & 1 deletion charts/fluid-datamigrate/juicefs/templates/cronjob.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand All @@ -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 }}
Expand Down
2 changes: 1 addition & 1 deletion charts/fluid-datamigrate/juicefs/templates/job.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand All @@ -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 }}
Expand Down
2 changes: 1 addition & 1 deletion charts/fluid-dataprocess/common/templates/job.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,14 @@ 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 }}
labels:
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 }}
Expand Down
8 changes: 4 additions & 4 deletions charts/goosefs/templates/fuse/daemonset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions charts/goosefs/templates/master/statefulset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,17 +32,17 @@ 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 }}
chart: {{ $chart }}
release: {{ .Release.Name }}
heritage: {{ .Release.Service }}
role: goosefs-master
sidecar.istio.io/inject: "false"
spec:
enableServiceLinks: false
hostNetwork: {{ $hostNetwork }}
Expand Down
2 changes: 1 addition & 1 deletion charts/goosefs/templates/worker/statefulset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand All @@ -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:
Expand Down
Loading
Loading