bee: add iplookup fallbacks

Author: darkobas2

charts/bee/Chart.yaml

@@ -1,7 +1,7 @@
 apiVersion: v2
 appVersion: 2.5.0
 name: bee
-version: 0.17.2
+version: 0.17.3
 kubeVersion: ">=1.19.0-0"
 description: Ethereum Swarm Bee Helm chart for Kubernetes
 home: https://www.ethswarm.org

charts/bee/templates/statefulset.yaml

@@ -110,14 +110,22 @@ spec:
               if ! [ -f /home/bee/.bee.yaml ]; then cp -p /tmp/.bee.yaml /home/bee/.bee.yaml; fi;
               export INDEX=$(echo $(hostname) | rev | cut -d'-' -f 1 | rev);
               {{- if .Values.p2pFixedPort.enabled }}
-              PUBLIC_IP=$(wget -T 10 {{ .Values.p2pFixedPort.publicIpUrl }} -q -O -);
-              NAT_PORT=$(( {{ .Values.p2pFixedPort.nodePortStart }} + INDEX ));
-              printf 'nat-addr: %s:%s\n' "${PUBLIC_IP}" "${NAT_PORT}" >> /home/bee/.bee.yaml;
+              for url in {{ .Values.p2pFixedPort.publicIpUrls | join " " }}; do
+                PUBLIC_IP=$(wget -T 10 $url -q -O -) && [ -n "$PUBLIC_IP" ] && break
+              done;
+              if [ -n "${PUBLIC_IP}" ]; then
+                NAT_PORT=$(( {{ .Values.p2pFixedPort.nodePortStart }} + INDEX ));
+                printf 'nat-addr: %s:%s\n' "${PUBLIC_IP}" "${NAT_PORT}" >> /home/bee/.bee.yaml;
+              fi;
               {{- end }}
               {{- if .Values.p2pWssFixedPort.enabled }}
-              PUBLIC_IP=$(wget -T 10 {{ .Values.p2pWssFixedPort.publicIpUrl }} -q -O -);
-              NAT_PORT=$(( {{ .Values.p2pWssFixedPort.nodePortStart }} + INDEX ));
-              printf 'nat-wss-addr: %s:%s\n' "${PUBLIC_IP}" "${NAT_PORT}" >> /home/bee/.bee.yaml;
+              for url in {{ .Values.p2pWssFixedPort.publicIpUrls | join " " }}; do
+                PUBLIC_IP=$(wget -T 10 $url -q -O -) && [ -n "$PUBLIC_IP" ] && break
+              done;
+              if [ -n "${PUBLIC_IP}" ]; then
+                NAT_PORT=$(( {{ .Values.p2pWssFixedPort.nodePortStart }} + INDEX ));
+                printf 'nat-wss-addr: %s:%s\n' "${PUBLIC_IP}" "${NAT_PORT}" >> /home/bee/.bee.yaml;
+              fi;
               {{- end }}
               echo 'node initialization done';
           volumeMounts:

charts/bee/values.yaml

@@ -58,7 +58,10 @@ singlePodSts:
 p2pFixedPort:
   enabled: false
   nodePortStart: 31000
-  publicIpUrl: http://ifconfig.me/ip
+  publicIpUrls:
+    - http://ifconfig.me/ip
+    - http://icanhazip.com
+    - http://ifconfig.co/ip
 
 ## If enabled, creates ingress for HTTP api
 ## Creates one ingress per pod and additionally one common ingress for all pods
@@ -212,7 +215,10 @@ beeConfig:
 p2pWssFixedPort:
   enabled: false
   nodePortStart: 31001
-  publicIpUrl: http://ifconfig.me/ip
+  publicIpUrls:
+    - http://ifconfig.me/ip
+    - http://icanhazip.com
+    - http://ifconfig.co/ip
 
 
 ## Password for decrypting bee keys (please set it for production deployments)