bee: add p2p-wss

charts/bee/Chart.yaml

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

charts/bee/README.md

@@ -23,7 +23,7 @@ $ helm install --generate-name ethersphere/bee
 
 ## Introduction
 
-This chart deploys a [Ethereum Swarm Bee](https://github.com/ethersphere/bee) onto a Kubernetes cluster using the Helm package manager. It creates ConfigMap, Deployment and Service Kubernetes objects, while Ingress and ServiceAccount are optional.
+This chart bootstraps a Bee node. It creates ConfigMap, Deployment and Service Kubernetes objects, while Ingress and ServiceAccount are optional.
 
 ## Prerequisites
 

charts/bee/templates/NOTES.txt

@@ -1,4 +1,4 @@
-1. Get the application URL by running these commands:
+1. Get the Bee address:
 {{- if .Values.ingress.enabled }}
 {{- range $host := .Values.ingress.hosts }}
   {{- range .paths }}

charts/bee/templates/_helpers.tpl

@@ -137,6 +137,11 @@ Define config parameters api-addr, p2p-addr
 {{- $p2p_port := (split ":" $full_p2p_addr )._1 }}
 {{- printf "%s" $p2p_port -}}
 {{- end -}}
+{{- define "bee.config.p2p-wss_port" -}}
+{{- $full_p2p_wss_addr := index .Values.beeConfig "p2p-wss-port" -}}
+{{- $p2p_wss_port := (split ":" $full_p2p_wss_addr )._1 }}
+{{- printf "%s" $p2p_wss_port -}}
+{{- end -}}
 
 
 {{/*

charts/bee/templates/service-headless.yaml

@@ -16,11 +16,15 @@ spec:
     - name: p2p-udp
       port: {{ int (include "bee.config.p2p_port" .) }}
       protocol: UDP
-      targetPort: p2p
+      targetPort: p2p-udp
     - name: p2p-tcp
       port: {{ int (include "bee.config.p2p_port" .) }}
       protocol: TCP
-      targetPort: p2p
+      targetPort: p2p-tcp
+    - name: p2p-wss
+      port: {{ int (include "bee.config.p2p-wss_port" .) }}
+      protocol: TCP
+      targetPort: p2p-wss
   selector:
     {{- include "bee.selectorLabels" . | nindent 4 }}
   type: {{ .Values.service.type }}

charts/bee/templates/service-p2p.yaml

@@ -30,6 +30,13 @@ spec:
       {{- if $root.Values.p2pFixedPort.enabled }}
       nodePort: {{ add $root.Values.p2pFixedPort.nodePortStart $i }}
       {{- end }}
+    - name: p2p-wss
+      port: {{ int (include "bee.config.p2p-wss_port" $root) }}
+      protocol: TCP
+      targetPort: p2p-wss
+      {{- if $root.Values.p2pWssFixedPort.enabled }}
+      nodePort: {{ add $root.Values.p2pWssFixedPort.nodePortStart $i }}
+      {{- end }}
   selector:
     {{- include "bee.selectorLabels" $root | nindent 4 }}
     statefulset.kubernetes.io/pod-name: {{ include "bee.fullname" $root }}-{{ $i }}

charts/bee/templates/statefulset.yaml

@@ -197,6 +197,9 @@ spec:
             - containerPort: {{ int (include "bee.config.p2p_port" .) }}
               name: p2p-udp
               protocol: UDP
+            - containerPort: {{ int (include "bee.config.p2p-wss_port" .) }}
+              name: p2p-wss
+              protocol: TCP
           {{- if .Values.probesEnable }}
           livenessProbe:
             httpGet:

charts/bee/values.yaml

@@ -193,12 +193,13 @@ beeConfig:
   api-addr: :1633
   ## P2P listen address
   p2p-addr: :1634
+  ## P2P WSS listen address
+  p2p-wss-port: :1635
   ## Set the run mode - light by default
   full-node: true
   ## ID of the Swarm network - 10 by default
   network-id: 1
   autotls-enabled: true
-  p2p-wss-port: "1635"
 
 ## If enabled, for NodePort (p2p-wss service)
 ## the Kubernetes control plane will allocate a port from a range (default: 30000-32767)
@@ -211,6 +212,7 @@ p2pWssFixedPort:
   nodePortStart: 31001
   publicIpUrl: http://ifconfig.me/ip
 
+
 ## Password for decrypting bee keys (please set it for production deployments)
 ## If not set, it will be automatically generated
 password: