From e8bf273bcb8dd98b8dd025878edd8610e3424eab Mon Sep 17 00:00:00 2001
From: Chao Zhang <charles.zhangzs@gmail.com>
Date: Thu, 29 Aug 2024 14:28:39 +0200
Subject: [PATCH] fix test in and expect

---
 test/charts/mainnet.expect.yaml       | 12 ---------
 test/charts/mainnet2.expect.yaml      | 22 +++++-----------
 test/charts/mainnet2.in.yaml          |  2 ++
 test/charts/private-chain.expect.yaml | 36 ---------------------------
 4 files changed, 8 insertions(+), 64 deletions(-)

diff --git a/test/charts/mainnet.expect.yaml b/test/charts/mainnet.expect.yaml
index c048b1a..10b8cf1 100644
--- a/test/charts/mainnet.expect.yaml
+++ b/test/charts/mainnet.expect.yaml
@@ -182,23 +182,11 @@ spec:
               name: tezos-net
             - containerPort: 9932
               name: metrics
-          startupProbe:
-            httpGet:
-              path: /is_synced
-              port: 31732
-            failureThreshold: 180
-            periodSeconds: 10
           readinessProbe:
             httpGet:
               path: /is_synced
               port: 31732
             successThreshold: 1
-            periodSeconds: 10
-          livenessProbe:
-            httpGet:
-              path: /is_synced
-              port: 31732
-            failureThreshold: 30
             periodSeconds: 10                                
         - name: sidecar
           image: "ghcr.io/tacoinfra/tezos-k8s-utils:main"
diff --git a/test/charts/mainnet2.expect.yaml b/test/charts/mainnet2.expect.yaml
index 1c4be5c..1a6bea4 100644
--- a/test/charts/mainnet2.expect.yaml
+++ b/test/charts/mainnet2.expect.yaml
@@ -65,6 +65,8 @@ data:
         ]
       },
       "country-town": {
+        "bootstrapped_liveness_probe": true,
+        "bootstrapped_startup_probe": true,
         "env": {
           "all": {
             "key": "specific-pod"
@@ -253,23 +255,11 @@ spec:
               name: tezos-net
             - containerPort: 9932
               name: metrics
-          startupProbe:
-            httpGet:
-              path: /is_synced
-              port: 31732
-            failureThreshold: 180
-            periodSeconds: 10
           readinessProbe:
             httpGet:
               path: /is_synced
               port: 31732
             successThreshold: 1
-            periodSeconds: 10
-          livenessProbe:
-            httpGet:
-              path: /is_synced
-              port: 31732
-            failureThreshold: 30
             periodSeconds: 10                        
         - name: logger
           image: "ghcr.io/tacoinfra/tezos-k8s-utils:main"
@@ -642,17 +632,17 @@ spec:
               port: 31732
             failureThreshold: 180
             periodSeconds: 10
-          readinessProbe:
+          livenessProbe:
             httpGet:
               path: /is_synced
               port: 31732
-            successThreshold: 1
+            failureThreshold: 30
             periodSeconds: 10
-          livenessProbe:
+          readinessProbe:
             httpGet:
               path: /is_synced
               port: 31732
-            failureThreshold: 30
+            successThreshold: 1
             periodSeconds: 10
           resources:
             limits:
diff --git a/test/charts/mainnet2.in.yaml b/test/charts/mainnet2.in.yaml
index c73b773..a8d047c 100644
--- a/test/charts/mainnet2.in.yaml
+++ b/test/charts/mainnet2.in.yaml
@@ -29,6 +29,8 @@ nodes:
           history_mode:
             rolling:
               additional_cycles: 5
+    bootstrapped_startup_probe: true
+    bootstrapped_liveness_probe: true
   city-block:
     runs: [tezedge_node, logger, metrics]
     instances:
diff --git a/test/charts/private-chain.expect.yaml b/test/charts/private-chain.expect.yaml
index f16f4cf..6fbf763 100644
--- a/test/charts/private-chain.expect.yaml
+++ b/test/charts/private-chain.expect.yaml
@@ -574,23 +574,11 @@ spec:
               name: tezos-net
             - containerPort: 9932
               name: metrics
-          startupProbe:
-            httpGet:
-              path: /is_synced
-              port: 31732
-            failureThreshold: 180
-            periodSeconds: 10
           readinessProbe:
             httpGet:
               path: /is_synced
               port: 31732
             successThreshold: 1
-            periodSeconds: 10
-          livenessProbe:
-            httpGet:
-              path: /is_synced
-              port: 31732
-            failureThreshold: 30
             periodSeconds: 10                                
         - name: sidecar
           image: "ghcr.io/tacoinfra/tezos-k8s-utils:main"
@@ -785,23 +773,11 @@ spec:
               name: tezos-net
             - containerPort: 9932
               name: metrics
-          startupProbe:
-            httpGet:
-              path: /is_synced
-              port: 31732
-            failureThreshold: 180
-            periodSeconds: 10
           readinessProbe:
             httpGet:
               path: /is_synced
               port: 31732
             successThreshold: 1
-            periodSeconds: 10
-          livenessProbe:
-            httpGet:
-              path: /is_synced
-              port: 31732
-            failureThreshold: 30
             periodSeconds: 10                
             
         - name: baker-0-013-ptjakart
@@ -1432,23 +1408,11 @@ spec:
               name: tezos-net
             - containerPort: 9932
               name: metrics
-          startupProbe:
-            httpGet:
-              path: /is_synced
-              port: 31732
-            failureThreshold: 180
-            periodSeconds: 10
           readinessProbe:
             httpGet:
               path: /is_synced
               port: 31732
             successThreshold: 1
-            periodSeconds: 10
-          livenessProbe:
-            httpGet:
-              path: /is_synced
-              port: 31732
-            failureThreshold: 30
             periodSeconds: 10                
                             
         - name: sidecar