Merge pull request #169 from ethersphere/custom-natip

ethersphere · Feb 28, 2022 · 2ec683d · 2ec683d
2 parents ca80ef9 + b357948
commit 2ec683d
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/charts/bee/Chart.yaml b/charts/bee/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 appVersion: latest
 name: bee
-version: 0.11.0
+version: 0.11.1
 kubeVersion: ">=1.15.0-0"
 description: Ethereum Swarm Bee Helm chart for Kubernetes
 home: https://www.ethswarm.org

diff --git a/charts/bee/README.md b/charts/bee/README.md
@@ -99,7 +99,7 @@ apps:
     namespace: bee
     description: "Ethereum Swarm Bee"
     chart: "ethersphere/bee"
-    version: "0.10.5"
+    version: "0.11.1"
     enabled: true
     set:
       beeConfig.bootnode: # bootnode multi address
@@ -131,7 +131,7 @@ apps:
     namespace: bee
     description: "Ethereum Swarm Bee"
     chart: "ethersphere/bee"
-    version: "0.10.5"
+    version: "0.11.1"
     enabled: true
     set:
       beeConfig.bootnode: "/dns4/bee-0-headless.bee.svc.cluster.local/tcp/1634/p2p/16Uiu2HAm6i4dFaJt584m2jubyvnieEECgqM2YMpQ9nusXfy8XFzL"

diff --git a/charts/bee/templates/statefulset.yaml b/charts/bee/templates/statefulset.yaml
@@ -126,7 +126,7 @@ spec:
             - sh
             - -c
             - >
-              PUBLIC_IP=$(wget -T 2 http://169.254.169.254/latest/meta-data/public-ipv4 -q -O -);
+              PUBLIC_IP=$(wget -T 2 {{ .Values.p2pFixedPort.publicIpUrl }} -q -O -);
               export INDEX=$(echo $(hostname) | rev | cut -d'-' -f 1 | rev);
               NAT_PORT=$(( {{ .Values.p2pFixedPort.nodePortStart }} + INDEX ));
               cp -p /tmp/.bee.yaml /home/bee/.bee.yaml;

diff --git a/charts/bee/values.yaml b/charts/bee/values.yaml
@@ -53,9 +53,12 @@ singlePodSts:
 ## the Kubernetes control plane will allocate a port from a range (default: 30000-32767)
 ## You can enable and specify start value and NodePort will be $nodePortStart + $ordinal
 ## If wanted port if used by some other service deploy will fail
+## By default AWS internal endpoint will be used to discover public IP
+## You can specify public services as icanhazip.com etc.
 p2pFixedPort:
   enabled: false
   nodePortStart: 31000
+  publicIpUrl: http://169.254.169.254/latest/meta-data/public-ipv4
 
 ## If enabled, creates ingress for HTTP api
 ## Creates one ingress per pod and additionally one common ingress for all pods