From 0ede8115e8a1fa3654fa72b41740f9eefbf0d958 Mon Sep 17 00:00:00 2001
From: zhuwenxing <wenxing.zhu@zilliz.com>
Date: Tue, 19 Oct 2021 21:12:36 +0800
Subject: [PATCH] [skip ci]Update chaos mesh to v2.0.3 (#10225)

Signed-off-by: zhuwenxing <wenxing.zhu@zilliz.com>
---
 .github/workflows/pod-kill-chaos-test.yaml    |  2 +-
 .../pod_kill/chaos_datacoord_podkill.yaml     | 22 ++++++++++------
 .../pod_kill/chaos_datanode_podkill.yaml      | 21 +++++++++------
 .../pod_kill/chaos_etcd_podkill.yaml          | 21 +++++++++------
 .../pod_kill/chaos_indexcoord_podkill.yaml    | 21 +++++++++------
 .../pod_kill/chaos_indexnode_podkill.yaml     | 21 +++++++++------
 .../pod_kill/chaos_minio_podkill.yaml         | 23 +++++++++-------
 .../pod_kill/chaos_proxy_podkill.yaml         | 21 +++++++++------
 .../pod_kill/chaos_pulsar_podkill.yaml        | 26 ++++++++++++-------
 .../pod_kill/chaos_querycoord_podkill.yaml    | 21 +++++++++------
 .../pod_kill/chaos_querynode_podkill.yaml     | 23 ++++++++++------
 .../pod_kill/chaos_rootcoord_podkill.yaml     | 21 +++++++++------
 12 files changed, 151 insertions(+), 92 deletions(-)

diff --git a/.github/workflows/pod-kill-chaos-test.yaml b/.github/workflows/pod-kill-chaos-test.yaml
index d81899a79a..fbf0a628e5 100644
--- a/.github/workflows/pod-kill-chaos-test.yaml
+++ b/.github/workflows/pod-kill-chaos-test.yaml
@@ -53,7 +53,7 @@ jobs:
           helm repo add chaos-mesh https://charts.chaos-mesh.org
           helm search repo chaos-mesh
           kubectl create ns chaos-testing
-          helm install chaos-mesh chaos-mesh/chaos-mesh --namespace=chaos-testing --version v0.5.3 --set chaosDaemon.runtime=containerd --set chaosDaemon.socketPath=/run/containerd/containerd.sock
+          helm install chaos-mesh chaos-mesh/chaos-mesh --namespace=chaos-testing --version v2.0.3 --set chaosDaemon.runtime=containerd --set chaosDaemon.socketPath=/run/containerd/containerd.sock
           sleep 60s
           kubectl get po -n chaos-testing
       
diff --git a/tests/python_client/chaos/chaos_objects/pod_kill/chaos_datacoord_podkill.yaml b/tests/python_client/chaos/chaos_objects/pod_kill/chaos_datacoord_podkill.yaml
index 48e06113b8..a00c882165 100644
--- a/tests/python_client/chaos/chaos_objects/pod_kill/chaos_datacoord_podkill.yaml
+++ b/tests/python_client/chaos/chaos_objects/pod_kill/chaos_datacoord_podkill.yaml
@@ -1,17 +1,23 @@
+kind: Schedule
 apiVersion: chaos-mesh.org/v1alpha1
-kind: PodChaos
 metadata:
   name: test-datacoord-podkill
   namespace: chaos-testing
 spec:
-  action: pod-kill
-  mode: one
-  selector:
-    namespaces:
-      - chaos-testing         # target namespace of milvus deployment
+  schedule: '*/5 * * * * *'
+  startingDeadlineSeconds: 60
+  concurrencyPolicy: Forbid
+  historyLimit: 1
+  type: PodChaos
+  podChaos:
+    selector:
+      namespaces:
+        - chaos-testing
+      labelSelectors:
     labelSelectors:
       app.kubernetes.io/instance: milvus-chaos
       app.kubernetes.io/name: milvus
       component: datacoord
-  scheduler:
-    cron: '@every 5s'
+    mode: one
+    action: pod-kill
+    gracePeriod: 0
\ No newline at end of file
diff --git a/tests/python_client/chaos/chaos_objects/pod_kill/chaos_datanode_podkill.yaml b/tests/python_client/chaos/chaos_objects/pod_kill/chaos_datanode_podkill.yaml
index 9b23779b8b..e9bdc49d3b 100644
--- a/tests/python_client/chaos/chaos_objects/pod_kill/chaos_datanode_podkill.yaml
+++ b/tests/python_client/chaos/chaos_objects/pod_kill/chaos_datanode_podkill.yaml
@@ -1,17 +1,22 @@
+kind: Schedule
 apiVersion: chaos-mesh.org/v1alpha1
-kind: PodChaos
 metadata:
   name: test-datanode-podkill
   namespace: chaos-testing
 spec:
-  action: pod-kill
-  mode: one
-  selector:
-    namespaces:
-      - chaos-testing         # target namespace of milvus deployment
+  schedule: '*/5 * * * * *'
+  startingDeadlineSeconds: 60
+  concurrencyPolicy: Forbid
+  historyLimit: 1
+  type: PodChaos
+  podChaos:
+    selector:
+      namespaces:
+        - chaos-testing
     labelSelectors:
       app.kubernetes.io/instance: milvus-chaos
       app.kubernetes.io/name: milvus
       component: datanode
-  scheduler:
-    cron: '@every 5s'
+    mode: one
+    action: pod-kill
+    gracePeriod: 0
\ No newline at end of file
diff --git a/tests/python_client/chaos/chaos_objects/pod_kill/chaos_etcd_podkill.yaml b/tests/python_client/chaos/chaos_objects/pod_kill/chaos_etcd_podkill.yaml
index 9f744599b5..eaddee1bfe 100644
--- a/tests/python_client/chaos/chaos_objects/pod_kill/chaos_etcd_podkill.yaml
+++ b/tests/python_client/chaos/chaos_objects/pod_kill/chaos_etcd_podkill.yaml
@@ -1,16 +1,21 @@
+kind: Schedule
 apiVersion: chaos-mesh.org/v1alpha1
-kind: PodChaos
 metadata:
   name: test-etcd-podkill
   namespace: chaos-testing
 spec:
-  action: pod-kill
-  mode: all
-  selector:
-    namespaces:
-      - chaos-testing         # target namespace of milvus deployment
+  schedule: '*/5 * * * * *'
+  startingDeadlineSeconds: 60
+  concurrencyPolicy: Forbid
+  historyLimit: 1
+  type: PodChaos
+  podChaos:
+    selector:
+      namespaces:
+        - chaos-testing
     labelSelectors:
       app.kubernetes.io/instance: milvus-chaos
       app.kubernetes.io/name: etcd
-  scheduler:
-    cron: '@every 5s'
+    mode: one
+    action: pod-kill
+    gracePeriod: 0
\ No newline at end of file
diff --git a/tests/python_client/chaos/chaos_objects/pod_kill/chaos_indexcoord_podkill.yaml b/tests/python_client/chaos/chaos_objects/pod_kill/chaos_indexcoord_podkill.yaml
index f8969ecba9..c3620f61a6 100644
--- a/tests/python_client/chaos/chaos_objects/pod_kill/chaos_indexcoord_podkill.yaml
+++ b/tests/python_client/chaos/chaos_objects/pod_kill/chaos_indexcoord_podkill.yaml
@@ -1,17 +1,22 @@
+kind: Schedule
 apiVersion: chaos-mesh.org/v1alpha1
-kind: PodChaos
 metadata:
   name: test-indexcoord-podkill
   namespace: chaos-testing
 spec:
-  action: pod-kill
-  mode: one
-  selector:
-    namespaces:
-      - chaos-testing         # target namespace of milvus deployment
+  schedule: '*/5 * * * * *'
+  startingDeadlineSeconds: 60
+  concurrencyPolicy: Forbid
+  historyLimit: 1
+  type: PodChaos
+  podChaos:
+    selector:
+      namespaces:
+        - chaos-testing
     labelSelectors:
       app.kubernetes.io/instance: milvus-chaos
       app.kubernetes.io/name: milvus
       component: indexcoord
-  scheduler:
-    cron: '@every 5s'
+    mode: one
+    action: pod-kill
+    gracePeriod: 0
\ No newline at end of file
diff --git a/tests/python_client/chaos/chaos_objects/pod_kill/chaos_indexnode_podkill.yaml b/tests/python_client/chaos/chaos_objects/pod_kill/chaos_indexnode_podkill.yaml
index 7e894dfe4e..93698233e1 100644
--- a/tests/python_client/chaos/chaos_objects/pod_kill/chaos_indexnode_podkill.yaml
+++ b/tests/python_client/chaos/chaos_objects/pod_kill/chaos_indexnode_podkill.yaml
@@ -1,17 +1,22 @@
+kind: Schedule
 apiVersion: chaos-mesh.org/v1alpha1
-kind: PodChaos
 metadata:
   name: test-indexnode-podkill
   namespace: chaos-testing
 spec:
-  action: pod-kill
-  mode: one
-  selector:
-    namespaces:
-      - chaos-testing         # target namespace of milvus deployment
+  schedule: '*/5 * * * * *'
+  startingDeadlineSeconds: 60
+  concurrencyPolicy: Forbid
+  historyLimit: 1
+  type: PodChaos
+  podChaos:
+    selector:
+      namespaces:
+        - chaos-testing
     labelSelectors:
       app.kubernetes.io/instance: milvus-chaos
       app.kubernetes.io/name: milvus
       component: indexnode
-  scheduler:
-    cron: '@every 5s'
+    mode: one
+    action: pod-kill
+    gracePeriod: 0
\ No newline at end of file
diff --git a/tests/python_client/chaos/chaos_objects/pod_kill/chaos_minio_podkill.yaml b/tests/python_client/chaos/chaos_objects/pod_kill/chaos_minio_podkill.yaml
index d873810f29..433a08c852 100644
--- a/tests/python_client/chaos/chaos_objects/pod_kill/chaos_minio_podkill.yaml
+++ b/tests/python_client/chaos/chaos_objects/pod_kill/chaos_minio_podkill.yaml
@@ -1,16 +1,21 @@
+kind: Schedule
 apiVersion: chaos-mesh.org/v1alpha1
-kind: PodChaos
 metadata:
   name: test-minio-podkill
   namespace: chaos-testing
 spec:
-  action: pod-kill
-  mode: all
-  selector:
-    namespaces:
-      - chaos-testing         # target namespace of milvus deployment
+  schedule: '*/5 * * * * *'
+  startingDeadlineSeconds: 60
+  concurrencyPolicy: Forbid
+  historyLimit: 1
+  type: PodChaos
+  podChaos:
+    selector:
+      namespaces:
+        - chaos-testing
     labelSelectors:
       release: milvus-chaos
-      app: minio
-  scheduler:
-    cron: '@every 5s'
+      app: minio 
+    mode: one
+    action: pod-kill
+    gracePeriod: 0
\ No newline at end of file
diff --git a/tests/python_client/chaos/chaos_objects/pod_kill/chaos_proxy_podkill.yaml b/tests/python_client/chaos/chaos_objects/pod_kill/chaos_proxy_podkill.yaml
index ac0de00826..abe7046a76 100644
--- a/tests/python_client/chaos/chaos_objects/pod_kill/chaos_proxy_podkill.yaml
+++ b/tests/python_client/chaos/chaos_objects/pod_kill/chaos_proxy_podkill.yaml
@@ -1,17 +1,22 @@
+kind: Schedule
 apiVersion: chaos-mesh.org/v1alpha1
-kind: PodChaos
 metadata:
   name: test-proxy-podkill
   namespace: chaos-testing
 spec:
-  action: pod-kill
-  mode: one
-  selector:
-    namespaces:
-      - chaos-testing         # target namespace of milvus deployment
+  schedule: '*/5 * * * * *'
+  startingDeadlineSeconds: 60
+  concurrencyPolicy: Forbid
+  historyLimit: 1
+  type: PodChaos
+  podChaos:
+    selector:
+      namespaces:
+        - chaos-testing
     labelSelectors:
       app.kubernetes.io/instance: milvus-chaos
       app.kubernetes.io/name: milvus
       component: proxy
-  scheduler:
-    cron: '@every 5s'
+    mode: one
+    action: pod-kill
+    gracePeriod: 0
\ No newline at end of file
diff --git a/tests/python_client/chaos/chaos_objects/pod_kill/chaos_pulsar_podkill.yaml b/tests/python_client/chaos/chaos_objects/pod_kill/chaos_pulsar_podkill.yaml
index 8a9d159bd6..5b74a39bcb 100644
--- a/tests/python_client/chaos/chaos_objects/pod_kill/chaos_pulsar_podkill.yaml
+++ b/tests/python_client/chaos/chaos_objects/pod_kill/chaos_pulsar_podkill.yaml
@@ -1,16 +1,22 @@
+kind: Schedule
 apiVersion: chaos-mesh.org/v1alpha1
-kind: PodChaos
 metadata:
-  name: test-proxy-podkill
+  name: test-pulsar-podkill
   namespace: chaos-testing
 spec:
-  action: pod-kill
-  mode: all
-  selector:
-    namespaces:
-      - chaos-testing         # target namespace of milvus deployment
+  schedule: '*/5 * * * * *'
+  startingDeadlineSeconds: 60
+  concurrencyPolicy: Forbid
+  historyLimit: 1
+  type: PodChaos
+  podChaos:
+    selector:
+      namespaces:
+        - chaos-testing
     labelSelectors:
-      release: chaos-testing
+      release: milvus-chaos
       app: pulsar
-  scheduler:
-    cron: '@every 5s'
+    mode: one
+    action: pod-kill
+    gracePeriod: 0
+
diff --git a/tests/python_client/chaos/chaos_objects/pod_kill/chaos_querycoord_podkill.yaml b/tests/python_client/chaos/chaos_objects/pod_kill/chaos_querycoord_podkill.yaml
index aa99ed3b71..0e28e04ff7 100644
--- a/tests/python_client/chaos/chaos_objects/pod_kill/chaos_querycoord_podkill.yaml
+++ b/tests/python_client/chaos/chaos_objects/pod_kill/chaos_querycoord_podkill.yaml
@@ -1,17 +1,22 @@
+kind: Schedule
 apiVersion: chaos-mesh.org/v1alpha1
-kind: PodChaos
 metadata:
   name: test-querycoord-podkill
   namespace: chaos-testing
 spec:
-  action: pod-kill
-  mode: one
-  selector:
-    namespaces:
-      - chaos-testing         # target namespace of milvus deployment
+  schedule: '*/5 * * * * *'
+  startingDeadlineSeconds: 60
+  concurrencyPolicy: Forbid
+  historyLimit: 1
+  type: PodChaos
+  podChaos:
+    selector:
+      namespaces:
+        - chaos-testing
     labelSelectors:
       app.kubernetes.io/instance: milvus-chaos
       app.kubernetes.io/name: milvus
       component: querycoord
-  scheduler:
-    cron: '@every 15s'
+    mode: one
+    action: pod-kill
+    gracePeriod: 0
\ No newline at end of file
diff --git a/tests/python_client/chaos/chaos_objects/pod_kill/chaos_querynode_podkill.yaml b/tests/python_client/chaos/chaos_objects/pod_kill/chaos_querynode_podkill.yaml
index 7ad9e71354..9680e6e595 100644
--- a/tests/python_client/chaos/chaos_objects/pod_kill/chaos_querynode_podkill.yaml
+++ b/tests/python_client/chaos/chaos_objects/pod_kill/chaos_querynode_podkill.yaml
@@ -1,17 +1,24 @@
+kind: Schedule
 apiVersion: chaos-mesh.org/v1alpha1
-kind: PodChaos
 metadata:
   name: test-querynode-podkill
   namespace: chaos-testing
+  annotations:
+    experiment.chaos-mesh.org/pause: 'false'
 spec:
-  action: pod-kill
-  mode: one
-  selector:
-    namespaces:
-      - chaos-testing         # target namespace of milvus deployment
+  schedule: '*/5 * * * * *'
+  startingDeadlineSeconds: 60
+  concurrencyPolicy: Forbid
+  historyLimit: 1
+  type: PodChaos
+  podChaos:
+    selector:
+      namespaces:
+        - chaos-testing
     labelSelectors:
       app.kubernetes.io/instance: milvus-chaos
       app.kubernetes.io/name: milvus
       component: querynode
-  scheduler:
-    cron: '@every 15s'
+    mode: one
+    action: pod-kill
+    gracePeriod: 0
\ No newline at end of file
diff --git a/tests/python_client/chaos/chaos_objects/pod_kill/chaos_rootcoord_podkill.yaml b/tests/python_client/chaos/chaos_objects/pod_kill/chaos_rootcoord_podkill.yaml
index ace4d790d7..239d27f5fb 100644
--- a/tests/python_client/chaos/chaos_objects/pod_kill/chaos_rootcoord_podkill.yaml
+++ b/tests/python_client/chaos/chaos_objects/pod_kill/chaos_rootcoord_podkill.yaml
@@ -1,17 +1,22 @@
+kind: Schedule
 apiVersion: chaos-mesh.org/v1alpha1
-kind: PodChaos
 metadata:
   name: test-rootcoord-podkill
   namespace: chaos-testing
 spec:
-  action: pod-kill
-  mode: one
-  selector:
-    namespaces:
-      - chaos-testing         # target namespace of milvus deployment
+  schedule: '*/5 * * * * *'
+  startingDeadlineSeconds: 60
+  concurrencyPolicy: Forbid
+  historyLimit: 1
+  type: PodChaos
+  podChaos:
+    selector:
+      namespaces:
+        - chaos-testing
     labelSelectors:
       app.kubernetes.io/instance: milvus-chaos
       app.kubernetes.io/name: milvus
       component: rootcoord
-  scheduler:
-    cron: '@every 5s'
+    mode: one
+    action: pod-kill
+    gracePeriod: 0
\ No newline at end of file