chore: update config

ethersphere · Oct 24, 2024 · 706a3fc · 706a3fc
1 parent f9f61d0
commit 706a3fc
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 37 deletions.
diff --git a/config/beekeeper-local.yaml b/config/beekeeper-local.yaml
@@ -1,14 +1,18 @@
+#config-dir: $HOME/.beekeeper
+#config-git-repo: ""
+#config-git-branch: main
+#config-git-username: <GitHub username>
+#config-git-password: <GitHub Personal Access Token>
 enable-k8s: true
 in-cluster: false
-geth-url: http://geth-swap.localhost #http://geth-swap.bee-playground.testnet.ethswarm.org
-bzz-token-address: 0x6aab14fe9cccd64a502d23842d916eb5321c26e7
+kubeconfig: "~/.kube/config"
+geth-url: http://geth-swap.localhost #http://geth-swap.bee-playground.testnet.internal
+bzz-token-address: 0x6aab14fe9cccd64a502d23842d916eb5321c26e7 #0x543dDb01Ba47acB11de34891cD86B675F04840db Sepolia
 eth-account: 0x62cab2b3b55f341f10348720ca18063cdb779ad5
 wallet-key: 4663c222787e30c1994b59044aa5045377a6e79193a8ead88293926b535c722d
-kubeconfig: "~/.kube/config"
-# config-dir: ""
 log-verbosity: "info"
 tracing-enable: false
-tracing-endpoint: tempo-tempo-distributed-distributor.observability:6831
+tracing-endpoint: 10.10.11.199:6831
 # tracing-host: 127.0.0.1
 # tracing-port: 6831
 tracing-service-name: beekeeper

diff --git a/config/config.yaml b/config/config.yaml
@@ -7,7 +7,7 @@ clusters:
     namespace: bee-playground
     disable-namespace: false
     use-static-endpoints: false
-    api-domain: testnet.ethswarm.org
+    api-domain: testnet.internal # testnet.ethswarm.org
     api-insecure-tls: true
     api-scheme: http
     admin-password: test
@@ -19,7 +19,7 @@ clusters:
         mode: bootnode
         endpoints:
           - name: bootnode-0
-            api-url: http://bootnode-0.bee-playground.testnet.ethswarm.org
+            api-url: http://bootnode-0.bee-playground.testnet.internal
         bee-config: bootnode
         config: default
         nodes:
@@ -34,32 +34,29 @@ clusters:
         count: 3
         endpoints:
           - name: bee-0
-            api-url: http://bee-0.bee-playground.testnet.ethswarm.org
+            api-url: http://bee-0.bee-playground.testnet.internal
           - name: bee-1
-            api-url: http://bee-1.bee-playground.testnet.ethswarm.org
+            api-url: http://bee-1.bee-playground.testnet.internal
           - name: bee-2
-            api-url: http://bee-2.bee-playground.testnet.ethswarm.org
+            api-url: http://bee-2.bee-playground.testnet.internal
       light:
         mode: node
         bee-config: light-node
         config: light-node
-        count: 3
+        count: 2
         endpoints:
           - name: light-0
-            api-url: http://light-0.bee-playground.testnet.ethswarm.org
+            api-url: http://light-0.bee-playground.testnet.internal
           - name: light-1
-            api-url: http://light-1.bee-playground.testnet.ethswarm.org
-          - name: light-2
-            api-url: http://light-2.bee-playground.testnet.ethswarm.org
+            api-url: http://light-1.bee-playground.testnet.internal
 
 # 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:
   default:
     _inherit: ""
-    image: ethersphere/bee:latest
+    image: ethersphere/bee:2.2.0
     image-pull-policy: Always
-    # image-pull-secrets: [regcred]
     ingress-annotations:
       nginx.ingress.kubernetes.io/affinity: "cookie"
       nginx.ingress.kubernetes.io/affinity-mode: "persistent"
@@ -70,16 +67,14 @@ node-groups:
       nginx.ingress.kubernetes.io/session-cookie-name: "SWARMGATEWAY"
       nginx.ingress.kubernetes.io/session-cookie-path: "default"
       nginx.ingress.kubernetes.io/ssl-redirect: "true"
-      nginx.ingress.kubernetes.io/whitelist-source-range: "109.93.45.225/32" #curl ifconfig.me/ip
+      nginx.ingress.kubernetes.io/whitelist-source-range: "142.132.221.245/32" #VPN IP, or your IP (but ethswarm.org is needed)
     ingress-class: "nginx"
     labels:
       app.kubernetes.io/component: "node"
       app.kubernetes.io/name: "bee"
       app.kubernetes.io/part-of: "bee"
       app.kubernetes.io/version: "latest"
       beekeeper.ethswarm.org/node-funder: "true"
-    # node-selector:
-    #   node-group: "private"
     persistence-enabled: false
     persistence-storage-class: "local-storage"
     persistence-storage-request: "34Gi"
@@ -129,10 +124,10 @@ bee-configs:
     swap-endpoint: "ws://geth-swap:8546"
     swap-factory-address: "0xdD661f2500bA5831e3d1FEbAc379Ea1bF80773Ac"
     swap-initial-deposit: 500000000000000000
-    tracing-enabled: false
-    tracing-endpoint: "tempo-tempo-distributed-distributor.observability:6831"
+    tracing-enabled: true
+    tracing-endpoint: "10.10.11.199:6831"
     tracing-service-name: "bee"
-    verbosity: 5
+    verbosity: 5 # 1=error, 2=warn, 3=info, 4=debug, 5=trace
     welcome-message: "Welcome to the Swarm, you are Bee-ing connected!"
     warmup-time: 0s
     allow-private-cidrs: true
@@ -354,7 +349,7 @@ checks:
       insufficient-amount: 102400
       contract-addr: "0xfc28330f1ecE0ef2371B724E0D19c1EE60B728b2"
       private-key: "4663c222787e30c1994b59044aa5045377a6e79193a8ead88293926b535c722d"
-      geth-url: "http://geth-swap.bee-playground.testnet.ethswarm.org"
+      geth-url: "http://geth-swap.bee-playground.testnet.internal"
       geth-chain-id: 12345
   withdraw:
     options:

diff --git a/config/light-node.yaml b/config/light-node.yaml
@@ -8,6 +8,6 @@ bee-configs:
 node-groups:
   light-node:
     _inherit: default
-    image: ethersphere/bee:latest
+    image: ethersphere/bee:2.2.0
     image-pull-policy: Always
     persistence-enabled: false
diff --git a/pkg/check/balances/balances.go b/pkg/check/balances/balances.go
@@ -46,13 +46,13 @@ var _ beekeeper.Action = (*Check)(nil)
 
 // Check instance
 type Check struct {
-	log logging.Logger
+	logger logging.Logger
 }
 
 // NewCheck returns new check
 func NewCheck(log logging.Logger) beekeeper.Action {
 	return &Check{
-		log: log,
+		logger: log,
 	}
 }
 
@@ -63,8 +63,8 @@ func (c *Check) Run(ctx context.Context, cluster orchestration.Cluster, opts int
 	}
 
 	if o.DryRun {
-		c.log.Info("running balances (dry mode)")
-		return dryRun(ctx, cluster, c.log)
+		c.logger.Info("running balances (dry mode)")
+		return dryRun(ctx, cluster, c.logger)
 	}
 
 	var checkCase *test.CheckCase
@@ -79,7 +79,7 @@ func (c *Check) Run(ctx context.Context, cluster orchestration.Cluster, opts int
 		Seed:          o.Seed,
 	}
 
-	if checkCase, err = test.NewCheckCase(ctx, cluster, caseOpts, c.log); err != nil {
+	if checkCase, err = test.NewCheckCase(ctx, cluster, caseOpts, c.logger); err != nil {
 		return err
 	}
 
@@ -89,11 +89,11 @@ func (c *Check) Run(ctx context.Context, cluster orchestration.Cluster, opts int
 	}
 
 	// initial validation
-	if err := validateBalances(balances, c.log); err != nil {
+	if err := validateBalances(balances, c.logger); err != nil {
 		return fmt.Errorf("invalid initial balances: %v", err)
 	}
 
-	c.log.Info("Balances are valid")
+	c.logger.Info("Balances are valid")
 
 	// repeats
 	for i := 0; i < o.UploadNodeCount; i++ {
@@ -110,7 +110,7 @@ func (c *Check) Run(ctx context.Context, cluster orchestration.Cluster, opts int
 			return err
 		}
 
-		if err := expectBalancesHaveChanged(balances, newBalances, c.log); err != nil {
+		if err := expectBalancesHaveChanged(balances, newBalances, c.logger); err != nil {
 			return err
 		}
 
@@ -126,7 +126,7 @@ func (c *Check) Run(ctx context.Context, cluster orchestration.Cluster, opts int
 			return err
 		}
 
-		if err := expectBalancesHaveChanged(balances, newBalances, c.log); err != nil {
+		if err := expectBalancesHaveChanged(balances, newBalances, c.logger); err != nil {
 			return err
 		}
 	}

diff --git a/pkg/test/case.go b/pkg/test/case.go
@@ -45,16 +45,16 @@ func NewCheckCase(ctx context.Context, cluster orchestration.Cluster, caseOpts C
 		return nil, err
 	}
 
-	rnd := random.PseudoGenerator(caseOpts.Seed)
 	logger.Infof("Seed: %d", caseOpts.Seed)
 
+	rnd := random.PseudoGenerator(caseOpts.Seed)
+
 	flatOverlays, err := cluster.FlattenOverlays(ctx)
 	if err != nil {
 		return nil, err
 	}
 
 	rnds := random.PseudoGenerators(caseOpts.Seed, len(flatOverlays))
-	logger.Infof("Seed: %d", caseOpts.Seed)
 
 	var (
 		nodes []BeeV2

diff --git a/version.go b/version.go
@@ -1,7 +1,7 @@
 package beekeeper
 
 var (
-	version = "0.19.1" // manually set semantic version number
+	version = "0.19.2" // manually set semantic version number
 	commit  string     // automatically set git commit hash
 
 	// Version TODO