From dd3f8cbf680a7cbb46dd0b6fe72c00e2b32f9bdc Mon Sep 17 00:00:00 2001 From: Shubham Gupta Date: Thu, 12 Oct 2023 14:28:16 +0530 Subject: [PATCH] update tags Signed-off-by: Shubham Gupta --- .../v1beta2/ignore-annots/redis-cluster/00-install.yaml | 2 +- .../e2e/v1beta2/ignore-annots/redis-cluster/cluster.yaml | 4 ++-- .../ignore-annots/redis-cluster/ignore-annots-sts.yaml | 8 ++++++++ .../{ready-cluster-sts.yaml => ready-sts.yaml} | 8 ++++++++ .../ignore-annots/redis-standalone/standalone.yaml | 4 ++-- tests/e2e/v1beta2/setup/redis-cluster/00-install.yaml | 2 +- tests/e2e/v1beta2/setup/redis-cluster/cluster.yaml | 4 ++-- .../{ready-cluster-sts.yaml => ready-sts.yaml} | 8 ++++++++ tests/e2e/v1beta2/setup/redis-standalone/standalone.yaml | 4 ++-- 9 files changed, 34 insertions(+), 10 deletions(-) rename tests/e2e/v1beta2/ignore-annots/redis-cluster/{ready-cluster-sts.yaml => ready-sts.yaml} (73%) rename tests/e2e/v1beta2/setup/redis-cluster/{ready-cluster-sts.yaml => ready-sts.yaml} (57%) 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 2f1edf235..97d68615d 100644 --- a/tests/e2e/v1beta2/ignore-annots/redis-cluster/00-install.yaml +++ b/tests/e2e/v1beta2/ignore-annots/redis-cluster/00-install.yaml @@ -3,8 +3,8 @@ kind: TestStep apply: - cluster.yaml assert: - - ready-cluster-sts.yaml - ready-cluster.yaml + - ready-sts.yaml - ready-pvc.yaml error: - ignore-annots-sts.yaml \ No newline at end of file diff --git a/tests/e2e/v1beta2/ignore-annots/redis-cluster/cluster.yaml b/tests/e2e/v1beta2/ignore-annots/redis-cluster/cluster.yaml index c6137439e..9744e4f3a 100644 --- a/tests/e2e/v1beta2/ignore-annots/redis-cluster/cluster.yaml +++ b/tests/e2e/v1beta2/ignore-annots/redis-cluster/cluster.yaml @@ -14,8 +14,8 @@ spec: kubernetesConfig: ignoreAnnotations: - "need-ignore-key" - image: quay.io/opstree/redis:v7.0.12 - imagePullPolicy: IfNotPresent + image: quay.io/opstree/redis:latest + imagePullPolicy: Always resources: requests: cpu: 101m diff --git a/tests/e2e/v1beta2/ignore-annots/redis-cluster/ignore-annots-sts.yaml b/tests/e2e/v1beta2/ignore-annots/redis-cluster/ignore-annots-sts.yaml index 2e2ab3668..ec4d3c68a 100644 --- a/tests/e2e/v1beta2/ignore-annots/redis-cluster/ignore-annots-sts.yaml +++ b/tests/e2e/v1beta2/ignore-annots/redis-cluster/ignore-annots-sts.yaml @@ -2,6 +2,10 @@ apiVersion: apps/v1 kind: StatefulSet metadata: name: redis-cluster-v1beta2-leader + labels: + app: redis-cluster-v1beta2-leader + redis_setup_type: cluster + role: leader annotations: need-ignore-key: "need-ignore-value" spec: @@ -14,6 +18,10 @@ apiVersion: apps/v1 kind: StatefulSet metadata: name: redis-cluster-v1beta2-follower + labels: + app: redis-cluster-v1beta2-follower + redis_setup_type: cluster + role: follower annotations: need-ignore-key: "need-ignore-value" spec: diff --git a/tests/e2e/v1beta2/ignore-annots/redis-cluster/ready-cluster-sts.yaml b/tests/e2e/v1beta2/ignore-annots/redis-cluster/ready-sts.yaml similarity index 73% rename from tests/e2e/v1beta2/ignore-annots/redis-cluster/ready-cluster-sts.yaml rename to tests/e2e/v1beta2/ignore-annots/redis-cluster/ready-sts.yaml index e0cd82e78..d272d671b 100644 --- a/tests/e2e/v1beta2/ignore-annots/redis-cluster/ready-cluster-sts.yaml +++ b/tests/e2e/v1beta2/ignore-annots/redis-cluster/ready-sts.yaml @@ -2,6 +2,10 @@ apiVersion: apps/v1 kind: StatefulSet metadata: name: redis-cluster-v1beta2-leader + labels: + app: redis-cluster-v1beta2-leader + redis_setup_type: cluster + role: leader spec: template: metadata: @@ -16,6 +20,10 @@ apiVersion: apps/v1 kind: StatefulSet metadata: name: redis-cluster-v1beta2-follower + labels: + app: redis-cluster-v1beta2-follower + redis_setup_type: cluster + role: follower spec: template: metadata: diff --git a/tests/e2e/v1beta2/ignore-annots/redis-standalone/standalone.yaml b/tests/e2e/v1beta2/ignore-annots/redis-standalone/standalone.yaml index a1b759b61..6a940f706 100644 --- a/tests/e2e/v1beta2/ignore-annots/redis-standalone/standalone.yaml +++ b/tests/e2e/v1beta2/ignore-annots/redis-standalone/standalone.yaml @@ -11,8 +11,8 @@ spec: kubernetesConfig: ignoreAnnotations: - "need-ignore-key" - image: quay.io/opstree/redis:v7.0.12 - imagePullPolicy: IfNotPresent + image: quay.io/opstree/redis:latest + imagePullPolicy: Always resources: requests: cpu: 101m diff --git a/tests/e2e/v1beta2/setup/redis-cluster/00-install.yaml b/tests/e2e/v1beta2/setup/redis-cluster/00-install.yaml index 1aef14859..4f769cb53 100644 --- a/tests/e2e/v1beta2/setup/redis-cluster/00-install.yaml +++ b/tests/e2e/v1beta2/setup/redis-cluster/00-install.yaml @@ -4,5 +4,5 @@ apply : - cluster.yaml assert : - ready-cluster.yaml - - ready-cluster-sts.yaml + - ready-sts.yaml - ready-pvc.yaml \ No newline at end of file diff --git a/tests/e2e/v1beta2/setup/redis-cluster/cluster.yaml b/tests/e2e/v1beta2/setup/redis-cluster/cluster.yaml index 64814772c..ecf147104 100644 --- a/tests/e2e/v1beta2/setup/redis-cluster/cluster.yaml +++ b/tests/e2e/v1beta2/setup/redis-cluster/cluster.yaml @@ -10,8 +10,8 @@ spec: runAsUser: 1000 fsGroup: 1000 kubernetesConfig: - image: quay.io/opstree/redis:v7.0.12 - imagePullPolicy: IfNotPresent + image: quay.io/opstree/redis:latest + imagePullPolicy: Always resources: requests: cpu: 101m diff --git a/tests/e2e/v1beta2/setup/redis-cluster/ready-cluster-sts.yaml b/tests/e2e/v1beta2/setup/redis-cluster/ready-sts.yaml similarity index 57% rename from tests/e2e/v1beta2/setup/redis-cluster/ready-cluster-sts.yaml rename to tests/e2e/v1beta2/setup/redis-cluster/ready-sts.yaml index 2b6704dbe..1053eb784 100644 --- a/tests/e2e/v1beta2/setup/redis-cluster/ready-cluster-sts.yaml +++ b/tests/e2e/v1beta2/setup/redis-cluster/ready-sts.yaml @@ -2,6 +2,10 @@ apiVersion: apps/v1 kind: StatefulSet metadata: name: redis-cluster-v1beta2-leader + labels: + app: redis-cluster-v1beta2-leader + redis_setup_type: cluster + role: leader status: replicas: 3 readyReplicas: 3 @@ -12,6 +16,10 @@ apiVersion: apps/v1 kind: StatefulSet metadata: name: redis-cluster-v1beta2-follower + labels: + app: redis-cluster-v1beta2-follower + redis_setup_type: cluster + role: follower status: replicas: 3 readyReplicas: 3 diff --git a/tests/e2e/v1beta2/setup/redis-standalone/standalone.yaml b/tests/e2e/v1beta2/setup/redis-standalone/standalone.yaml index 327c9a946..c0cc6ded9 100644 --- a/tests/e2e/v1beta2/setup/redis-standalone/standalone.yaml +++ b/tests/e2e/v1beta2/setup/redis-standalone/standalone.yaml @@ -7,8 +7,8 @@ spec: runAsUser: 1000 fsGroup: 1000 kubernetesConfig: - image: quay.io/opstree/redis:v7.0.12 - imagePullPolicy: IfNotPresent + image: quay.io/opstree/redis:latest + imagePullPolicy: Always resources: requests: cpu: 101m