update tags

Signed-off-by: Shubham Gupta <[email protected]>
OT-CONTAINER-KIT · Oct 12, 2023 · dd3f8cb · dd3f8cb
1 parent f5c68da
commit dd3f8cb
Show file tree

Hide file tree

Showing 9 changed files with 34 additions and 10 deletions.
diff --git 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
diff --git 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
@@ -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/...nots/redis-cluster/ready-cluster-sts.yaml → ...gnore-annots/redis-cluster/ready-sts.yaml b/...nots/redis-cluster/ready-cluster-sts.yaml → ...gnore-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
@@ -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
@@ -4,5 +4,5 @@ apply :
   - cluster.yaml
 assert :
   - ready-cluster.yaml
-  - ready-cluster-sts.yaml
+  - ready-sts.yaml
   - ready-pvc.yaml
diff --git 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/...etup/redis-cluster/ready-cluster-sts.yaml → ...1beta2/setup/redis-cluster/ready-sts.yaml b/...etup/redis-cluster/ready-cluster-sts.yaml → ...1beta2/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
@@ -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