From 46f73b5f4b83928c8c980f607d951b7b19e879c5 Mon Sep 17 00:00:00 2001
From: drivebyer <wuyangmuc@gmail.com>
Date: Mon, 16 Sep 2024 16:51:28 +0800
Subject: [PATCH] update

---
 .../acl-user/redis-cluster/chainsaw-test.yaml | 36 +++++------
 .../v1beta2/ha-failover/chainsaw-test.yaml    |  4 +-
 .../replication-password/chainsaw-test.yaml   |  4 +-
 .../sentinel-password/chainsaw-test.yaml      |  6 +-
 .../ha-setup/unsecured/chainsaw-test.yaml     |  4 +-
 .../redis-cluster/chainsaw-test.yaml          | 36 +++++------
 .../nodeport/redis-cluster/chainsaw-test.yaml | 24 ++++----
 .../password/redis-cluster/chainsaw-test.yaml | 60 +++++++++----------
 .../redis-replication/chainsaw-test.yaml      | 20 +++----
 .../redis-standalone/chainsaw-test.yaml       |  6 +-
 .../setup/redis-cluster/chainsaw-test.yaml    | 24 ++++----
 .../redis-replication/chainsaw-test.yaml      |  8 +--
 12 files changed, 116 insertions(+), 116 deletions(-)

diff --git a/tests/e2e-chainsaw/v1beta2/acl-user/redis-cluster/chainsaw-test.yaml b/tests/e2e-chainsaw/v1beta2/acl-user/redis-cluster/chainsaw-test.yaml
index 92a6da4b8..ef4dbe3cb 100644
--- a/tests/e2e-chainsaw/v1beta2/acl-user/redis-cluster/chainsaw-test.yaml
+++ b/tests/e2e-chainsaw/v1beta2/acl-user/redis-cluster/chainsaw-test.yaml
@@ -43,37 +43,37 @@ spec:
               kubectl exec --namespace ${NAMESPACE} --container redis-cluster-v1beta2-leader redis-cluster-v1beta2-leader-0 --
               redis-cli -c -p 6379 ping
             check:
-              ($stdout=='PONG'): true
+              (contains($stdout, 'PONG')): true
         - script:
             content: >
               kubectl exec --namespace ${NAMESPACE} --container redis-cluster-v1beta2-leader redis-cluster-v1beta2-leader-1 --
               redis-cli -c -p 6379 ping
             check:
-              ($stdout=='PONG'): true
+              (contains($stdout, 'PONG')): true
         - script:
             content: >
               kubectl exec --namespace ${NAMESPACE} --container redis-cluster-v1beta2-leader redis-cluster-v1beta2-leader-2 --
               redis-cli -c -p 6379 ping
             check:
-              ($stdout=='PONG'): true
+              (contains($stdout, 'PONG')): true
         - script:
             content: >
               kubectl exec --namespace ${NAMESPACE} --container redis-cluster-v1beta2-follower redis-cluster-v1beta2-follower-0 --
               redis-cli -c -p 6379 ping
             check:
-              ($stdout=='PONG'): true
+              (contains($stdout, 'PONG')): true
         - script:
             content: >
               kubectl exec --namespace ${NAMESPACE} --container redis-cluster-v1beta2-follower redis-cluster-v1beta2-follower-1 --
               redis-cli -c -p 6379 ping
             check:
-              ($stdout=='PONG'): true
+              (contains($stdout, 'PONG')): true
         - script:
             content: >
               kubectl exec --namespace ${NAMESPACE} --container redis-cluster-v1beta2-follower redis-cluster-v1beta2-follower-2 --
               redis-cli -c -p 6379 ping
             check:
-              ($stdout=='PONG'): true
+              (contains($stdout, 'PONG')): true
     - name: Check Cluster Slots Coverage
       try:
         - script:
@@ -81,37 +81,37 @@ spec:
               kubectl exec --namespace ${NAMESPACE} --container redis-cluster-v1beta2-leader redis-cluster-v1beta2-leader-0 --
               redis-cli --cluster check 127.0.0.1:6379 | grep 'All 16384 slots covered.'
             check:
-              ($stdout=='[OK] All 16384 slots covered.'): true
+              (contains($stdout, '[OK] All 16384 slots covered')): true
         - script:
             content: >
               kubectl exec --namespace ${NAMESPACE} --container redis-cluster-v1beta2-leader redis-cluster-v1beta2-leader-1 --
               redis-cli --cluster check 127.0.0.1:6379 | grep 'All 16384 slots covered'
             check:
-              ($stdout=='[OK] All 16384 slots covered.'): true
+              (contains($stdout, '[OK] All 16384 slots covered')): true
         - script:
             content: >
               kubectl exec --namespace ${NAMESPACE} --container redis-cluster-v1beta2-leader redis-cluster-v1beta2-leader-2 --
               redis-cli --cluster check 127.0.0.1:6379 | grep 'All 16384 slots covered'
             check:
-              ($stdout=='[OK] All 16384 slots covered.'): true
+              (contains($stdout, '[OK] All 16384 slots covered')): true
         - script:
             content: >
               kubectl exec --namespace ${NAMESPACE} --container redis-cluster-v1beta2-follower redis-cluster-v1beta2-follower-0 --
               redis-cli --cluster check 127.0.0.1:6379 | grep 'All 16384 slots covered'
             check:
-              ($stdout=='[OK] All 16384 slots covered.'): true
+              (contains($stdout, '[OK] All 16384 slots covered')): true
         - script:
             content: >
               kubectl exec --namespace ${NAMESPACE} --container redis-cluster-v1beta2-follower redis-cluster-v1beta2-follower-1 --
               redis-cli --cluster check 127.0.0.1:6379 | grep 'All 16384 slots covered'
             check:
-              ($stdout=='[OK] All 16384 slots covered.'): true
+              (contains($stdout, '[OK] All 16384 slots covered')): true
         - script:
             content: >
               kubectl exec --namespace ${NAMESPACE} --container redis-cluster-v1beta2-follower redis-cluster-v1beta2-follower-2 --
               redis-cli --cluster check 127.0.0.1:6379 | grep 'All 16384 slots covered'
             check:
-              ($stdout=='[OK] All 16384 slots covered.'): true
+              (contains($stdout, '[OK] All 16384 slots covered')): true
     - name: Try saving a key With Password
       try:
         - script:
@@ -120,39 +120,39 @@ spec:
               kubectl exec --namespace ${NAMESPACE} --container redis-cluster-v1beta2-leader redis-cluster-v1beta2-leader-0 --
               redis-cli -c -p 6379 --user opstree --pass abc@123 set foo-0 bar-0
             check:
-              ($stdout=='OK'): true
+              (contains($stdout, 'OK')): true
         - script:
             timeout: 30s
             content: >
               kubectl exec --namespace ${NAMESPACE} --container redis-cluster-v1beta2-leader redis-cluster-v1beta2-leader-1 --
               redis-cli -c -p 6379 --user opstree --pass abc@123 set foo-1 bar-1
             check:
-              ($stdout=='OK'): true
+              (contains($stdout, 'OK')): true
         - script:
             timeout: 30s
             content: >
               kubectl exec --namespace ${NAMESPACE} --container redis-cluster-v1beta2-leader redis-cluster-v1beta2-leader-2 --
               redis-cli -c -p 6379 --user opstree --pass abc@123 set foo-2 bar-2
             check:
-              ($stdout=='OK'): true
+              (contains($stdout, 'OK')): true
         - script:
             timeout: 30s
             content: >
               kubectl exec --namespace ${NAMESPACE} --container redis-cluster-v1beta2-follower redis-cluster-v1beta2-follower-0 --
               redis-cli -c -p 6379 --user opstree --pass abc@123 set foo-3 bar-3
             check:
-              ($stdout=='OK'): true
+              (contains($stdout, 'OK')): true
         - script:
             timeout: 30s
             content: >
               kubectl exec --namespace ${NAMESPACE} --container redis-cluster-v1beta2-follower redis-cluster-v1beta2-follower-1 --
               redis-cli -c -p 6379 --user opstree --pass abc@123 set foo-4 bar-4
             check:
-              ($stdout=='OK'): true
+              (contains($stdout, 'OK')): true
         - script:
             timeout: 30s
             content: >
               kubectl exec --namespace ${NAMESPACE} --container redis-cluster-v1beta2-follower redis-cluster-v1beta2-follower-2 --
               redis-cli -c -p 6379 --user opstree --pass abc@123 set foo-5 bar-5
             check:
-              ($stdout=='OK'): true
+              (contains($stdout, 'OK')): true
diff --git a/tests/e2e-chainsaw/v1beta2/ha-failover/chainsaw-test.yaml b/tests/e2e-chainsaw/v1beta2/ha-failover/chainsaw-test.yaml
index 7f36a7e1c..bffd6e0ec 100644
--- a/tests/e2e-chainsaw/v1beta2/ha-failover/chainsaw-test.yaml
+++ b/tests/e2e-chainsaw/v1beta2/ha-failover/chainsaw-test.yaml
@@ -34,7 +34,7 @@ spec:
               export MASTER_IP_FROM_LABEL=$(kubectl -n ${NAMESPACE} get pod -l app=redis-replication,redis-role=master,redis_setup_type=replication -o jsonpath='{.items[0].status.podIP}');
               if [ "$MASTER_IP_FROM_SENTINEL" = "$MASTER_IP_FROM_LABEL" ]; then echo "OK"; else echo "FAIL"; fi
             check:
-              ($stdout=='OK'): true
+              (contains($stdout, 'OK')): true
       catch:
         - description: Redis Operator Logs
           podLogs:
@@ -65,7 +65,7 @@ spec:
               export MASTER_IP_FROM_LABEL=$(kubectl -n ${NAMESPACE} get pod -l app=redis-replication,redis-role=master,redis_setup_type=replication -o jsonpath='{.items[0].status.podIP}');
               if [ $MASTER_IP_FROM_SENTINEL = $MASTER_IP_FROM_LABEL ]; then echo "OK"; else echo "FAIL"; fi
             check:
-              ($stdout=='OK'): true
+              (contains($stdout, 'OK')): true
       catch:
         - description: Redis Operator Logs
           podLogs:
diff --git a/tests/e2e-chainsaw/v1beta2/ha-setup/secured/partially-secured/replication-password/chainsaw-test.yaml b/tests/e2e-chainsaw/v1beta2/ha-setup/secured/partially-secured/replication-password/chainsaw-test.yaml
index 434cb2a84..5f21e8a78 100644
--- a/tests/e2e-chainsaw/v1beta2/ha-setup/secured/partially-secured/replication-password/chainsaw-test.yaml
+++ b/tests/e2e-chainsaw/v1beta2/ha-setup/secured/partially-secured/replication-password/chainsaw-test.yaml
@@ -42,7 +42,7 @@ spec:
             content: |
               kubectl exec --namespace ${NAMESPACE} redis -- redis-cli -h redis-replication.${NAMESPACE}.svc -p 6379 -a Opstree@1234 ping
             check:
-              ($stdout=='PONG'): true
+              (contains($stdout, 'PONG')): true
     - name: Ping Sentinel Service from Cli Pod
       try:
         - script:
@@ -50,4 +50,4 @@ spec:
             content: |
               kubectl exec --namespace ${NAMESPACE} redis -- redis-cli -h redis-sentinel-sentinel.${NAMESPACE}.svc -p 26379 ping
             check:
-              ($stdout=='PONG'): true
+              (contains($stdout, 'PONG')): true
diff --git a/tests/e2e-chainsaw/v1beta2/ha-setup/secured/partially-secured/sentinel-password/chainsaw-test.yaml b/tests/e2e-chainsaw/v1beta2/ha-setup/secured/partially-secured/sentinel-password/chainsaw-test.yaml
index f9ad51130..2a1597438 100644
--- a/tests/e2e-chainsaw/v1beta2/ha-setup/secured/partially-secured/sentinel-password/chainsaw-test.yaml
+++ b/tests/e2e-chainsaw/v1beta2/ha-setup/secured/partially-secured/sentinel-password/chainsaw-test.yaml
@@ -40,7 +40,7 @@ spec:
             content: |
               kubectl exec --namespace ${NAMESPACE} redis -- redis-cli -h redis-replication.${NAMESPACE}.svc -p 6379 ping
             check:
-              ($stdout=='PONG'): true
+              (contains($stdout, 'PONG')): true
     - name: Ping Sentinel Service from Cli Pod With password
       try:
         - script:
@@ -48,7 +48,7 @@ spec:
             content: |
               kubectl exec --namespace ${NAMESPACE} redis -- redis-cli -h redis-sentinel-sentinel.${NAMESPACE}.svc -p 26379 -a Opstree@1234 ping
             check:
-              ($stdout=='PONG'): true
+              (contains($stdout, 'PONG')): true
     - name: Ping Sentinel Service from Cli Pod Without password
       try:
         - script:
@@ -56,4 +56,4 @@ spec:
             content: |
               kubectl exec --namespace ${NAMESPACE} redis -- redis-cli -h redis-sentinel-sentinel.${NAMESPACE}.svc -p 26379 ping
             check:
-              ($stdout=='NOAUTH Authentication required.'): true
+              (contains($stdout, 'NOAUTH Authentication required')): true
diff --git a/tests/e2e-chainsaw/v1beta2/ha-setup/unsecured/chainsaw-test.yaml b/tests/e2e-chainsaw/v1beta2/ha-setup/unsecured/chainsaw-test.yaml
index e0c31e0ea..558193be7 100644
--- a/tests/e2e-chainsaw/v1beta2/ha-setup/unsecured/chainsaw-test.yaml
+++ b/tests/e2e-chainsaw/v1beta2/ha-setup/unsecured/chainsaw-test.yaml
@@ -36,7 +36,7 @@ spec:
             content: |
               kubectl exec --namespace ${NAMESPACE} redis -- redis-cli -h redis-replication.${NAMESPACE}.svc -p 6379 ping
             check:
-              ($stdout=='PONG'): true
+              (contains($stdout, 'PONG')): true
     - name: Ping Sentinel Service from Cli Pod
       try:
         - script:
@@ -44,4 +44,4 @@ spec:
             content: |
               kubectl exec --namespace ${NAMESPACE} redis -- redis-cli -h redis-sentinel-sentinel.${NAMESPACE}.svc -p 26379 ping
             check:
-              ($stdout=='PONG'): true
+              (contains($stdout, 'PONG')): true
diff --git a/tests/e2e-chainsaw/v1beta2/hostnetwork/redis-cluster/chainsaw-test.yaml b/tests/e2e-chainsaw/v1beta2/hostnetwork/redis-cluster/chainsaw-test.yaml
index c3a37ab9c..6ae284a3d 100644
--- a/tests/e2e-chainsaw/v1beta2/hostnetwork/redis-cluster/chainsaw-test.yaml
+++ b/tests/e2e-chainsaw/v1beta2/hostnetwork/redis-cluster/chainsaw-test.yaml
@@ -37,37 +37,37 @@ spec:
             content: |
               kubectl get node -o wide | grep 'worker' | awk '{print $6}' | head -n 1 | tail -n 1 | xargs -I {} redis-cli -h {} -c -p 6380 ping
             check:
-              ($stdout=='PONG'): true
+              (contains($stdout, 'PONG')): true
         - script:
             timeout: 30s
             content: |
               kubectl get node -o wide | grep 'worker' | awk '{print $6}' | head -n 2 | tail -n 1 | xargs -I {} redis-cli -h {} -c -p 6380 ping
             check:
-              ($stdout=='PONG'): true
+              (contains($stdout, 'PONG')): true
         - script:
             timeout: 30s
             content: |
               kubectl get node -o wide | grep 'worker' | awk '{print $6}' | head -n 3 | tail -n 1 | xargs -I {} redis-cli -h {} -c -p 6380 ping
             check:
-              ($stdout=='PONG'): true
+              (contains($stdout, 'PONG')): true
         - script:
             timeout: 30s
             content: |
               kubectl get node -o wide | grep 'worker' | awk '{print $6}' | head -n 4 | tail -n 1 | xargs -I {} redis-cli -h {} -c -p 6380 ping
             check:
-              ($stdout=='PONG'): true
+              (contains($stdout, 'PONG')): true
         - script:
             timeout: 30s
             content: |
               kubectl get node -o wide | grep 'worker' | awk '{print $6}' | head -n 5 | tail -n 1 | xargs -I {} redis-cli -h {} -c -p 6380 ping
             check:
-              ($stdout=='PONG'): true
+              (contains($stdout, 'PONG')): true
         - script:
             timeout: 30s
             content: |
               kubectl get node -o wide | grep 'worker' | awk '{print $6}' | head -n 6 | tail -n 1 | xargs -I {} redis-cli -h {} -c -p 6380 ping
             check:
-              ($stdout=='PONG'): true
+              (contains($stdout, 'PONG')): true
     - name: Curl Exporter from every node
       try:
         - script:
@@ -76,42 +76,42 @@ spec:
               kubectl get node -o wide | grep 'worker' | awk '{print $6}' | head -n 1 | tail -n 1 |
               xargs -I {} curl -s http://{}:9122/metrics | grep -v '^#' | grep -E '\bredis_up\b' | awk '{print $2}'
             check:
-              ($stdout=='1'): true
+              (contains($stdout, '1')): true
         - script:
             timeout: 30s
             content: >
               kubectl get node -o wide | grep 'worker' | awk '{print $6}' | head -n 2 | tail -n 1 |
               xargs -I {} curl -s http://{}:9122/metrics | grep -v '^#' | grep -E '\bredis_up\b' | awk '{print $2}'
             check:
-              ($stdout=='1'): true
+              (contains($stdout, '1')): true
         - script:
             timeout: 30s
             content: >
               kubectl get node -o wide | grep 'worker' | awk '{print $6}' | head -n 3 | tail -n 1 |
               xargs -I {} curl -s http://{}:9122/metrics | grep -v '^#' | grep -E '\bredis_up\b' | awk '{print $2}'
             check:
-              ($stdout=='1'): true
+              (contains($stdout, '1')): true
         - script:
             timeout: 30s
             content: >
               kubectl get node -o wide | grep 'worker' | awk '{print $6}' | head -n 4 | tail -n 1 |
               xargs -I {} curl -s http://{}:9122/metrics | grep -v '^#' | grep -E '\bredis_up\b' | awk '{print $2}'
             check:
-              ($stdout=='1'): true
+              (contains($stdout, '1')): true
         - script:
             timeout: 30s
             content: >
               kubectl get node -o wide | grep 'worker' | awk '{print $6}' | head -n 5 | tail -n 1 |
               xargs -I {} curl -s http://{}:9122/metrics | grep -v '^#' | grep -E '\bredis_up\b' | awk '{print $2}'
             check:
-              ($stdout=='1'): true
+              (contains($stdout, '1')): true
         - script:
             timeout: 30s
             content: >
               kubectl get node -o wide | grep 'worker' | awk '{print $6}' | head -n 6 | tail -n 1 |
               xargs -I {} curl -s http://{}:9122/metrics | grep -v '^#' | grep -E '\bredis_up\b' | awk '{print $2}'
             check:
-              ($stdout=='1'): true
+              (contains($stdout, '1')): true
     - name: Try saving a key from every node
       try:
         - script:
@@ -119,34 +119,34 @@ spec:
             content: |
               kubectl get node -o wide | grep 'worker' | awk '{print $6}' | head -n 1 | tail -n 1 | xargs -I {} redis-cli -h {} -c -p 6380 set foo-0 bar-0
             check:
-              ($stdout=='OK'): true
+              (contains($stdout, 'OK')): true
         - script:
             timeout: 30s
             content: |
               kubectl get node -o wide | grep 'worker' | awk '{print $6}' | head -n 2 | tail -n 1 | xargs -I {} redis-cli -h {} -c -p 6380 set foo-1 bar-1
             check:
-              ($stdout=='OK'): true
+              (contains($stdout, 'OK')): true
         - script:
             timeout: 30s
             content: |
               kubectl get node -o wide | grep 'worker' | awk '{print $6}' | head -n 3 | tail -n 1 | xargs -I {} redis-cli -h {} -c -p 6380 set foo-2 bar-2
             check:
-              ($stdout=='OK'): true
+              (contains($stdout, 'OK')): true
         - script:
             timeout: 30s
             content: |
               kubectl get node -o wide | grep 'worker' | awk '{print $6}' | head -n 4 | tail -n 1 | xargs -I {} redis-cli -h {} -c -p 6380 set foo-3 bar-3
             check:
-              ($stdout=='OK'): true
+              (contains($stdout, 'OK')): true
         - script:
             timeout: 30s
             content: |
               kubectl get node -o wide | grep 'worker' | awk '{print $6}' | head -n 5 | tail -n 1 | xargs -I {} redis-cli -h {} -c -p 6380 set foo-4 bar-4
             check:
-              ($stdout=='OK'): true
+              (contains($stdout, 'OK')): true
         - script:
             timeout: 30s
             content: |
               kubectl get node -o wide | grep 'worker' | awk '{print $6}' | head -n 6 | tail -n 1 | xargs -I {} redis-cli -h {} -c -p 6380 set foo-5 bar-5
             check:
-              ($stdout=='OK'): true
+              (contains($stdout, 'OK')): true
diff --git a/tests/e2e-chainsaw/v1beta2/nodeport/redis-cluster/chainsaw-test.yaml b/tests/e2e-chainsaw/v1beta2/nodeport/redis-cluster/chainsaw-test.yaml
index 51161bc06..b97fd5d4b 100644
--- a/tests/e2e-chainsaw/v1beta2/nodeport/redis-cluster/chainsaw-test.yaml
+++ b/tests/e2e-chainsaw/v1beta2/nodeport/redis-cluster/chainsaw-test.yaml
@@ -28,32 +28,32 @@ spec:
             content: |
               kubectl exec --namespace ${NAMESPACE} --container redis-cluster-v1beta2-leader redis-cluster-v1beta2-leader-0 -- redis-cli -c -p 6379 ping
             check:
-              ($stdout=='PONG'): true
+              (contains($stdout, 'PONG')): true
         - script:
             content: |
               kubectl exec --namespace ${NAMESPACE} --container redis-cluster-v1beta2-leader redis-cluster-v1beta2-leader-1 -- redis-cli -c -p 6379 ping
             check:
-              ($stdout=='PONG'): true
+              (contains($stdout, 'PONG')): true
         - script:
             content: |
               kubectl exec --namespace ${NAMESPACE} --container redis-cluster-v1beta2-leader redis-cluster-v1beta2-leader-2 -- redis-cli -c -p 6379 ping
             check:
-              ($stdout=='PONG'): true
+              (contains($stdout, 'PONG')): true
         - script:
             content: |
               kubectl exec --namespace ${NAMESPACE} --container redis-cluster-v1beta2-follower redis-cluster-v1beta2-follower-0 -- redis-cli -c -p 6379 ping
             check:
-              ($stdout=='PONG'): true
+              (contains($stdout, 'PONG')): true
         - script:
             content: |
               kubectl exec --namespace ${NAMESPACE} --container redis-cluster-v1beta2-follower redis-cluster-v1beta2-follower-1 -- redis-cli -c -p 6379 ping
             check:
-              ($stdout=='PONG'): true
+              (contains($stdout, 'PONG')): true
         - script:
             content: |
               kubectl exec --namespace ${NAMESPACE} --container redis-cluster-v1beta2-follower redis-cluster-v1beta2-follower-2 -- redis-cli -c -p 6379 ping
             check:
-              ($stdout=='PONG'): true
+              (contains($stdout, 'PONG')): true
     - name: Check Cluster
       try:
         - script:
@@ -93,34 +93,34 @@ spec:
             content: |
               kubectl exec --namespace ${NAMESPACE} --container redis-cluster-v1beta2-leader redis-cluster-v1beta2-leader-0 -- redis-cli -c -p 6379 set foo-0 bar-0
             check:
-              ($stdout=='OK'): true
+              (contains($stdout, 'OK')): true
         - script:
             timeout: 30s
             content: |
               kubectl exec --namespace ${NAMESPACE} --container redis-cluster-v1beta2-leader redis-cluster-v1beta2-leader-1 -- redis-cli -c -p 6379 set foo-1 bar-1
             check:
-              ($stdout=='OK'): true
+              (contains($stdout, 'OK')): true
         - script:
             timeout: 30s
             content: |
               kubectl exec --namespace ${NAMESPACE} --container redis-cluster-v1beta2-leader redis-cluster-v1beta2-leader-2 -- redis-cli -c -p 6379 set foo-2 bar-2
             check:
-              ($stdout=='OK'): true
+              (contains($stdout, 'OK')): true
         - script:
             timeout: 30s
             content: |
               kubectl exec --namespace ${NAMESPACE} --container redis-cluster-v1beta2-follower redis-cluster-v1beta2-follower-0 -- redis-cli -c -p 6379 set foo-3 bar-3
             check:
-              ($stdout=='OK'): true
+              (contains($stdout, 'OK')): true
         - script:
             timeout: 30s
             content: |
               kubectl exec --namespace ${NAMESPACE} --container redis-cluster-v1beta2-follower redis-cluster-v1beta2-follower-1 -- redis-cli -c -p 6379 set foo-4 bar-4
             check:
-              ($stdout=='OK'): true
+              (contains($stdout, 'OK')): true
         - script:
             timeout: 30s
             content: |
               kubectl exec --namespace ${NAMESPACE} --container redis-cluster-v1beta2-follower redis-cluster-v1beta2-follower-2 -- redis-cli -c -p 6379 set foo-5 bar-5
             check:
-              ($stdout=='OK'): true
+              (contains($stdout, 'OK')): true
diff --git a/tests/e2e-chainsaw/v1beta2/password/redis-cluster/chainsaw-test.yaml b/tests/e2e-chainsaw/v1beta2/password/redis-cluster/chainsaw-test.yaml
index b7974b9db..a48469d79 100644
--- a/tests/e2e-chainsaw/v1beta2/password/redis-cluster/chainsaw-test.yaml
+++ b/tests/e2e-chainsaw/v1beta2/password/redis-cluster/chainsaw-test.yaml
@@ -33,42 +33,42 @@ spec:
               kubectl exec --namespace ${NAMESPACE} --container redis-cluster-v1beta2-leader redis-cluster-v1beta2-leader-0 --
               redis-cli -c -p 6379 -a Opstree1234 ping
             check:
-              ($stdout=='PONG'): true
+              (contains($stdout, 'PONG')): true
         - script:
             timeout: 10s
             content: >
               kubectl exec --namespace ${NAMESPACE} --container redis-cluster-v1beta2-leader redis-cluster-v1beta2-leader-1 --
               redis-cli -c -p 6379 -a Opstree1234 ping
             check:
-              ($stdout=='PONG'): true
+              (contains($stdout, 'PONG')): true
         - script:
             timeout: 10s
             content: >
               kubectl exec --namespace ${NAMESPACE} --container redis-cluster-v1beta2-leader redis-cluster-v1beta2-leader-2 --
               redis-cli -c -p 6379 -a Opstree1234 ping
             check:
-              ($stdout=='PONG'): true
+              (contains($stdout, 'PONG')): true
         - script:
             timeout: 10s
             content: >
               kubectl exec --namespace ${NAMESPACE} --container redis-cluster-v1beta2-follower redis-cluster-v1beta2-follower-0 --
               redis-cli -c -p 6379 -a Opstree1234 ping
             check:
-              ($stdout=='PONG'): true
+              (contains($stdout, 'PONG')): true
         - script:
             timeout: 10s
             content: >
               kubectl exec --namespace ${NAMESPACE} --container redis-cluster-v1beta2-follower redis-cluster-v1beta2-follower-1 --
               redis-cli -c -p 6379 -a Opstree1234 ping
             check:
-              ($stdout=='PONG'): true
+              (contains($stdout, 'PONG')): true
         - script:
             timeout: 10s
             content: >
               kubectl exec --namespace ${NAMESPACE} --container redis-cluster-v1beta2-follower redis-cluster-v1beta2-follower-2 --
               redis-cli -c -p 6379 -a Opstree1234 ping
             check:
-              ($stdout=='PONG'): true
+              (contains($stdout, 'PONG')): true
     - name: Try saving a key With Password
       try:
         - script:
@@ -77,42 +77,42 @@ spec:
               kubectl exec --namespace ${NAMESPACE} --container redis-cluster-v1beta2-leader redis-cluster-v1beta2-leader-0 --
               redis-cli -c -p 6379 -a Opstree1234 set foo-0 bar-0
             check:
-              ($stdout=='OK'): true
+              (contains($stdout, 'OK')): true
         - script:
             timeout: 10s
             content: >
               kubectl exec --namespace ${NAMESPACE} --container redis-cluster-v1beta2-leader redis-cluster-v1beta2-leader-1 --
               redis-cli -c -p 6379 -a Opstree1234 set foo-1 bar-1
             check:
-              ($stdout=='OK'): true
+              (contains($stdout, 'OK')): true
         - script:
             timeout: 10s
             content: >
               kubectl exec --namespace ${NAMESPACE} --container redis-cluster-v1beta2-leader redis-cluster-v1beta2-leader-2 --
               redis-cli -c -p 6379 -a Opstree1234 set foo-2 bar-2
             check:
-              ($stdout=='OK'): true
+              (contains($stdout, 'OK')): true
         - script:
             timeout: 10s
             content: >
               kubectl exec --namespace ${NAMESPACE} --container redis-cluster-v1beta2-follower redis-cluster-v1beta2-follower-0 --
               redis-cli -c -p 6379 -a Opstree1234 set foo-3 bar-3
             check:
-              ($stdout=='OK'): true
+              (contains($stdout, 'OK')): true
         - script:
             timeout: 10s
             content: >
               kubectl exec --namespace ${NAMESPACE} --container redis-cluster-v1beta2-follower redis-cluster-v1beta2-follower-1 --
               redis-cli -c -p 6379 -a Opstree1234 set foo-4 bar-4
             check:
-              ($stdout=='OK'): true
+              (contains($stdout, 'OK')): true
         - script:
             timeout: 10s
             content: >
               kubectl exec --namespace ${NAMESPACE} --container redis-cluster-v1beta2-follower redis-cluster-v1beta2-follower-2 --
               redis-cli -c -p 6379 -a Opstree1234 set foo-5 bar-5
             check:
-              ($stdout=='OK'): true
+              (contains($stdout, 'OK')): true
     - name: Ping Cluster Without Password
       try:
         - script:
@@ -121,42 +121,42 @@ spec:
               kubectl exec --namespace ${NAMESPACE} --container redis-cluster-v1beta2-leader redis-cluster-v1beta2-leader-0 --
               redis-cli -c -p 6379 ping
             check:
-              ($stdout=='NOAUTH Authentication required.'): true
+              (contains($stdout, 'NOAUTH Authentication required')): true
         - script:
             timeout: 10s
             content: >
               kubectl exec --namespace ${NAMESPACE} --container redis-cluster-v1beta2-leader redis-cluster-v1beta2-leader-1 --
               redis-cli -c -p 6379 ping
             check:
-              ($stdout=='NOAUTH Authentication required.'): true
+              (contains($stdout, 'NOAUTH Authentication required')): true
         - script:
             timeout: 10s
             content: >
               kubectl exec --namespace ${NAMESPACE} --container redis-cluster-v1beta2-leader redis-cluster-v1beta2-leader-2 --
               redis-cli -c -p 6379 ping
             check:
-              ($stdout=='NOAUTH Authentication required.'): true
+              (contains($stdout, 'NOAUTH Authentication required')): true
         - script:
             timeout: 10s
             content: >
               kubectl exec --namespace ${NAMESPACE} --container redis-cluster-v1beta2-follower redis-cluster-v1beta2-follower-0 --
               redis-cli -c -p 6379 ping
             check:
-              ($stdout=='NOAUTH Authentication required.'): true
+              (contains($stdout, 'NOAUTH Authentication required')): true
         - script:
             timeout: 10s
             content: >
               kubectl exec --namespace ${NAMESPACE} --container redis-cluster-v1beta2-follower redis-cluster-v1beta2-follower-1 --
               redis-cli -c -p 6379 ping
             check:
-              ($stdout=='NOAUTH Authentication required.'): true
+              (contains($stdout, 'NOAUTH Authentication required')): true
         - script:
             timeout: 10s
             content: >
               kubectl exec --namespace ${NAMESPACE} --container redis-cluster-v1beta2-follower redis-cluster-v1beta2-follower-2 --
               redis-cli -c -p 6379 ping
             check:
-              ($stdout=='NOAUTH Authentication required.'): true
+              (contains($stdout, 'NOAUTH Authentication required')): true
     - name: Try saving a key Without Password
       try:
         - script:
@@ -165,42 +165,42 @@ spec:
               kubectl exec --namespace ${NAMESPACE} --container redis-cluster-v1beta2-leader redis-cluster-v1beta2-leader-0 --
               redis-cli -c -p 6379 set foo-0 bar-0
             check:
-              ($stdout=='NOAUTH Authentication required.'): true
+              (contains($stdout, 'NOAUTH Authentication required')): true
         - script:
             timeout: 10s
             content: >
               kubectl exec --namespace ${NAMESPACE} --container redis-cluster-v1beta2-leader redis-cluster-v1beta2-leader-1 --
               redis-cli -c -p 6379 set foo-1 bar-1
             check:
-              ($stdout=='NOAUTH Authentication required.'): true
+              (contains($stdout, 'NOAUTH Authentication required')): true
         - script:
             timeout: 10s
             content: >
               kubectl exec --namespace ${NAMESPACE} --container redis-cluster-v1beta2-leader redis-cluster-v1beta2-leader-2 --
               redis-cli -c -p 6379 set foo-2 bar-2
             check:
-              ($stdout=='NOAUTH Authentication required.'): true
+              (contains($stdout, 'NOAUTH Authentication required')): true
         - script:
             timeout: 10s
             content: >
               kubectl exec --namespace ${NAMESPACE} --container redis-cluster-v1beta2-follower redis-cluster-v1beta2-follower-0 --
               redis-cli -c -p 6379 set foo-3 bar-3
             check:
-              ($stdout=='NOAUTH Authentication required.'): true
+              (contains($stdout, 'NOAUTH Authentication required')): true
         - script:
             timeout: 10s
             content: >
               kubectl exec --namespace ${NAMESPACE} --container redis-cluster-v1beta2-follower redis-cluster-v1beta2-follower-1 --
               redis-cli -c -p 6379 set foo-4 bar-4
             check:
-              ($stdout=='NOAUTH Authentication required.'): true
+              (contains($stdout, 'NOAUTH Authentication required')): true
         - script:
             timeout: 10s
             content: >
               kubectl exec --namespace ${NAMESPACE} --container redis-cluster-v1beta2-follower redis-cluster-v1beta2-follower-2 --
               redis-cli -c -p 6379 set foo-5 bar-5
             check:
-              ($stdout=='NOAUTH Authentication required.'): true
+              (contains($stdout, 'NOAUTH Authentication required')): true
     - name: Test Redis Exporter
       try:
         - script:
@@ -209,39 +209,39 @@ spec:
               kubectl exec --namespace ${NAMESPACE} --container redis-cluster-v1beta2-leader redis-cluster-v1beta2-leader-0 --
               wget -qO- http://localhost:9121/metrics | grep -v '^#' | grep -E '\bredis_up\b' | awk '{print $2}'
             check:
-              ($stdout=='1'): true
+              (contains($stdout, '1')): true
         - script:
             timeout: 30s
             content: >
               kubectl exec --namespace ${NAMESPACE} --container redis-cluster-v1beta2-leader redis-cluster-v1beta2-leader-1 --
               wget -qO- http://localhost:9121/metrics | grep -v '^#' | grep -E '\bredis_up\b' | awk '{print $2}'
             check:
-              ($stdout=='1'): true
+              (contains($stdout, '1')): true
         - script:
             timeout: 30s
             content: >
               kubectl exec --namespace ${NAMESPACE} --container redis-cluster-v1beta2-leader redis-cluster-v1beta2-leader-2 --
               wget -qO- http://localhost:9121/metrics | grep -v '^#' | grep -E '\bredis_up\b' | awk '{print $2}'
             check:
-              ($stdout=='1'): true
+              (contains($stdout, '1')): true
         - script:
             timeout: 30s
             content: >
               kubectl exec --namespace ${NAMESPACE} --container redis-cluster-v1beta2-follower redis-cluster-v1beta2-follower-0 --
               wget -qO- http://localhost:9121/metrics | grep -v '^#' | grep -E '\bredis_up\b' | awk '{print $2}'
             check:
-              ($stdout=='1'): true
+              (contains($stdout, '1')): true
         - script:
             timeout: 30s
             content: >
               kubectl exec --namespace ${NAMESPACE} --container redis-cluster-v1beta2-follower redis-cluster-v1beta2-follower-1 --
               wget -qO- http://localhost:9121/metrics | grep -v '^#' | grep -E '\bredis_up\b' | awk '{print $2}'
             check:
-              ($stdout=='1'): true
+              (contains($stdout, '1')): true
         - script:
             timeout: 30s
             content: >
               kubectl exec --namespace ${NAMESPACE} --container redis-cluster-v1beta2-follower redis-cluster-v1beta2-follower-2 --
               wget -qO- http://localhost:9121/metrics | grep -v '^#' | grep -E '\bredis_up\b' | awk '{print $2}'
             check:
-              ($stdout=='1'): true
+              (contains($stdout, '1')): true
diff --git a/tests/e2e-chainsaw/v1beta2/password/redis-replication/chainsaw-test.yaml b/tests/e2e-chainsaw/v1beta2/password/redis-replication/chainsaw-test.yaml
index 5bdd5f8ae..187d40bf6 100644
--- a/tests/e2e-chainsaw/v1beta2/password/redis-replication/chainsaw-test.yaml
+++ b/tests/e2e-chainsaw/v1beta2/password/redis-replication/chainsaw-test.yaml
@@ -30,19 +30,19 @@ spec:
             content: |
               kubectl exec --namespace ${NAMESPACE} redis-replication-0 -- redis-cli -p 6379 -a Opstree1234 ping
             check:
-              ($stdout=='PONG'): true
+              (contains($stdout, 'PONG')): true
         - script:
             timeout: 10s
             content: |
               kubectl exec --namespace ${NAMESPACE} redis-replication-1 -- redis-cli -p 6379 -a Opstree1234 ping
             check:
-              ($stdout=='PONG'): true
+              (contains($stdout, 'PONG')): true
         - script:
             timeout: 10s
             content: |
               kubectl exec --namespace ${NAMESPACE} redis-replication-2 -- redis-cli -p 6379 -a Opstree1234 ping
             check:
-              ($stdout=='PONG'): true
+              (contains($stdout, 'PONG')): true
     - name: Try saving a key With Password
       try:
         - script:
@@ -50,7 +50,7 @@ spec:
             content: |
               kubectl exec --namespace ${NAMESPACE} redis-replication-0 -- redis-cli -p 6379 -a Opstree1234 set foo-0 bar-0
             check:
-              ($stdout=='OK'): true
+              (contains($stdout, 'OK')): true
     #  - script:
     #      timeout: 10s
     #      content: |
@@ -70,19 +70,19 @@ spec:
             content: |
               kubectl exec --namespace ${NAMESPACE} redis-replication-0 -- redis-cli -p 6379 ping
             check:
-              ($stdout=='NOAUTH Authentication required.'): true
+              (contains($stdout, 'NOAUTH Authentication required')): true
         - script:
             timeout: 10s
             content: |
               kubectl exec --namespace ${NAMESPACE} redis-replication-1 -- redis-cli -p 6379 ping
             check:
-              ($stdout=='NOAUTH Authentication required.'): true
+              (contains($stdout, 'NOAUTH Authentication required')): true
         - script:
             timeout: 10s
             content: |
               kubectl exec --namespace ${NAMESPACE} redis-replication-2 -- redis-cli -p 6379 ping
             check:
-              ($stdout=='NOAUTH Authentication required.'): true
+              (contains($stdout, 'NOAUTH Authentication required')): true
     - name: Try saving a key Without Password
       try:
         - script:
@@ -90,16 +90,16 @@ spec:
             content: |
               kubectl exec --namespace ${NAMESPACE} redis-replication-0 -- redis-cli -p 6379 set foo-0 bar-0
             check:
-              ($stdout=='NOAUTH Authentication required.'): true
+              (contains($stdout, 'NOAUTH Authentication required')): true
         - script:
             timeout: 10s
             content: |
               kubectl exec --namespace ${NAMESPACE} redis-replication-1 -- redis-cli -p 6379 set foo-1 bar-1
             check:
-              ($stdout=='NOAUTH Authentication required.'): true
+              (contains($stdout, 'NOAUTH Authentication required')): true
         - script:
             timeout: 10s
             content: |
               kubectl exec --namespace ${NAMESPACE} redis-replication-2 -- redis-cli -p 6379 set foo-2 bar-2
             check:
-              ($stdout=='NOAUTH Authentication required.'): true
+              (contains($stdout, 'NOAUTH Authentication required')): true
diff --git a/tests/e2e-chainsaw/v1beta2/password/redis-standalone/chainsaw-test.yaml b/tests/e2e-chainsaw/v1beta2/password/redis-standalone/chainsaw-test.yaml
index 4f378bc59..378162b44 100644
--- a/tests/e2e-chainsaw/v1beta2/password/redis-standalone/chainsaw-test.yaml
+++ b/tests/e2e-chainsaw/v1beta2/password/redis-standalone/chainsaw-test.yaml
@@ -30,7 +30,7 @@ spec:
             content: |
               kubectl exec --namespace ${NAMESPACE} redis-standalone-v1beta2-0 -c redis-standalone-v1beta2 -- redis-cli -p 6379 -a Opstree1234 set foo-0 bar-0
             check:
-              ($stdout=='OK'): true
+              (contains($stdout, 'OK')): true
     - name: Try saving a key Without Password
       try:
         - script:
@@ -38,7 +38,7 @@ spec:
             content: |
               kubectl exec --namespace ${NAMESPACE} redis-standalone-v1beta2-0 -c redis-standalone-v1beta2 -- redis-cli -p 6379 set foo-0 bar-0
             check:
-              ($stdout=='NOAUTH Authentication required.'): true
+              (contains($stdout, 'NOAUTH Authentication required')): true
     - name: Test Redis Exporter
       try:
         - script:
@@ -47,4 +47,4 @@ spec:
               kubectl exec --namespace ${NAMESPACE} redis-standalone-v1beta2-0 -c redis-standalone-v1beta2 --
               wget -qO- http://localhost:9121/metrics | grep -v '^#' | grep -E '\bredis_up\b' | awk '{print $2}'
             check:
-              ($stdout=='1'): true
+              (contains($stdout, '1')): true
diff --git a/tests/e2e-chainsaw/v1beta2/setup/redis-cluster/chainsaw-test.yaml b/tests/e2e-chainsaw/v1beta2/setup/redis-cluster/chainsaw-test.yaml
index f3523e67d..86884a74e 100644
--- a/tests/e2e-chainsaw/v1beta2/setup/redis-cluster/chainsaw-test.yaml
+++ b/tests/e2e-chainsaw/v1beta2/setup/redis-cluster/chainsaw-test.yaml
@@ -36,37 +36,37 @@ spec:
               kubectl exec --namespace ${NAMESPACE} --container redis-cluster-v1beta2-leader redis-cluster-v1beta2-leader-0 --
               redis-cli -c -p 6379 ping
             check:
-              ($stdout=='PONG'): true
+              (contains($stdout, 'PONG')): true
         - script:
             content: >
               kubectl exec --namespace ${NAMESPACE} --container redis-cluster-v1beta2-leader redis-cluster-v1beta2-leader-1 --
               redis-cli -c -p 6379 ping
             check:
-              ($stdout=='PONG'): true
+              (contains($stdout, 'PONG')): true
         - script:
             content: >
               kubectl exec --namespace ${NAMESPACE} --container redis-cluster-v1beta2-leader redis-cluster-v1beta2-leader-2 --
               redis-cli -c -p 6379 ping
             check:
-              ($stdout=='PONG'): true
+              (contains($stdout, 'PONG')): true
         - script:
             content: >
               kubectl exec --namespace ${NAMESPACE} --container redis-cluster-v1beta2-follower redis-cluster-v1beta2-follower-0 --
               redis-cli -c -p 6379 ping
             check:
-              ($stdout=='PONG'): true
+              (contains($stdout, 'PONG')): true
         - script:
             content: >
               kubectl exec --namespace ${NAMESPACE} --container redis-cluster-v1beta2-follower redis-cluster-v1beta2-follower-1 --
               redis-cli -c -p 6379 ping
             check:
-              ($stdout=='PONG'): true
+              (contains($stdout, 'PONG')): true
         - script:
             content: >
               kubectl exec --namespace ${NAMESPACE} --container redis-cluster-v1beta2-follower redis-cluster-v1beta2-follower-2 --
               redis-cli -c -p 6379 ping
             check:
-              ($stdout=='PONG'): true
+              (contains($stdout, 'PONG')): true
     - name: Try saving a key With Password
       try:
         - script:
@@ -75,39 +75,39 @@ spec:
               kubectl exec --namespace ${NAMESPACE} --container redis-cluster-v1beta2-leader redis-cluster-v1beta2-leader-0 --
               redis-cli -c -p 6379 set foo-0 bar-0
             check:
-              ($stdout=='OK'): true
+              (contains($stdout, 'OK')): true
         - script:
             timeout: 30s
             content: >
               kubectl exec --namespace ${NAMESPACE} --container redis-cluster-v1beta2-leader redis-cluster-v1beta2-leader-1 --
               redis-cli -c -p 6379 set foo-1 bar-1
             check:
-              ($stdout=='OK'): true
+              (contains($stdout, 'OK')): true
         - script:
             timeout: 30s
             content: >
               kubectl exec --namespace ${NAMESPACE} --container redis-cluster-v1beta2-leader redis-cluster-v1beta2-leader-2 --
               redis-cli -c -p 6379 set foo-2 bar-2
             check:
-              ($stdout=='OK'): true
+              (contains($stdout, 'OK')): true
         - script:
             timeout: 30s
             content: >
               kubectl exec --namespace ${NAMESPACE} --container redis-cluster-v1beta2-follower redis-cluster-v1beta2-follower-0 --
               redis-cli -c -p 6379 set foo-3 bar-3
             check:
-              ($stdout=='OK'): true
+              (contains($stdout, 'OK')): true
         - script:
             timeout: 30s
             content: >
               kubectl exec --namespace ${NAMESPACE} --container redis-cluster-v1beta2-follower redis-cluster-v1beta2-follower-1 --
               redis-cli -c -p 6379 set foo-4 bar-4
             check:
-              ($stdout=='OK'): true
+              (contains($stdout, 'OK')): true
         - script:
             timeout: 30s
             content: >
               kubectl exec --namespace ${NAMESPACE} --container redis-cluster-v1beta2-follower redis-cluster-v1beta2-follower-2 --
               redis-cli -c -p 6379 set foo-5 bar-5
             check:
-              ($stdout=='OK'): true
+              (contains($stdout, 'OK')): true
diff --git a/tests/e2e-chainsaw/v1beta2/setup/redis-replication/chainsaw-test.yaml b/tests/e2e-chainsaw/v1beta2/setup/redis-replication/chainsaw-test.yaml
index c74eed234..0d556803a 100644
--- a/tests/e2e-chainsaw/v1beta2/setup/redis-replication/chainsaw-test.yaml
+++ b/tests/e2e-chainsaw/v1beta2/setup/redis-replication/chainsaw-test.yaml
@@ -29,19 +29,19 @@ spec:
             content: |
               kubectl exec --namespace ${NAMESPACE} redis-replication-0 -- redis-cli -p 6379 ping
             check:
-              ($stdout=='PONG'): true
+              (contains($stdout, 'PONG')): true
         - script:
             timeout: 10s
             content: |
               kubectl exec --namespace ${NAMESPACE} redis-replication-1 -- redis-cli -p 6379 ping
             check:
-              ($stdout=='PONG'): true
+              (contains($stdout, 'PONG')): true
         - script:
             timeout: 10s
             content: |
               kubectl exec --namespace ${NAMESPACE} redis-replication-2 -- redis-cli -p 6379 ping
             check:
-              ($stdout=='PONG'): true
+              (contains($stdout, 'PONG')): true
     - name: Try saving a key
       try:
         - script:
@@ -49,7 +49,7 @@ spec:
             content: |
               kubectl exec --namespace ${NAMESPACE} redis-replication-0 -- redis-cli -p 6379 set foo-0 bar-0
             check:
-              ($stdout=='OK'): true
+              (contains($stdout, 'OK')): true
     #  - script:
     #      timeout: 10s
     #      content: |