From f68d5e206dbad04bff90f65e862c2b981dd8fdfe Mon Sep 17 00:00:00 2001 From: aWN4Y25pa2EK <19519604+aWN4Y25pa2EK@users.noreply.github.com> Date: Thu, 11 Jul 2024 10:59:27 +0100 Subject: [PATCH 01/14] add p2p webtransport port --- charts/celestia-node/templates/service.yaml | 19 +++++++++++++++++++ .../celestia-node/templates/statefulset.yaml | 4 ++++ charts/celestia-node/values.yaml | 10 ++++++++++ 3 files changed, 33 insertions(+) diff --git a/charts/celestia-node/templates/service.yaml b/charts/celestia-node/templates/service.yaml index 166ac92..43bfa56 100644 --- a/charts/celestia-node/templates/service.yaml +++ b/charts/celestia-node/templates/service.yaml @@ -31,6 +31,19 @@ spec: loadBalancerIP: {{ .Values.service.external.loadBalancerIP }} {{- end }} ports: + {{- if .Values.service.external.ports.ws }} + - name: p2p-ws + port: {{ .Values.service.external.ports.ws }} + {{- if not (eq .Values.service.external.ports.ws .Values.node.containerPorts.ws) }} + targetPort: {{ .Values.node.containerPorts.ws }} + {{- end }} + protocol: TCP + {{- if and (or (eq .Values.service.external.type "NodePort") (eq .Values.service.external.type "LoadBalancer")) (not (empty .Values.service.external.nodePorts.ws)) }} + nodePort: {{ .Values.service.external.nodePorts.ws }} + {{- else if eq .Values.service.external.type "ClusterIP" }} + nodePort: null + {{- end }} + {{- end }} {{- if .Values.service.external.ports.p2p }} - name: p2p-tcp port: {{ .Values.service.external.ports.p2p }} @@ -141,6 +154,12 @@ spec: sessionAffinityConfig: {{- include "common.tplvalues.render" (dict "value" .Values.service.internal.sessionAffinityConfig "context" $) | nindent 4 }} {{- end }} ports: + - name: p2p-ws + port: {{ .Values.service.internal.ports.ws }} + {{- if not (eq .Values.service.internal.ports.ws .Values.node.containerPorts.ws) }} + targetPort: {{ .Values.node.containerPorts.ws }} + {{- end }} + protocol: TCP - name: p2p-tcp port: {{ .Values.service.internal.ports.p2p }} {{- if not (eq .Values.service.internal.ports.p2p .Values.node.containerPorts.p2p) }} diff --git a/charts/celestia-node/templates/statefulset.yaml b/charts/celestia-node/templates/statefulset.yaml index e56b8d4..1aa622d 100644 --- a/charts/celestia-node/templates/statefulset.yaml +++ b/charts/celestia-node/templates/statefulset.yaml @@ -186,6 +186,10 @@ spec: resources: {{- include "common.resources.preset" (dict "type" .Values.node.resourcesPreset) | nindent 12 }} {{- end }} ports: + - name: p2p-ws + containerPort: {{ .Values.node.containerPorts.ws }} + hostPort: {{ .Values.node.containerPorts.ws }} + protocol: TCP - name: p2p-tcp containerPort: {{ .Values.node.containerPorts.p2p }} hostPort: {{ .Values.node.containerPorts.p2p }} diff --git a/charts/celestia-node/values.yaml b/charts/celestia-node/values.yaml index d53e7b7..0c06bbb 100644 --- a/charts/celestia-node/values.yaml +++ b/charts/celestia-node/values.yaml @@ -166,6 +166,8 @@ node: - /ip6/::/udp/2121/quic-v1 - /ip4/0.0.0.0/tcp/2121 - /ip6/::/tcp/2121 + - /ip4/0.0.0.0/tcp/2122/ws + - /ip6/::/tcp/2122/ws AnnounceAddresses: [] NoAnnounceAddresses: - /ip4/127.0.0.1/udp/2121/quic-v1/webtransport @@ -325,6 +327,8 @@ node: ## # -- Container ports for the node containerPorts: + # -- P2P/WebTransport container port, 2122 by default + ws: 2122 # -- P2P container port, 2121 by default p2p: 2121 # -- REST container port, 26659 by default @@ -710,6 +714,8 @@ service: ## @param service.internal.ports.prometheus Node internal service Prometheus port # -- Ports for the celestia-node ports: + # -- P2P container port, 2122 by default + ws: 2122 # -- P2P container port, 2121 by default p2p: 2121 # -- REST container port, 26659 by default @@ -756,6 +762,8 @@ service: ## @param service.external.ports.profiling Node external service Profiling port ## @param service.external.ports.prometheus Node external service Prometheus port ports: + # -- P2P container port, 2122 by default + ws: 2122 # -- P2P container port, 2121 by default p2p: 2121 # -- REST container port, 26659 by default @@ -772,6 +780,8 @@ service: ## # -- node ports for the celestia-app nodePorts: + # -- p2p port, 2122 by default + ws: "" # -- p2p port, 2121 by default p2p: "" # -- rest port, 26659 by default From c64609e1392e17ed99b02b4314510c2ff8c68c32 Mon Sep 17 00:00:00 2001 From: aWN4Y25pa2EK <19519604+aWN4Y25pa2EK@users.noreply.github.com> Date: Thu, 11 Jul 2024 11:15:34 +0100 Subject: [PATCH 02/14] add p2p webtransport port --- charts/celestia-node/templates/service.yaml | 4 ++-- charts/celestia-node/templates/statefulset.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/charts/celestia-node/templates/service.yaml b/charts/celestia-node/templates/service.yaml index 43bfa56..ad3a102 100644 --- a/charts/celestia-node/templates/service.yaml +++ b/charts/celestia-node/templates/service.yaml @@ -37,7 +37,7 @@ spec: {{- if not (eq .Values.service.external.ports.ws .Values.node.containerPorts.ws) }} targetPort: {{ .Values.node.containerPorts.ws }} {{- end }} - protocol: TCP + protocol: UDP {{- if and (or (eq .Values.service.external.type "NodePort") (eq .Values.service.external.type "LoadBalancer")) (not (empty .Values.service.external.nodePorts.ws)) }} nodePort: {{ .Values.service.external.nodePorts.ws }} {{- else if eq .Values.service.external.type "ClusterIP" }} @@ -159,7 +159,7 @@ spec: {{- if not (eq .Values.service.internal.ports.ws .Values.node.containerPorts.ws) }} targetPort: {{ .Values.node.containerPorts.ws }} {{- end }} - protocol: TCP + protocol: UDP - name: p2p-tcp port: {{ .Values.service.internal.ports.p2p }} {{- if not (eq .Values.service.internal.ports.p2p .Values.node.containerPorts.p2p) }} diff --git a/charts/celestia-node/templates/statefulset.yaml b/charts/celestia-node/templates/statefulset.yaml index 1aa622d..1b86e12 100644 --- a/charts/celestia-node/templates/statefulset.yaml +++ b/charts/celestia-node/templates/statefulset.yaml @@ -189,7 +189,7 @@ spec: - name: p2p-ws containerPort: {{ .Values.node.containerPorts.ws }} hostPort: {{ .Values.node.containerPorts.ws }} - protocol: TCP + protocol: UDP - name: p2p-tcp containerPort: {{ .Values.node.containerPorts.p2p }} hostPort: {{ .Values.node.containerPorts.p2p }} From e9cfe93c7bf31cba6d50b650efc36cbb20046db7 Mon Sep 17 00:00:00 2001 From: aWN4Y25pa2EK <19519604+aWN4Y25pa2EK@users.noreply.github.com> Date: Thu, 11 Jul 2024 11:21:39 +0100 Subject: [PATCH 03/14] add p2p webtransport port --- charts/celestia-node/templates/service.yaml | 4 ++-- charts/celestia-node/templates/statefulset.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/charts/celestia-node/templates/service.yaml b/charts/celestia-node/templates/service.yaml index ad3a102..43bfa56 100644 --- a/charts/celestia-node/templates/service.yaml +++ b/charts/celestia-node/templates/service.yaml @@ -37,7 +37,7 @@ spec: {{- if not (eq .Values.service.external.ports.ws .Values.node.containerPorts.ws) }} targetPort: {{ .Values.node.containerPorts.ws }} {{- end }} - protocol: UDP + protocol: TCP {{- if and (or (eq .Values.service.external.type "NodePort") (eq .Values.service.external.type "LoadBalancer")) (not (empty .Values.service.external.nodePorts.ws)) }} nodePort: {{ .Values.service.external.nodePorts.ws }} {{- else if eq .Values.service.external.type "ClusterIP" }} @@ -159,7 +159,7 @@ spec: {{- if not (eq .Values.service.internal.ports.ws .Values.node.containerPorts.ws) }} targetPort: {{ .Values.node.containerPorts.ws }} {{- end }} - protocol: UDP + protocol: TCP - name: p2p-tcp port: {{ .Values.service.internal.ports.p2p }} {{- if not (eq .Values.service.internal.ports.p2p .Values.node.containerPorts.p2p) }} diff --git a/charts/celestia-node/templates/statefulset.yaml b/charts/celestia-node/templates/statefulset.yaml index 1b86e12..1aa622d 100644 --- a/charts/celestia-node/templates/statefulset.yaml +++ b/charts/celestia-node/templates/statefulset.yaml @@ -189,7 +189,7 @@ spec: - name: p2p-ws containerPort: {{ .Values.node.containerPorts.ws }} hostPort: {{ .Values.node.containerPorts.ws }} - protocol: UDP + protocol: TCP - name: p2p-tcp containerPort: {{ .Values.node.containerPorts.p2p }} hostPort: {{ .Values.node.containerPorts.p2p }} From 0ba113a34b0686d185eec6ec5b4fb23c152c275e Mon Sep 17 00:00:00 2001 From: aWN4Y25pa2EK <19519604+aWN4Y25pa2EK@users.noreply.github.com> Date: Thu, 11 Jul 2024 11:24:11 +0100 Subject: [PATCH 04/14] add websocket support --- charts/celestia-node/values.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/celestia-node/values.yaml b/charts/celestia-node/values.yaml index 0c06bbb..c8ecd82 100644 --- a/charts/celestia-node/values.yaml +++ b/charts/celestia-node/values.yaml @@ -327,7 +327,7 @@ node: ## # -- Container ports for the node containerPorts: - # -- P2P/WebTransport container port, 2122 by default + # -- WebSocket container port, 2122 by default ws: 2122 # -- P2P container port, 2121 by default p2p: 2121 @@ -714,7 +714,7 @@ service: ## @param service.internal.ports.prometheus Node internal service Prometheus port # -- Ports for the celestia-node ports: - # -- P2P container port, 2122 by default + # -- WebSocket container port, 2122 by default ws: 2122 # -- P2P container port, 2121 by default p2p: 2121 From ea3dd40f9adf0fc2481b28a17ba121c3eafcfa03 Mon Sep 17 00:00:00 2001 From: aWN4Y25pa2EK <19519604+aWN4Y25pa2EK@users.noreply.github.com> Date: Thu, 11 Jul 2024 17:37:29 +0100 Subject: [PATCH 05/14] add websocket support --- .tls-wildcard-arabica.yaml.swp | Bin 0 -> 12288 bytes .../celestia-node/templates/statefulset.yaml | 18 +++- charts/celestia-node/values.yaml | 4 +- examples/celestia-node/arabica-bridge.yaml | 6 +- examples/celestia-node/lunar-bridge-6.yaml | 81 ++++++++++++++++++ 5 files changed, 105 insertions(+), 4 deletions(-) create mode 100644 .tls-wildcard-arabica.yaml.swp create mode 100644 examples/celestia-node/lunar-bridge-6.yaml diff --git a/.tls-wildcard-arabica.yaml.swp b/.tls-wildcard-arabica.yaml.swp new file mode 100644 index 0000000000000000000000000000000000000000..6bf821fb727cb769a4096e5ddff74b14f459c206 GIT binary patch literal 12288 zcmeI&y-ve05C?FVi3Nc`Vm4)V(f|wDU_n(?=+f@j*lMkOIEvj?U0`G4F?bDTo`N@F zz@e#xP=&eze@mB>owFnVqzq9!?u@#9ei?L_ZwK{d)h4|bD|EVC_kYS=EBcgN8|OU)!Fv2F0!E{ zF|M?nC~?tdwp2;XI4>wywxmSGyg3OkqNo{ Date: Thu, 11 Jul 2024 19:05:04 +0100 Subject: [PATCH 06/14] add websocket support --- charts/celestia-node/values.yaml | 2 -- examples/celestia-node/arabica-bridge.yaml | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/charts/celestia-node/values.yaml b/charts/celestia-node/values.yaml index 90a052d..d52f235 100644 --- a/charts/celestia-node/values.yaml +++ b/charts/celestia-node/values.yaml @@ -166,8 +166,6 @@ node: - /ip6/::/udp/2121/quic-v1 - /ip4/0.0.0.0/tcp/2121 - /ip6/::/tcp/2121 - - /ip4/0.0.0.0/tcp/2122/wss - - /ip6/::/tcp/2122/wss AnnounceAddresses: [] NoAnnounceAddresses: - /ip4/127.0.0.1/udp/2121/quic-v1/webtransport diff --git a/examples/celestia-node/arabica-bridge.yaml b/examples/celestia-node/arabica-bridge.yaml index db9a626..90448dd 100644 --- a/examples/celestia-node/arabica-bridge.yaml +++ b/examples/celestia-node/arabica-bridge.yaml @@ -20,8 +20,8 @@ persistence: node: image: registry: ttl.sh - repository: b74805db-5d9e-40ef-8622-e8734169b617 - tag: 1h + repository: b757629c-c54c-4b7c-af30-68a1155356ae + tag: 24h nodeSelector: k8s.scaleway.com/pool-name: *pool persistentVolumeClaimRetentionPolicy: From ca6caee347f65106e071f14e8cc7d0df347b6b70 Mon Sep 17 00:00:00 2001 From: aWN4Y25pa2EK <19519604+aWN4Y25pa2EK@users.noreply.github.com> Date: Wed, 17 Jul 2024 18:17:43 +0100 Subject: [PATCH 07/14] add websocket support --- .../celestia-node/templates/statefulset.yaml | 2 +- charts/celestia-node/values.yaml | 21 ++++++++++++------- examples/celestia-node/arabica-bridge.yaml | 5 ++--- 3 files changed, 16 insertions(+), 12 deletions(-) diff --git a/charts/celestia-node/templates/statefulset.yaml b/charts/celestia-node/templates/statefulset.yaml index 8da6af7..d9d5254 100644 --- a/charts/celestia-node/templates/statefulset.yaml +++ b/charts/celestia-node/templates/statefulset.yaml @@ -189,7 +189,7 @@ spec: - name: p2p-ws containerPort: {{ .Values.node.containerPorts.ws }} hostPort: {{ .Values.node.containerPorts.ws }} - protocol: TCP + protocol: TCP - name: p2p-tcp containerPort: {{ .Values.node.containerPorts.p2p }} hostPort: {{ .Values.node.containerPorts.p2p }} diff --git a/charts/celestia-node/values.yaml b/charts/celestia-node/values.yaml index d52f235..da5eb7b 100644 --- a/charts/celestia-node/values.yaml +++ b/charts/celestia-node/values.yaml @@ -160,23 +160,28 @@ node: GranterAddress: [] P2P: ListenAddresses: + # IPv4 - /ip4/0.0.0.0/udp/2121/quic-v1/webtransport - - /ip6/::/udp/2121/quic-v1/webtransport - /ip4/0.0.0.0/udp/2121/quic-v1 - - /ip6/::/udp/2121/quic-v1 + #- /ip4/0.0.0.0/tcp/2122/wss - /ip4/0.0.0.0/tcp/2121 + # IPv6 + - /ip6/::/udp/2121/quic-v1/webtransport + - /ip6/::/udp/2121/quic-v1 + #- /ip6/::/tcp/2122/wss - /ip6/::/tcp/2121 AnnounceAddresses: [] NoAnnounceAddresses: + # IPv4 - /ip4/127.0.0.1/udp/2121/quic-v1/webtransport - - /ip4/0.0.0.0/udp/2121/quic-v1/webtransport - - /ip6/::/udp/2121/quic-v1/webtransport - - /ip4/0.0.0.0/udp/2121/quic-v1 - /ip4/127.0.0.1/udp/2121/quic-v1 - - /ip6/::/udp/2121/quic-v1 - - /ip4/0.0.0.0/tcp/2121 + - /ip4/127.0.0.1/tcp/2122/wss - /ip4/127.0.0.1/tcp/2121 - - /ip6/::/tcp/2121 + # IPv6 + - /ip6/::1/udp/2121/quic-v1/webtransport + - /ip6/::1/udp/2121/quic-v1 + - /ip6/::1/tcp/2122/wss + - /ip6/::1/tcp/2121 MutualPeers: [] PeerExchange: true RoutingTableRefreshPeriod: 1m0s diff --git a/examples/celestia-node/arabica-bridge.yaml b/examples/celestia-node/arabica-bridge.yaml index 90448dd..2db1784 100644 --- a/examples/celestia-node/arabica-bridge.yaml +++ b/examples/celestia-node/arabica-bridge.yaml @@ -20,13 +20,13 @@ persistence: node: image: registry: ttl.sh - repository: b757629c-c54c-4b7c-af30-68a1155356ae + repository: 6d4ea755-c9d9-4130-9383-280aa32ca046 tag: 24h nodeSelector: k8s.scaleway.com/pool-name: *pool persistentVolumeClaimRetentionPolicy: whenDeleted: Delete - whenScaled: Retain + whenScaled: Delete otelAgent: enabled: true grafanaOtelSecret: @@ -69,7 +69,6 @@ node: Core: IP: consensus-validator RPC: - Enabled: true Address: 0.0.0.0 Gateway: Enabled: true From 5aff279f17a4bcbe4247b6128d769d7c1f83d8a6 Mon Sep 17 00:00:00 2001 From: aWN4Y25pa2EK <19519604+aWN4Y25pa2EK@users.noreply.github.com> Date: Mon, 5 Aug 2024 15:28:16 +0200 Subject: [PATCH 08/14] add wss unique secret name --- .../celestia-node/templates/statefulset.yaml | 4 ++- charts/celestia-node/values.yaml | 3 +++ examples/celestia-node/arabica-bridge.yaml | 27 ++++++++++++------- 3 files changed, 23 insertions(+), 11 deletions(-) diff --git a/charts/celestia-node/templates/statefulset.yaml b/charts/celestia-node/templates/statefulset.yaml index d9d5254..197a681 100644 --- a/charts/celestia-node/templates/statefulset.yaml +++ b/charts/celestia-node/templates/statefulset.yaml @@ -276,6 +276,7 @@ spec: - name: home-dir # This is needed so that the process has permissions to create files in the home directory mountPath: {{ .Values.node.settings.home }} readOnly: false + {{- if .Values.node.settings.wssTLS.enabled }} - name: tls-certs mountPath: /home/celestia/tls/cert.pem subPath: fullchain.pem @@ -284,6 +285,7 @@ spec: mountPath: /home/celestia/tls/key.pem subPath: privkey.pem readOnly: true + {{- end }} {{- if .Values.node.extraVolumeMounts }} {{- include "common.tplvalues.render" (dict "value" .Values.node.extraVolumeMounts "context" $) | nindent 12 }} {{- end }} @@ -340,7 +342,7 @@ spec: path: my_celes_key.info - name: tls-certs secret: - secretName: tls-da-wss + secretName: {{ .Values.node.settings.wssTLS.name }} items: - key: fullchain.pem path: fullchain.pem diff --git a/charts/celestia-node/values.yaml b/charts/celestia-node/values.yaml index da5eb7b..c18d123 100644 --- a/charts/celestia-node/values.yaml +++ b/charts/celestia-node/values.yaml @@ -137,6 +137,9 @@ node: secret: # -- name of the secret, it must be set name: SET_IT + wssTLS: + enabled: false + name: SET_IT ## @param node.config Configuration for the celestia-node ## ## @param node.config.apptoml Configuration for the celestia-node node.toml diff --git a/examples/celestia-node/arabica-bridge.yaml b/examples/celestia-node/arabica-bridge.yaml index 2db1784..25c328e 100644 --- a/examples/celestia-node/arabica-bridge.yaml +++ b/examples/celestia-node/arabica-bridge.yaml @@ -3,25 +3,27 @@ commonLabels: &commonLabels environment: arabica network: da type: &nodeType bridge # check - secretName: &secretName keys-da-bridge-1 # check + bootstrapper: &bootstrapper "true" + secretName: &secretName keys-da-bridge-4 # check pool: &pool pool-da-0 # check pool instance type to validate requests & limits + release: &release v0.14.1 + wssTLS: &wssTLS da-b4-wss-tls service: external: annotations: external-dns.alpha.kubernetes.io/endpoints-type: "NodeExternalIP" - external-dns.alpha.kubernetes.io/hostname: "test-hc-bridge.celestia-arabica-11.com" + external-dns.alpha.kubernetes.io/hostname: "test-da-bridge-4.celestia-arabica-11.com" external-dns.alpha.kubernetes.io/ttl: "60" persistence: - size: 750Gi + storageClass: sbs-15k + size: 1.5Ti dataSource: apiGroup: snapshot.storage.k8s.io kind: VolumeSnapshot name: da-latest node: image: - registry: ttl.sh - repository: 6d4ea755-c9d9-4130-9383-280aa32ca046 - tag: 24h + tag: *release nodeSelector: k8s.scaleway.com/pool-name: *pool persistentVolumeClaimRetentionPolicy: @@ -50,6 +52,9 @@ node: enabled: true periodSeconds: 10 failureThreshold: 60 + extraEnvVars: + - name: CELESTIA_BOOTSTRAPPER + value: *bootstrapper args: - *nodeType - start @@ -60,10 +65,13 @@ node: - --p2p.metrics settings: nodeType: *nodeType - address: "eyJhbGciOiJQQkVTMi1IUzI1NitBMTI4S1ciLCJjcmVhdGVkIjoiMjAyNC0wMS0wMiAxMjo1NzoyMC4yNjk1Mjg2NTQgKzAwMDAgVVRDIG09KzAuMDQwNDkyNDk0IiwiZW5jIjoiQTI1NkdDTSIsInAyYyI6ODE5MiwicDJzIjoibHBUb0pLUkFvS3NPbmRhaCJ9.SFen5RaM_7JverpZQN6VxtJ06XePE5VKjyzMyIPgqURSge-XbiLHqA.vZ4fuVFbrLODe8RM.EGKwO3uGEifnPanziF-AD4i6q_92IetSVAEz-7Grg75AJyFLV3Flt4CmfLxrJ2JHWJEKUQBNyIU81u7pd01iNzEECDy9b0jO3DYZ_5PRET8zrVPv6SKKZ_U7MLWmAe_eUajipnbqZ6NzG8UcG4qAt278ttZB1KQsKqocKlE39fSvo3iaZEzOKxS0N3tU1Xw2C3w6HgHJFk0QiP36NIHuKoP_4QJkeAomhJX-cNOYwvTd8qTFTk2-1TzLJ5DasLXsVXTUSUzCzYQhEfL8F0qFoGvuY1dWRD5BESw2Gg2oLH1w957Xd2UhRbo5ORz9POR7goEv9AZ_rWrjSV8HozUmgFwDQyM89M7oiNedEfGQoDjypzcUBcVkZLEMIdrFRpshjcpNEzy6-PZ9rSxouKb7wemG_sueX3V3gIPCTfFr6hB8_b2mV-kKeIXQRS5pJz_wXxeFHFKOHDjt3L8n5eqh.fy-zygX7rjTUqgX02sZKKg" - node_id: "92a499fc2ce7cabd2de89416aa0d0d07838f625d" + address: "eyJhbGciOiJQQkVTMi1IUzI1NitBMTI4S1ciLCJjcmVhdGVkIjoiMjAyNC0wMS0wMiAxMzowMDo1Mi4wMDMzMzM3MTkgKzAwMDAgVVRDIG09KzAuMDQwMjQxMDk3IiwiZW5jIjoiQTI1NkdDTSIsInAyYyI6ODE5MiwicDJzIjoiSUpfUVNZeHFaUi1zUHJ5RyJ9.3elqIhhaOROoBGP9sKBGZa1qd6XY9quGPbChZv5zPbamFnCuByXXZw.sAbNfJO-m8v_LWPk.W-ejd0cYJonLh9BpizjTYMSWeNjboKYGIw2VInDagoDJja_TR_eSQXZVL0LZb9M-YAoMWDySoI3QlTu2fS8cGtFGQ5QpKYix6ndXhtFLb-vlyvMK-eXxOl9Zhjwt7BDb5rOQGOKGCKSGFrouASsuAWhcgULaKsv_BhTnK0EboprKgF9HHN2OMBr1QyXESg2fhpzn3n5WD0W1YUqCpQCn-zMVzwYOJXwL_b04qiWCfHNDn85iQOs9Tbepecyhjcy0bt7nRDDZ7ZgqGlp_h63slZ5fKDGAI_jTFL06ygXgJmre88vr6nGVxeIIKtGcSOaGLySTUjyo_iiHGHFtUdnzNWBbKKh_x9NS8qYqWASTt8bRIisdbQzCLFN5pMLEvhMtnDq6aSUkB-p9ZAGpJXljZJjGMi14K4XfRWAh0RQeAVk_81h2tTXRSzfql-qgfA7DmUrO0VYBTPL78dXqLcJd.YdHoxUmfRqPJfOz-lbybGA" + node_id: "db1e0ee216b0dd73068b6460926701ff40ce8f1a" secret: name: *secretName + wssTLS: + enabled: false + name: *wssTLS config: configtoml: Core: @@ -78,5 +86,4 @@ node: diagnosticMode: enabled: false networkPolicy: - enabled: false - \ No newline at end of file + enabled: false \ No newline at end of file From a2e3756d03da87eb2be503d8ea64514d167b54e7 Mon Sep 17 00:00:00 2001 From: aWN4Y25pa2EK <19519604+aWN4Y25pa2EK@users.noreply.github.com> Date: Mon, 5 Aug 2024 15:29:22 +0200 Subject: [PATCH 09/14] add wss unique secret name --- .tls-wildcard-arabica.yaml.swp | Bin 12288 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 .tls-wildcard-arabica.yaml.swp diff --git a/.tls-wildcard-arabica.yaml.swp b/.tls-wildcard-arabica.yaml.swp deleted file mode 100644 index 6bf821fb727cb769a4096e5ddff74b14f459c206..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12288 zcmeI&y-ve05C?FVi3Nc`Vm4)V(f|wDU_n(?=+f@j*lMkOIEvj?U0`G4F?bDTo`N@F zz@e#xP=&eze@mB>owFnVqzq9!?u@#9ei?L_ZwK{d)h4|bD|EVC_kYS=EBcgN8|OU)!Fv2F0!E{ zF|M?nC~?tdwp2;XI4>wywxmSGyg3OkqNo{ Date: Mon, 5 Aug 2024 15:30:50 +0200 Subject: [PATCH 10/14] add wss unique secret name --- charts/celestia-node/values.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/celestia-node/values.yaml b/charts/celestia-node/values.yaml index c18d123..b8a3281 100644 --- a/charts/celestia-node/values.yaml +++ b/charts/celestia-node/values.yaml @@ -166,12 +166,12 @@ node: # IPv4 - /ip4/0.0.0.0/udp/2121/quic-v1/webtransport - /ip4/0.0.0.0/udp/2121/quic-v1 - #- /ip4/0.0.0.0/tcp/2122/wss + - /ip4/0.0.0.0/tcp/2122/wss - /ip4/0.0.0.0/tcp/2121 # IPv6 - /ip6/::/udp/2121/quic-v1/webtransport - /ip6/::/udp/2121/quic-v1 - #- /ip6/::/tcp/2122/wss + - /ip6/::/tcp/2122/wss - /ip6/::/tcp/2121 AnnounceAddresses: [] NoAnnounceAddresses: From b7e43672142f609aeb8a31ab275af5b8a1a68efd Mon Sep 17 00:00:00 2001 From: aWN4Y25pa2EK <19519604+aWN4Y25pa2EK@users.noreply.github.com> Date: Mon, 5 Aug 2024 15:31:57 +0200 Subject: [PATCH 11/14] add wss unique secret name --- charts/celestia-node/templates/statefulset.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/celestia-node/templates/statefulset.yaml b/charts/celestia-node/templates/statefulset.yaml index 197a681..239e181 100644 --- a/charts/celestia-node/templates/statefulset.yaml +++ b/charts/celestia-node/templates/statefulset.yaml @@ -278,11 +278,11 @@ spec: readOnly: false {{- if .Values.node.settings.wssTLS.enabled }} - name: tls-certs - mountPath: /home/celestia/tls/cert.pem + mountPath: {{ .Values.node.settings.home }}/tls/cert.pem subPath: fullchain.pem readOnly: true - name: tls-certs - mountPath: /home/celestia/tls/key.pem + mountPath: {{ .Values.node.settings.home }}/tls/key.pem subPath: privkey.pem readOnly: true {{- end }} From 6d4fc64df87962bdda6f880ce5d292d636f0c368 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=CE=9ETA?= <19519604+aWN4Y25pa2EK@users.noreply.github.com> Date: Wed, 7 Aug 2024 14:58:27 +0100 Subject: [PATCH 12/14] Update examples/celestia-node/lunar-bridge-6.yaml Co-authored-by: tty47 <32740567+tty47@users.noreply.github.com> --- examples/celestia-node/lunar-bridge-6.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/celestia-node/lunar-bridge-6.yaml b/examples/celestia-node/lunar-bridge-6.yaml index 6caa752..997d287 100644 --- a/examples/celestia-node/lunar-bridge-6.yaml +++ b/examples/celestia-node/lunar-bridge-6.yaml @@ -5,7 +5,7 @@ commonLabels: &commonLabels type: &nodeType bridge # check secretName: &secretName keys-da-bridge-6 # check pool: &pool pool-da-1 # check pool instance type to validate requests & limits - release: &release v0.14.0 + release: &release v0.14.1 service: external: annotations: From 655b529a994bfbad97a87bfe2cd320ccdeeee73c Mon Sep 17 00:00:00 2001 From: aWN4Y25pa2EK <19519604+aWN4Y25pa2EK@users.noreply.github.com> Date: Wed, 7 Aug 2024 16:00:39 +0200 Subject: [PATCH 13/14] add booleand for wssTLS volume mount --- charts/celestia-node/templates/statefulset.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/charts/celestia-node/templates/statefulset.yaml b/charts/celestia-node/templates/statefulset.yaml index 239e181..180c7d5 100644 --- a/charts/celestia-node/templates/statefulset.yaml +++ b/charts/celestia-node/templates/statefulset.yaml @@ -340,6 +340,7 @@ spec: path: OAZHALLLMV4Q - key: my_celes_key_info path: my_celes_key.info + {{ - if .Values.node.settings.wssTLS.enabled }} - name: tls-certs secret: secretName: {{ .Values.node.settings.wssTLS.name }} @@ -348,6 +349,7 @@ spec: path: fullchain.pem - key: privkey.pem path: privkey.pem + {{- end }} - name: address configMap: name: {{ template "common.names.fullname" . }}-address From 55e3fb62c813965a776f02a570bb874677ace217 Mon Sep 17 00:00:00 2001 From: aWN4Y25pa2EK <19519604+aWN4Y25pa2EK@users.noreply.github.com> Date: Wed, 7 Aug 2024 16:03:14 +0200 Subject: [PATCH 14/14] add booleand for wssTLS volume mount --- charts/celestia-node/Chart.yaml | 4 ++-- charts/celestia-node/values.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/charts/celestia-node/Chart.yaml b/charts/celestia-node/Chart.yaml index ede9ab5..8c5e5b3 100644 --- a/charts/celestia-node/Chart.yaml +++ b/charts/celestia-node/Chart.yaml @@ -2,7 +2,7 @@ annotations: category: celestia licenses: Apache-2.0 apiVersion: v2 -appVersion: v0.14.0 +appVersion: v0.14.1 dependencies: - name: common repository: oci://registry-1.docker.io/bitnamicharts @@ -21,4 +21,4 @@ maintainers: name: celestia-node sources: - https://github.com/celestiaorg/celestia-node -version: 0.1.2 +version: 0.1.4 diff --git a/charts/celestia-node/values.yaml b/charts/celestia-node/values.yaml index b8a3281..d7957e3 100644 --- a/charts/celestia-node/values.yaml +++ b/charts/celestia-node/values.yaml @@ -90,7 +90,7 @@ node: # -- repository for the image, celestiaorg/celestia-node by default repository: celestiaorg/celestia-node # -- tag for the image, v0.13.6 by default - tag: v0.14.0 + tag: v0.14.1 digest: "" ## Specify a imagePullPolicy ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'