chore: disable debug api (#395)

* chore: disable debug api * chore: remove debug-api flags * chore: move readiness and liveness to api port * chore: wip * chore: remove debug * chore: remove debug * fix: lint --------- Co-authored-by: Acha Bill <[email protected]>
ethersphere · May 29, 2024 · c86d398 · c86d398
1 parent 6781b34
commit c86d398
Show file tree

Hide file tree

Showing 33 changed files with 120 additions and 737 deletions.
diff --git a/cmd/beekeeper/cmd/cluster.go b/cmd/beekeeper/cmd/cluster.go
@@ -226,7 +226,7 @@ func setupNodes(ctx context.Context, clusterConfig config.Cluster, cfg *config.C
 
 		if clusterConfig.IsUsingStaticEndpoints() {
 			for nodeName, endpoint := range v.GetEndpoints() {
-				beeOpt := orchestration.WithURLs(endpoint.APIURL, endpoint.DebugAPIURL)
+				beeOpt := orchestration.WithURL(endpoint.APIURL)
 				nodeCount++
 				go setupOrAddNode(ctx, false, ng, nodeName, orchestration.NodeOptions{
 					Config: &bConfig,

diff --git a/cmd/beekeeper/cmd/node_funder.go b/cmd/beekeeper/cmd/node_funder.go
@@ -133,14 +133,14 @@ func (nf *nodeLister) List(ctx context.Context, namespace string) (nodes []funde
 		return nil, fmt.Errorf("namespace not provided")
 	}
 
-	ingressHosts, err := nf.k8sClient.Ingress.ListDebugNodesHosts(ctx, namespace)
+	ingressHosts, err := nf.k8sClient.Ingress.ListAPINodesHosts(ctx, namespace)
 	if err != nil {
-		return nil, fmt.Errorf("list ingress debug nodes hosts: %s", err.Error())
+		return nil, fmt.Errorf("list ingress api nodes hosts: %s", err.Error())
 	}
 
-	ingressRouteHosts, err := nf.k8sClient.IngressRoute.ListDebugNodesHosts(ctx, namespace)
+	ingressRouteHosts, err := nf.k8sClient.IngressRoute.ListAPINodesHosts(ctx, namespace)
 	if err != nil {
-		return nil, fmt.Errorf("list ingress route debug nodes hosts: %s", err.Error())
+		return nil, fmt.Errorf("list ingress route api nodes hosts: %s", err.Error())
 	}
 
 	ingressHosts = append(ingressHosts, ingressRouteHosts...)

diff --git a/config/config.yaml b/config/config.yaml
@@ -10,9 +10,6 @@ clusters:
     api-domain: staging.internal
     api-insecure-tls: true
     api-scheme: https
-    debug-api-domain: staging.internal
-    debug-api-insecure-tls: true
-    debug-api-scheme: https
     admin-password: test
     funding:
       eth: 0.1
@@ -103,7 +100,6 @@ node-groups:
       nginx.ingress.kubernetes.io/session-cookie-path: "default"
       nginx.ingress.kubernetes.io/ssl-redirect: "true"
     ingress-class: "nginx-internal"
-    ingress-debug-class: "nginx-internal"
     labels:
       app.kubernetes.io/component: "node"
       app.kubernetes.io/name: "bee"
@@ -140,8 +136,6 @@ bee-configs:
     db-block-cache-capacity: 33554432
     db-write-buffer-size: 33554432
     db-disable-seeks-compaction: false
-    debug-api-addr: ":1635"
-    debug-api-enable: true
     full-node: true
     nat-addr: ""
     mainnet: false

diff --git a/config/helm-cluster.yaml b/config/helm-cluster.yaml
@@ -8,9 +8,6 @@ clusters:
     api-domain: staging.internal
     api-insecure-tls: true
     api-scheme: https
-    debug-api-domain: staging.internal
-    debug-api-insecure-tls: true
-    debug-api-scheme: https
     node-groups:
       bee:
         bee-config: default

diff --git a/config/local.yaml b/config/local.yaml
@@ -7,8 +7,6 @@ clusters:
     disable-namespace: true
     api-domain: localhost
     api-scheme: http
-    debug-api-domain: localhost
-    debug-api-scheme: http
     admin-password: test
     funding:
       eth: 0.1
@@ -119,7 +117,6 @@ node-groups:
       nginx.ingress.kubernetes.io/session-cookie-path: "default"
       nginx.ingress.kubernetes.io/ssl-redirect: "true"
     ingress-class: "traefik"
-    ingress-debug-class: "traefik"
     labels:
       app.kubernetes.io/component: "node"
       app.kubernetes.io/name: "bee"
@@ -163,8 +160,6 @@ bee-configs:
     db-block-cache-capacity: 33554432
     db-write-buffer-size: 33554432
     db-disable-seeks-compaction: false
-    debug-api-addr: ":1635"
-    debug-api-enable: true
     full-node: true
     mainnet: false
     nat-addr: ""

diff --git a/config/mainnet.yaml b/config/mainnet.yaml
@@ -9,9 +9,6 @@ clusters:
     api-domain: gateway.ethswarm.org
     api-insecure-tls: true
     api-scheme: https
-    debug-api-domain: bee-gateway.mainnet.internal
-    debug-api-insecure-tls: true
-    debug-api-scheme: https
     funding:
       eth: 0.1
       gbzz: 2.0

diff --git a/config/staging.yaml b/config/staging.yaml
@@ -9,9 +9,6 @@ clusters:
     api-domain: staging.ethswarm.org
     api-insecure-tls: true
     api-scheme: https
-    debug-api-domain: staging.internal
-    debug-api-insecure-tls: true
-    debug-api-scheme: https
     funding:
       eth: 0.1
       gbzz: 2.0

diff --git a/config/testnet-giant.yaml b/config/testnet-giant.yaml
@@ -9,9 +9,6 @@ clusters:
     api-domain: staging.internal
     api-insecure-tls: true
     api-scheme: https
-    debug-api-domain: staging.internal
-    debug-api-insecure-tls: true
-    debug-api-scheme: https
     funding:
       eth: 0.1
       gbzz: 2.0
@@ -51,7 +48,6 @@ node-groups:
       nginx.ingress.kubernetes.io/session-cookie-path: "default"
       nginx.ingress.kubernetes.io/ssl-redirect: "true"
     ingress-class: "nginx-internal"
-    ingress-debug-class: "nginx-internal"
     labels:
       app.kubernetes.io/component: "node"
       app.kubernetes.io/name: "bee"
@@ -88,8 +84,6 @@ bee-configs:
     db-block-cache-capacity: 33554432
     db-write-buffer-size: 33554432
     db-disable-seeks-compaction: false
-    debug-api-addr: ":1635"
-    debug-api-enable: true
     full-node: true
     mainnet: false
     nat-addr: ""

diff --git a/config/testnet.yaml b/config/testnet.yaml
@@ -9,9 +9,6 @@ clusters:
     api-domain: staging.internal
     api-insecure-tls: true
     api-scheme: https
-    debug-api-domain: staging.internal
-    debug-api-insecure-tls: true
-    debug-api-scheme: https
     funding:
       eth: 0.1
       gbzz: 2.0
@@ -48,7 +45,6 @@ node-groups:
       nginx.ingress.kubernetes.io/session-cookie-path: "default"
       nginx.ingress.kubernetes.io/ssl-redirect: "true"
     ingress-class: "nginx-internal"
-    ingress-debug-class: "nginx-internal"
     labels:
       app.kubernetes.io/component: "node"
       app.kubernetes.io/name: "bee"
@@ -90,8 +86,6 @@ bee-configs:
     db-block-cache-capacity: 33554432
     db-write-buffer-size: 33554432
     db-disable-seeks-compaction: false
-    debug-api-addr: ":1635"
-    debug-api-enable: true
     full-node: true
     nat-addr: ""
     mainnet: false

diff --git a/pkg/bee/api/api.go b/pkg/bee/api/api.go
@@ -44,6 +44,11 @@ type Client struct {
 	SOC         *SOCService
 	Stewardship *StewardshipService
 	Auth        *AuthService
+
+	Node     *NodeService
+	PingPong *PingPongService
+	Postage  *PostageService
+	Stake    *StakingService
 }
 
 // ClientOptions holds optional parameters for the Client.
@@ -82,6 +87,10 @@ func newClient(httpClient *http.Client) (c *Client) {
 	c.SOC = (*SOCService)(&c.service)
 	c.Stewardship = (*StewardshipService)(&c.service)
 	c.Auth = (*AuthService)(&c.service)
+	c.Node = (*NodeService)(&c.service)
+	c.PingPong = (*PingPongService)(&c.service)
+	c.Postage = (*PostageService)(&c.service)
+	c.Stake = (*StakingService)(&c.service)
 	return c
 }
 

diff --git a/pkg/bee/debugapi/debugstore.go → pkg/bee/api/debugstore.go b/pkg/bee/debugapi/debugstore.go → pkg/bee/api/debugstore.go
@@ -1,4 +1,4 @@
-package debugapi
+package api
 
 import (
 	"context"

diff --git a/pkg/bee/debugapi/node.go → pkg/bee/api/node.go b/pkg/bee/debugapi/node.go → pkg/bee/api/node.go
@@ -1,4 +1,4 @@
-package debugapi
+package api
 
 import (
 	"context"

diff --git a/pkg/bee/debugapi/pingpong.go → pkg/bee/api/pingpong.go b/pkg/bee/debugapi/pingpong.go → pkg/bee/api/pingpong.go
@@ -1,4 +1,4 @@
-package debugapi
+package api
 
 import (
 	"context"

diff --git a/pkg/bee/debugapi/postage.go → pkg/bee/api/postage.go b/pkg/bee/debugapi/postage.go → pkg/bee/api/postage.go
@@ -1,4 +1,4 @@
-package debugapi
+package api
 
 import (
 	"context"

diff --git a/pkg/bee/debugapi/stake.go → pkg/bee/api/stake.go b/pkg/bee/debugapi/stake.go → pkg/bee/api/stake.go
@@ -1,4 +1,4 @@
-package debugapi
+package api
 
 import (
 	"context"