Skip to content

Commit 6c2361b

Browse files
author
Alexandra Tran
committed
Merge branch 'main' of github.com:hyperledger/besu-docs
2 parents ec910de + 116881d commit 6c2361b

File tree

7 files changed

+25
-268
lines changed

7 files changed

+25
-268
lines changed

docs/private-networks/tutorials/kubernetes/nat-manager.md

Lines changed: 0 additions & 230 deletions
This file was deleted.

docs/private-networks/tutorials/permissioning/index.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -328,31 +328,31 @@ Replace `<EnodeNode1>`, `<EnodeNode2>`, `<EnodeNode3>`, and `<EnodeNode4>` with
328328
<TabItem value="Node-1" label="Node-1" default>
329329

330330
```bash
331-
curl -X POST --data '{"jsonrpc":"2.0","method":"perm_addNodesToAllowlist","params":[["<EnodeNode1>","<EnodeNode2>","<EnodeNode3>","EnodeNode4"]], "id":1}' http://127.0.0.1:8545/ -H "Content-Type: application/json"
331+
curl -X POST --data '{"jsonrpc":"2.0","method":"perm_addNodesToAllowlist","params":[["<EnodeNode1>","<EnodeNode2>","<EnodeNode3>","<EnodeNode4>"]], "id":1}' http://127.0.0.1:8545/ -H "Content-Type: application/json"
332332
```
333333

334334
</TabItem>
335335

336336
<TabItem value="Node-2" label="Node-2">
337337

338338
```bash
339-
curl -X POST --data '{"jsonrpc":"2.0","method":"perm_addNodesToAllowlist","params":[["<EnodeNode1>","<EnodeNode2>","<EnodeNode3>","EnodeNode4"]], "id":1}' http://127.0.0.1:8546
339+
curl -X POST --data '{"jsonrpc":"2.0","method":"perm_addNodesToAllowlist","params":[["<EnodeNode1>","<EnodeNode2>","<EnodeNode3>","<EnodeNode4>"]], "id":1}' http://127.0.0.1:8546
340340
```
341341

342342
</TabItem>
343343

344344
<TabItem value="Node-3" label="Node-3">
345345

346346
```bash
347-
curl -X POST --data '{"jsonrpc":"2.0","method":"perm_addNodesToAllowlist","params":[["<EnodeNode1>","<EnodeNode2>","<EnodeNode3>","EnodeNode4"]], "id":1}' http://127.0.0.1:8547
347+
curl -X POST --data '{"jsonrpc":"2.0","method":"perm_addNodesToAllowlist","params":[["<EnodeNode1>","<EnodeNode2>","<EnodeNode3>","<EnodeNode4>"]], "id":1}' http://127.0.0.1:8547
348348
```
349349

350350
</TabItem>
351351

352352
<TabItem value="Node-4" label="Node-4">
353353

354354
```bash
355-
curl -X POST --data '{"jsonrpc":"2.0","method":"perm_addNodesToAllowlist","params":[["<EnodeNode1>","<EnodeNode2>","<EnodeNode3>","EnodeNode4"]], "id":1}' http://127.0.0.1:8548
355+
curl -X POST --data '{"jsonrpc":"2.0","method":"perm_addNodesToAllowlist","params":[["<EnodeNode1>","<EnodeNode2>","<EnodeNode3>","<EnodeNode4>"]], "id":1}' http://127.0.0.1:8548
356356
```
357357

358358
</TabItem>

docs/public-networks/how-to/connect/specify-nat.md

Lines changed: 4 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ tags:
99

1010
# Specify the NAT method
1111

12-
Use the [`--nat-method`](../../reference/cli/options.md#nat-method) option to specify the NAT method. Options are: [`UPNP`](#upnp), [`KUBERNETES`](#kubernetes), [`DOCKER`](#docker), [`AUTO`](#auto), and [`NONE`](#none).
12+
Use the [`--nat-method`](../../reference/cli/options.md#nat-method) option to specify the NAT method. Options are: [`UPNP`](#upnp), [`DOCKER`](#docker), [`AUTO`](#auto), and [`NONE`](#none).
1313

1414
The [enode](../../concepts/node-keys.md#enode-url) advertised to other nodes during discovery is the external IP address and port. The [`admin_nodeInfo`](../../reference/api/index.md#admin_nodeinfo) JSON-RPC API method returns the external address and port for the `enode` and `listenAddr` properties.
1515

@@ -20,23 +20,12 @@ While Besu is running, the following are not supported:
2020

2121
## Auto
2222

23-
`AUTO` detects if Besu is running inside a Kubernetes cluster or a Docker container.
24-
25-
- If Besu is running in a Kubernetes cluster, `AUTO` sets to [`KUBERNETES`](#kubernetes).
26-
- If Besu is running in a Docker container, `AUTO` sets to [`DOCKER`](#docker).
27-
- If Besu is not running in Kubernetes or Docker container, `AUTO` sets to [`NONE`](#none).
23+
`AUTO` detects if Besu is running inside a Docker container.
24+
If Besu is running in a Docker container, `AUTO` sets to [`DOCKER`](#docker).
25+
If Besu is not running in a Docker container, `AUTO` sets to [`NONE`](#none).
2826

2927
`AUTO` is the default NAT method.
3028

31-
The following log shows an automatic detection failure.
32-
33-
```log title="The following log shows an automatic detection failure"
34-
INFO | KubernetesNatManager | Starting kubernetes NAT manager.
35-
DEBUG | KubernetesNatManager | Trying to update information using Kubernetes client SDK.
36-
DEBUG | NatService | Nat manager failed to configure itself automatically due to the following reason Service not found. NONE mode will be used
37-
INFO | NetworkRunner | Starting Network.
38-
```
39-
4029
:::tip
4130

4231
If automatic detection fails, set the IP and ports in [`NONE`](#none) mode.
@@ -63,14 +52,6 @@ When the NAT method is set to `UPNP`, the advertised port is the same as the [li
6352

6453
:::
6554

66-
## Kubernetes
67-
68-
Specify `KUBERNETES` to explicitly specify Besu is running inside a Kubernetes cluster. Besu automatically detects if it's running inside of a Kubernetes cluster and interacts with Kubernetes APIs as required to determine external IP addresses and exposed ports.
69-
70-
In Kubernetes, the Ingress IP of the load balancer will be used as the external IP for Besu. A load balancer service can map any incoming port to a target port. These mapping rules will be the one retrieved by Besu.
71-
72-
A tutorial to [Configure the Nat Manager for Kubernetes](../../../private-networks/tutorials/kubernetes/nat-manager.md) is available.
73-
7455
## Docker
7556

7657
Specify `DOCKER` to explicitly specify Besu is running inside a Docker container. If you specify `DOCKER`, you advertise the host IP address not the container IP address.

docs/public-networks/reference/api/objects.md

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -143,13 +143,15 @@ Override an account with the following state values temporarily before making th
143143
to make ephemeral state changes, for the purposes of transaction simulation, without affecting the actual
144144
blockchain state.
145145

146-
| Key | Type | Value |
147-
|---------------------------|:-------------------:|------------------------------------------------------------------------|
148-
| `balance` | Quantity | Temporary account balance for the call execution. |
149-
| `nonce` | Quantity | Temporary nonce value for the call execution. |
150-
| `code` | Binary | Bytecode to inject into the account. |
151-
| `movePrecompileToAddress` | Data, 20&nbsp;bytes | Address to which the precompile address should be moved. |
152-
| `stateDiff` | Quantity | `key:value` pairs to override individual slots in the account storage. |
146+
147+
| Key | Type | Value |
148+
|---------------------------|:-------------------:|--------------------------------------------------------------------------------------------------------------------------------------------|
149+
| `balance` | Quantity | Temporary account balance for the call execution. |
150+
| `nonce` | Quantity | Temporary nonce value for the call execution. |
151+
| `code` | Binary | Bytecode to inject into the account. |
152+
| `movePrecompileToAddress` | Data, 20&nbsp;bytes | Address to which the precompile address should be moved. |
153+
| `state` | Quantity | `key:value` pairs to override all slots in the account storage. You cannot set both the `state` and `stateDiff` options simultaneously. |
154+
| `stateDiff` | Quantity | `key:value` pairs to override individual slots in the account storage. You cannot set both the `state` and `stateDiff` options simultaneously. |
153155

154156
## Structured log object
155157

docs/public-networks/reference/cli/options.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2569,7 +2569,6 @@ Specify the method for handling [NAT environments](../../how-to/connect/specify-
25692569

25702570
- [`UPNP`](../../how-to/connect/specify-nat.md#upnp)
25712571
- [`UPNPP2PONLY`](../../how-to/connect/specify-nat.md#upnp)
2572-
- [`KUBERNETES` (Deprecated)](../../how-to/connect/specify-nat.md#kubernetes)
25732572
- [`DOCKER`](../../how-to/connect/specify-nat.md#docker)
25742573
- [`AUTO`](../../how-to/connect/specify-nat.md#auto)
25752574
- [`NONE`](../../how-to/connect/specify-nat.md#none).

docusaurus.config.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -301,6 +301,10 @@ const config = {
301301
from: "/private-networks/tutorials/permissioning/upgrade-contracts",
302302
to: "/private-networks/how-to/use-permissioning/onchain",
303303
},
304+
{
305+
from: "/private-networks/tutorials/kubernetes/nat-manager",
306+
to: "/private-networks/tutorials/kubernetes",
307+
}
304308
],
305309
createRedirects(existingPath) {
306310
if (existingPath.includes("/development")) {

package-lock.json

Lines changed: 4 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)