From da41c343778739fad8467aae930beb5ed3a0c829 Mon Sep 17 00:00:00 2001
From: Cory Schwartz <cory@protocol.ai>
Date: Wed, 18 Jan 2023 11:32:28 -0800
Subject: [PATCH 1/5] use ipfs-cluster-ctl  on follwer container

---
 test-kuttl/e2e/cluster-follow/10-validate-contents.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test-kuttl/e2e/cluster-follow/10-validate-contents.sh b/test-kuttl/e2e/cluster-follow/10-validate-contents.sh
index a2603c7..a53f323 100755
--- a/test-kuttl/e2e/cluster-follow/10-validate-contents.sh
+++ b/test-kuttl/e2e/cluster-follow/10-validate-contents.sh
@@ -22,7 +22,7 @@ count_pins() {
 	declare pinTypeRecursive="recursive"
 
 	# ensure that the corresponding IPFS container has pinned content
-  pins=$(kubectl exec "${podName}" -n "${NAMESPACE}" -c "${followContainerName}" -- ipfs pin ls | grep -i "${pinTypeRecursive}")
+  pins=$(kubectl exec "${podName}" -n "${NAMESPACE}" -c "${followContainerName}" -- ipfs-cluster-ctl pin ls | grep -i "${pinTypeRecursive}")
 	readarray -d $'\n' -t pinArray <<< "${pins}"
 	echo "${#pinArray[*]}"
 }
@@ -53,4 +53,4 @@ main() {
 	done
 }
 
-main
\ No newline at end of file
+main

From 6fc1d5c8e750f7004986bac985ed193bac78491c Mon Sep 17 00:00:00 2001
From: Cory Schwartz <cory@protocol.ai>
Date: Wed, 18 Jan 2023 13:38:44 -0800
Subject: [PATCH 2/5] increase resources

---
 test-kuttl/e2e/cluster-follow/00-create-cluster.yaml | 4 ++--
 test-kuttl/kuttl-test.yaml                           | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/test-kuttl/e2e/cluster-follow/00-create-cluster.yaml b/test-kuttl/e2e/cluster-follow/00-create-cluster.yaml
index f53679e..01f24dd 100644
--- a/test-kuttl/e2e/cluster-follow/00-create-cluster.yaml
+++ b/test-kuttl/e2e/cluster-follow/00-create-cluster.yaml
@@ -13,7 +13,7 @@ spec:
   ipfsResources:
     limits:
       cpu: 250m
-      memory: 512M
+      memory: 700M
   follows:
   - name: gutenberg_es
-    template: gutenberg-es.collab.ipfscluster.io 
\ No newline at end of file
+    template: gutenberg-es.collab.ipfscluster.io 
diff --git a/test-kuttl/kuttl-test.yaml b/test-kuttl/kuttl-test.yaml
index 830c1d4..1fbce07 100644
--- a/test-kuttl/kuttl-test.yaml
+++ b/test-kuttl/kuttl-test.yaml
@@ -3,4 +3,4 @@ apiVersion: kuttl.dev/v1beta1
 kind: TestSuite
 testDirs:
   - ./e2e
-timeout: 120
+timeout: 600

From e90019db4d53b40b9d21c7152efb39f88fb0f8df Mon Sep 17 00:00:00 2001
From: Cory Schwartz <cory@protocol.ai>
Date: Wed, 18 Jan 2023 13:59:42 -0800
Subject: [PATCH 3/5] remove resource limits

---
 test-kuttl/e2e/cluster-follow/00-create-cluster.yaml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/test-kuttl/e2e/cluster-follow/00-create-cluster.yaml b/test-kuttl/e2e/cluster-follow/00-create-cluster.yaml
index 01f24dd..0177594 100644
--- a/test-kuttl/e2e/cluster-follow/00-create-cluster.yaml
+++ b/test-kuttl/e2e/cluster-follow/00-create-cluster.yaml
@@ -10,10 +10,7 @@ spec:
   replicas: 1
   networking:
     circuitRelays: 1
-  ipfsResources:
-    limits:
-      cpu: 250m
-      memory: 700M
+  ipfsResources: {}
   follows:
   - name: gutenberg_es
     template: gutenberg-es.collab.ipfscluster.io 

From fd807cdde71751fca449519775c7734b3c1c6dd7 Mon Sep 17 00:00:00 2001
From: Cory Schwartz <cory@protocol.ai>
Date: Wed, 18 Jan 2023 14:26:10 -0800
Subject: [PATCH 4/5] add collector

---
 test-kuttl/e2e/cluster-follow/00-create-cluster.yaml | 7 +++++--
 test-kuttl/kuttl-test.yaml                           | 4 ++++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/test-kuttl/e2e/cluster-follow/00-create-cluster.yaml b/test-kuttl/e2e/cluster-follow/00-create-cluster.yaml
index 0177594..f53679e 100644
--- a/test-kuttl/e2e/cluster-follow/00-create-cluster.yaml
+++ b/test-kuttl/e2e/cluster-follow/00-create-cluster.yaml
@@ -10,7 +10,10 @@ spec:
   replicas: 1
   networking:
     circuitRelays: 1
-  ipfsResources: {}
+  ipfsResources:
+    limits:
+      cpu: 250m
+      memory: 512M
   follows:
   - name: gutenberg_es
-    template: gutenberg-es.collab.ipfscluster.io 
+    template: gutenberg-es.collab.ipfscluster.io 
\ No newline at end of file
diff --git a/test-kuttl/kuttl-test.yaml b/test-kuttl/kuttl-test.yaml
index 1fbce07..5471142 100644
--- a/test-kuttl/kuttl-test.yaml
+++ b/test-kuttl/kuttl-test.yaml
@@ -4,3 +4,7 @@ kind: TestSuite
 testDirs:
   - ./e2e
 timeout: 600
+parallel: 1
+collectors:
+  type: command
+  command: kubectl -n "$NAMESPACE" describe all

From 70641c6ada1037dfb55e50e98047f66808a6f92d Mon Sep 17 00:00:00 2001
From: Cory Schwartz <cory@protocol.ai>
Date: Wed, 18 Jan 2023 15:03:53 -0800
Subject: [PATCH 5/5] add collectors

---
 test-kuttl/e2e/cluster-follow/00-create-cluster.yaml | 10 +++++-----
 test-kuttl/e2e/cluster-follow/05-assert-running.yaml |  5 +++++
 test-kuttl/e2e/ipfs/10-assert.yaml                   |  5 +++++
 test-kuttl/kuttl-test.yaml                           |  3 ---
 4 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/test-kuttl/e2e/cluster-follow/00-create-cluster.yaml b/test-kuttl/e2e/cluster-follow/00-create-cluster.yaml
index f53679e..8908e57 100644
--- a/test-kuttl/e2e/cluster-follow/00-create-cluster.yaml
+++ b/test-kuttl/e2e/cluster-follow/00-create-cluster.yaml
@@ -10,10 +10,10 @@ spec:
   replicas: 1
   networking:
     circuitRelays: 1
-  ipfsResources:
-    limits:
-      cpu: 250m
-      memory: 512M
+  # ipfsResources:
+  #   limits:
+  #     cpu: 250m
+  #     memory: 512M
   follows:
   - name: gutenberg_es
-    template: gutenberg-es.collab.ipfscluster.io 
\ No newline at end of file
+    template: gutenberg-es.collab.ipfscluster.io 
diff --git a/test-kuttl/e2e/cluster-follow/05-assert-running.yaml b/test-kuttl/e2e/cluster-follow/05-assert-running.yaml
index ce53519..5ae99dd 100644
--- a/test-kuttl/e2e/cluster-follow/05-assert-running.yaml
+++ b/test-kuttl/e2e/cluster-follow/05-assert-running.yaml
@@ -1,6 +1,11 @@
 ---
 apiVersion: kuttl.dev/v1beta1
 kind: TestAssert
+collectors:
+  - type: command
+    command: kubectl -n "$NAMESPACE" describe all,ipfscluster
+  - type: command
+    command: kubectl -n ipfs-operator-system logs deployment/ipfs-operator-controller-manager
 ---
 apiVersion: apps/v1
 kind: StatefulSet
diff --git a/test-kuttl/e2e/ipfs/10-assert.yaml b/test-kuttl/e2e/ipfs/10-assert.yaml
index aae6ae3..008028f 100644
--- a/test-kuttl/e2e/ipfs/10-assert.yaml
+++ b/test-kuttl/e2e/ipfs/10-assert.yaml
@@ -1,6 +1,11 @@
 ---
 apiVersion: kuttl.dev/v1beta1
 kind: TestAssert
+collectors:
+  - type: command
+    command: kubectl -n "$NAMESPACE" describe all,ipfscluster
+  - type: command
+    command: kubectl -n ipfs-operator-system logs deployment/ipfs-operator-controller-manager
 ---
 apiVersion: apps/v1
 kind: StatefulSet
diff --git a/test-kuttl/kuttl-test.yaml b/test-kuttl/kuttl-test.yaml
index 5471142..9863ec6 100644
--- a/test-kuttl/kuttl-test.yaml
+++ b/test-kuttl/kuttl-test.yaml
@@ -5,6 +5,3 @@ testDirs:
   - ./e2e
 timeout: 600
 parallel: 1
-collectors:
-  type: command
-  command: kubectl -n "$NAMESPACE" describe all