From 97994511b60e40f58196e353d59fb87998d1a75e Mon Sep 17 00:00:00 2001 From: drivebyer Date: Tue, 10 Oct 2023 10:57:53 +0800 Subject: [PATCH] remove assert file, which already assert in setup directory Signed-off-by: drivebyer --- .../redis-cluster/00-install.yaml | 4 +- .../redis-cluster/ready-cluster.yaml | 7 - .../redis-cluster/ready-pvc.yaml | 181 ------------------ .../redis-standalone/00-install.yaml | 3 +- .../redis-standalone/ready-pvc.yaml | 14 -- 5 files changed, 2 insertions(+), 207 deletions(-) delete mode 100644 tests/e2e/v1beta2/ignore-annots/redis-cluster/ready-cluster.yaml delete mode 100644 tests/e2e/v1beta2/ignore-annots/redis-cluster/ready-pvc.yaml delete mode 100644 tests/e2e/v1beta2/ignore-annots/redis-standalone/ready-pvc.yaml diff --git a/tests/e2e/v1beta2/ignore-annots/redis-cluster/00-install.yaml b/tests/e2e/v1beta2/ignore-annots/redis-cluster/00-install.yaml index 1aef14859..727b90b30 100644 --- a/tests/e2e/v1beta2/ignore-annots/redis-cluster/00-install.yaml +++ b/tests/e2e/v1beta2/ignore-annots/redis-cluster/00-install.yaml @@ -3,6 +3,4 @@ kind: TestStep apply : - cluster.yaml assert : - - ready-cluster.yaml - - ready-cluster-sts.yaml - - ready-pvc.yaml \ No newline at end of file + - ready-cluster-sts.yaml \ No newline at end of file diff --git a/tests/e2e/v1beta2/ignore-annots/redis-cluster/ready-cluster.yaml b/tests/e2e/v1beta2/ignore-annots/redis-cluster/ready-cluster.yaml deleted file mode 100644 index 49e754e81..000000000 --- a/tests/e2e/v1beta2/ignore-annots/redis-cluster/ready-cluster.yaml +++ /dev/null @@ -1,7 +0,0 @@ -apiVersion: redis.redis.opstreelabs.in/v1beta2 -kind: RedisCluster -metadata: - name: redis-cluster-v1beta2 -status: - readyFollowerReplicas: 3 - readyLeaderReplicas: 3 diff --git a/tests/e2e/v1beta2/ignore-annots/redis-cluster/ready-pvc.yaml b/tests/e2e/v1beta2/ignore-annots/redis-cluster/ready-pvc.yaml deleted file mode 100644 index a89bfa22a..000000000 --- a/tests/e2e/v1beta2/ignore-annots/redis-cluster/ready-pvc.yaml +++ /dev/null @@ -1,181 +0,0 @@ -apiVersion: v1 -kind: PersistentVolumeClaim -metadata: - name: node-conf-redis-cluster-v1beta2-leader-0 - labels: - app: redis-cluster-v1beta2-leader - redis_setup_type: cluster - role: leader -status: - accessModes: - - ReadWriteOnce - capacity: - storage: 1Gi - phase: Bound ---- -apiVersion: v1 -kind: PersistentVolumeClaim -metadata: - name: node-conf-redis-cluster-v1beta2-leader-1 - labels: - app: redis-cluster-v1beta2-leader - redis_setup_type: cluster - role: leader -status: - accessModes: - - ReadWriteOnce - capacity: - storage: 1Gi - phase: Bound ---- -apiVersion: v1 -kind: PersistentVolumeClaim -metadata: - name: node-conf-redis-cluster-v1beta2-leader-2 - labels: - app: redis-cluster-v1beta2-leader - redis_setup_type: cluster - role: leader -status: - accessModes: - - ReadWriteOnce - capacity: - storage: 1Gi - phase: Bound ---- -apiVersion: v1 -kind: PersistentVolumeClaim -metadata: - name: node-conf-redis-cluster-v1beta2-follower-0 - labels: - app: redis-cluster-v1beta2-follower - redis_setup_type: cluster - role: follower -status: - accessModes: - - ReadWriteOnce - capacity: - storage: 1Gi - phase: Bound ---- -apiVersion: v1 -kind: PersistentVolumeClaim -metadata: - name: node-conf-redis-cluster-v1beta2-follower-1 - labels: - app: redis-cluster-v1beta2-follower - redis_setup_type: cluster - role: follower -status: - accessModes: - - ReadWriteOnce - capacity: - storage: 1Gi - phase: Bound ---- -apiVersion: v1 -kind: PersistentVolumeClaim -metadata: - name: node-conf-redis-cluster-v1beta2-follower-2 - labels: - app: redis-cluster-v1beta2-follower - redis_setup_type: cluster - role: follower -status: - accessModes: - - ReadWriteOnce - capacity: - storage: 1Gi - phase: Bound - ---- - -apiVersion: v1 -kind: PersistentVolumeClaim -metadata: - name: redis-cluster-v1beta2-leader-redis-cluster-v1beta2-leader-0 - labels: - app: redis-cluster-v1beta2-leader - redis_setup_type: cluster - role: leader -status: - accessModes: - - ReadWriteOnce - capacity: - storage: 1Gi - phase: Bound ---- -apiVersion: v1 -kind: PersistentVolumeClaim -metadata: - name: redis-cluster-v1beta2-leader-redis-cluster-v1beta2-leader-1 - labels: - app: redis-cluster-v1beta2-leader - redis_setup_type: cluster - role: leader -status: - accessModes: - - ReadWriteOnce - capacity: - storage: 1Gi - phase: Bound ---- -apiVersion: v1 -kind: PersistentVolumeClaim -metadata: - name: redis-cluster-v1beta2-leader-redis-cluster-v1beta2-leader-2 - labels: - app: redis-cluster-v1beta2-leader - redis_setup_type: cluster - role: leader -status: - accessModes: - - ReadWriteOnce - capacity: - storage: 1Gi - phase: Bound ---- -apiVersion: v1 -kind: PersistentVolumeClaim -metadata: - name: redis-cluster-v1beta2-follower-redis-cluster-v1beta2-follower-0 - labels: - app: redis-cluster-v1beta2-follower - redis_setup_type: cluster - role: follower -status: - accessModes: - - ReadWriteOnce - capacity: - storage: 1Gi - phase: Bound ---- -apiVersion: v1 -kind: PersistentVolumeClaim -metadata: - name: redis-cluster-v1beta2-follower-redis-cluster-v1beta2-follower-1 - labels: - app: redis-cluster-v1beta2-follower - redis_setup_type: cluster - role: follower -status: - accessModes: - - ReadWriteOnce - capacity: - storage: 1Gi - phase: Bound ---- -apiVersion: v1 -kind: PersistentVolumeClaim -metadata: - name: redis-cluster-v1beta2-follower-redis-cluster-v1beta2-follower-2 - labels: - app: redis-cluster-v1beta2-follower - redis_setup_type: cluster - role: follower -status: - accessModes: - - ReadWriteOnce - capacity: - storage: 1Gi - phase: Bound diff --git a/tests/e2e/v1beta2/ignore-annots/redis-standalone/00-install.yaml b/tests/e2e/v1beta2/ignore-annots/redis-standalone/00-install.yaml index 9ea1fc2be..7e4c131a7 100644 --- a/tests/e2e/v1beta2/ignore-annots/redis-standalone/00-install.yaml +++ b/tests/e2e/v1beta2/ignore-annots/redis-standalone/00-install.yaml @@ -3,5 +3,4 @@ kind: TestStep apply : - standalone.yaml assert : - - ready-sts.yaml - - ready-pvc.yaml \ No newline at end of file + - ready-sts.yaml \ No newline at end of file diff --git a/tests/e2e/v1beta2/ignore-annots/redis-standalone/ready-pvc.yaml b/tests/e2e/v1beta2/ignore-annots/redis-standalone/ready-pvc.yaml deleted file mode 100644 index 777fa3656..000000000 --- a/tests/e2e/v1beta2/ignore-annots/redis-standalone/ready-pvc.yaml +++ /dev/null @@ -1,14 +0,0 @@ -apiVersion: v1 -kind: PersistentVolumeClaim -metadata: - name: redis-standalone-v1beta2-redis-standalone-v1beta2-0 - labels: - app: redis-standalone-v1beta2 - redis_setup_type: standalone - role: standalone -status: - accessModes: - - ReadWriteOnce - capacity: - storage: 1Gi - phase: Bound