From 7520dfd7d11e4787fe0b946a590a4a95d8b7edf4 Mon Sep 17 00:00:00 2001 From: Saber <44921652+uniqueni@users.noreply.github.com> Date: Thu, 2 Feb 2023 13:35:12 +0800 Subject: [PATCH] add sidecar.istio.io/inject annotations for alluxio runtime (#2551) Signed-off-by: Wang Ni Co-authored-by: Wang Ni --- charts/alluxio/CHANGELOG.md | 4 ++++ charts/alluxio/Chart.yaml | 4 +++- charts/alluxio/templates/fuse/daemonset.yaml | 3 ++- charts/alluxio/templates/master/statefulset.yaml | 3 ++- charts/alluxio/templates/worker/statefulset.yaml | 3 ++- 5 files changed, 13 insertions(+), 4 deletions(-) diff --git a/charts/alluxio/CHANGELOG.md b/charts/alluxio/CHANGELOG.md index f587df65dd8..591014ef0d4 100644 --- a/charts/alluxio/CHANGELOG.md +++ b/charts/alluxio/CHANGELOG.md @@ -246,3 +246,7 @@ 0.9.11 - Support ownerReferences for AlluxioRuntime resources + +0.9.12 + +- Add `sidecar.istio.io/inject` to components annotation \ No newline at end of file diff --git a/charts/alluxio/Chart.yaml b/charts/alluxio/Chart.yaml index 0812649d839..e9ff708dbb9 100644 --- a/charts/alluxio/Chart.yaml +++ b/charts/alluxio/Chart.yaml @@ -12,7 +12,7 @@ name: alluxio apiVersion: v1 description: Open source data orchestration for analytics and machine learning in any cloud. -version: 0.9.11 +version: 0.9.12 home: https://www.alluxio.io/ maintainers: - name: Adit Madan @@ -25,3 +25,5 @@ maintainers: email: allenhaozi@gmail.com - name: Sichen Zhao email: sichen.zhao@outlook.com +- name: Ni Wang + email: niwangzz@163.com diff --git a/charts/alluxio/templates/fuse/daemonset.yaml b/charts/alluxio/templates/fuse/daemonset.yaml index 13dd25a905c..306d1c6ce45 100644 --- a/charts/alluxio/templates/fuse/daemonset.yaml +++ b/charts/alluxio/templates/fuse/daemonset.yaml @@ -44,8 +44,9 @@ spec: role: alluxio-fuse template: metadata: - {{- if .Values.fuse.annotations }} annotations: + sidecar.istio.io/inject: "false" + {{- if .Values.fuse.annotations }} {{- range $key, $val := .Values.fuse.annotations }} {{ $key | quote }}: {{ $val | quote }} {{- end }} diff --git a/charts/alluxio/templates/master/statefulset.yaml b/charts/alluxio/templates/master/statefulset.yaml index 6047e0acafb..9b56fdf78fd 100644 --- a/charts/alluxio/templates/master/statefulset.yaml +++ b/charts/alluxio/templates/master/statefulset.yaml @@ -50,8 +50,9 @@ spec: replicas: {{ $masterCount }} template: metadata: - {{- if .Values.master.annotations }} annotations: + sidecar.istio.io/inject: "false" + {{- if .Values.master.annotations }} {{- range $key, $val := .Values.master.annotations }} {{ $key | quote }}: {{ $val | quote }} {{- end }} diff --git a/charts/alluxio/templates/worker/statefulset.yaml b/charts/alluxio/templates/worker/statefulset.yaml index 68e1f78852a..d9df8ebf441 100644 --- a/charts/alluxio/templates/worker/statefulset.yaml +++ b/charts/alluxio/templates/worker/statefulset.yaml @@ -45,8 +45,9 @@ spec: podManagementPolicy: {{ .Values.worker.podManagementPolicy }} template: metadata: - {{- if .Values.worker.annotations }} annotations: + sidecar.istio.io/inject: "false" + {{- if .Values.worker.annotations }} {{- range $key, $val := .Values.worker.annotations }} {{ $key | quote }}: {{ $val | quote }} {{- end }}