chore: improve configurations for bee-testnet (#447)

* chore: split bee-testnet configs

* chore: split bee-testnet-static into node-groups

Author: gacevicljubisa

config/public-testnet-static.yaml

@@ -0,0 +1,70 @@
+clusters:
+  bee-testnet-static:
+    _inherit: "default"
+    namespace: bee-testnet
+    use-static-endpoints: true
+    node-groups:
+      bee-1:
+        mode: node
+        bee-config: default
+        config: default
+        count: 5
+        endpoints:
+          - name: bee-1-0
+            api-url: http://bee-1-0.bee-testnet.testnet.internal
+          - name: bee-1-1
+            api-url: http://bee-1-1.bee-testnet.testnet.internal
+          - name: bee-1-2
+            api-url: http://bee-1-2.bee-testnet.testnet.internal
+          - name: bee-1-3
+            api-url: http://bee-1-3.bee-testnet.testnet.internal
+          - name: bee-1-4
+            api-url: http://bee-1-4.bee-testnet.testnet.internal
+      bee-2:
+        mode: node
+        bee-config: default
+        config: default
+        count: 5
+        endpoints:
+          - name: bee-2-0
+            api-url: http://bee-2-0.bee-testnet.testnet.internal
+          - name: bee-2-1
+            api-url: http://bee-2-1.bee-testnet.testnet.internal
+          - name: bee-2-2
+            api-url: http://bee-2-2.bee-testnet.testnet.internal
+          - name: bee-2-3
+            api-url: http://bee-2-3.bee-testnet.testnet.internal
+          - name: bee-2-4
+            api-url: http://bee-2-4.bee-testnet.testnet.internal
+      bee-3:
+        mode: node
+        bee-config: default
+        config: default
+        count: 5
+        endpoints:
+          - name: bee-3-0
+            api-url: http://bee-3-0.bee-testnet.testnet.internal
+          - name: bee-3-1
+            api-url: http://bee-3-1.bee-testnet.testnet.internal
+          - name: bee-3-2
+            api-url: http://bee-3-2.bee-testnet.testnet.internal
+          - name: bee-3-3
+            api-url: http://bee-3-3.bee-testnet.testnet.internal
+          - name: bee-3-4
+            api-url: http://bee-3-4.bee-testnet.testnet.internal
+      bee-4:
+        mode: node
+        bee-config: default
+        config: default
+        count: 5
+        endpoints:
+          - name: bee-4-0
+            api-url: http://bee-4-0.bee-testnet.testnet.internal
+          - name: bee-4-1
+            api-url: http://bee-4-1.bee-testnet.testnet.internal
+          - name: bee-4-2
+            api-url: http://bee-4-2.bee-testnet.testnet.internal
+          - name: bee-4-3
+            api-url: http://bee-4-3.bee-testnet.testnet.internal
+          - name: bee-4-4
+            api-url: http://bee-4-4.bee-testnet.testnet.internal

config/public-testnet.yaml

@@ -1,55 +1,52 @@
 clusters:
   bee-testnet:
-    _inherit: "default"
+    _inherit: ""
+    name: bee
     namespace: bee-testnet
-    use-static-endpoints: true
+    disable-namespace: true
+    api-domain: bee-testnet.testnet.internal
+    api-domain-internal: bee-testnet.svc.swarm1.local:1633
+    api-insecure-tls: true
+    api-scheme: http
+    funding:
+      eth: 0.1
+      gbzz: 2.0
+      bzz: 5.0
     node-groups:
-      bee:
+      bee-1:
         mode: node
-        bee-config: default
-        config: default
-        count: 20
-        endpoints:
-          - name: bee-1-0
-            api-url: http://bee-1-0.bee-testnet.testnet.internal
-          - name: bee-1-1
-            api-url: http://bee-1-1.bee-testnet.testnet.internal
-          - name: bee-1-2
-            api-url: http://bee-1-2.bee-testnet.testnet.internal
-          - name: bee-1-3
-            api-url: http://bee-1-3.bee-testnet.testnet.internal
-          - name: bee-1-4
-            api-url: http://bee-1-4.bee-testnet.testnet.internal
-          - name: bee-2-0
-            api-url: http://bee-2-0.bee-testnet.testnet.internal
-          - name: bee-2-1
-            api-url: http://bee-2-1.bee-testnet.testnet.internal
-          - name: bee-2-2
-            api-url: http://bee-2-2.bee-testnet.testnet.internal
-          - name: bee-2-3
-            api-url: http://bee-2-3.bee-testnet.testnet.internal
-          - name: bee-2-4
-            api-url: http://bee-2-4.bee-testnet.testnet.internal
-          - name: bee-3-0
-            api-url: http://bee-3-0.bee-testnet.testnet.internal
-          - name: bee-3-1
-            api-url: http://bee-3-1.bee-testnet.testnet.internal
-          - name: bee-3-2
-            api-url: http://bee-3-2.bee-testnet.testnet.internal
-          - name: bee-3-3
-            api-url: http://bee-3-3.bee-testnet.testnet.internal
-          - name: bee-3-4
-            api-url: http://bee-3-4.bee-testnet.testnet.internal
-          - name: bee-4-0
-            api-url: http://bee-4-0.bee-testnet.testnet.internal
-          - name: bee-4-1
-            api-url: http://bee-4-1.bee-testnet.testnet.internal
-          - name: bee-4-2
-            api-url: http://bee-4-2.bee-testnet.testnet.internal
-          - name: bee-4-3
-            api-url: http://bee-4-3.bee-testnet.testnet.internal
-          - name: bee-4-4
-            api-url: http://bee-4-4.bee-testnet.testnet.internal
+        bee-config: sepolia
+        config: ng-bee-testnet
+        count: 5
+      bee-2:
+        mode: node
+        bee-config: sepolia
+        config: ng-bee-testnet
+        count: 5
+      bee-3:
+        mode: node
+        bee-config: sepolia
+        config: ng-bee-testnet
+        count: 5
+      bee-4:
+        mode: node
+        bee-config: sepolia
+        config: ng-bee-testnet
+        count: 5
+
+# node-groups defines node groups that can be registered in the cluster
+# node-groups may inherit it's configuration from already defined node-group and override specific fields from it
+node-groups:
+  ng-bee-testnet:
+    _inherit: ""
+#    persistence-enabled: true
+
+# bee-configs defines Bee configuration that can be assigned to node-groups
+# bee-configs may inherit it's configuration from already defined bee-config and override specific fields from it
+bee-configs:
+  sepolia:
+    _inherit: ""
+    bootnodes: "/dnsaddr/testnet.ethswarm.org"
 
 checks:
   pt-retrieval:

config/staging.yaml

@@ -3,9 +3,11 @@
 clusters:
   staging:
     _inherit: ""
-    namespace: staging
+    namespace: bee-playground
     disable-namespace: false
-    api-domain: testnet.internal
+    use-static-endpoints: false
+    api-domain: testnet.internal # testnet.ethswarm.org
+    api-domain-internal: svc.swarm1.local:1633 # Internal API domain with port when in-cluster is set to true
     api-insecure-tls: true
     api-scheme: http
     funding:
@@ -16,7 +18,7 @@ clusters:
         mode: node
         bee-config: staging
         config: staging
-        count: 20
+        count: 5
 
 # node-groups defines node groups that can be registered in the cluster
 # node-groups may inherit it's configuration from already defined node-group and override specific fields from it
@@ -29,12 +31,19 @@ node-groups:
 # bee-configs may inherit it's configuration from already defined bee-config and override specific fields from it
 bee-configs:
   staging:
-    _inherit: "default"
-    swap-endpoint: http://rpc-sepolia-haproxy.default.svc.swarm1.local
+    _inherit: ""
+    api-addr: ":1633"
     bootnodes: /dnsaddr/testnet.ethswarm.org
+    full-node: true
+    mainnet: false
     network-id: 10
-    swap-initial-deposit: 0
-    swap-factory-address: ""
+    p2p-addr: ":1634"
+    password: "beekeeper"
+    swap-enable: true
+    swap-endpoint: http://rpc-sepolia-haproxy.default.svc.swarm1.local
+    tracing-enabled: true
+    tracing-endpoint: "10.10.11.199:6831"
+    tracing-service-name: "bee"
     verbosity: 4
     welcome-message: Welcome to the bee staging environment created by Beekeeper!
 
@@ -48,6 +57,7 @@ checks:
       uploader-count: 2
       downloader-count: 0
       max-use-batch: 1h
+      max-storage-radius: 3
       upload-groups:
         - bee-1
         - bee-2