celestia-node chart as subchart of evm-stack (#1403)

## Summary
A change to dependency level in our charts, `celestia-node` will now be
a direct sub chart of the `evm-stack`
## Background
Changes to the way our chart works broke celestia-node chart deployment
duo to dependency level issues, this PR aims to fix it.
## Changes
- moved celestia-node to be a dependency of evm-stack instead of
evm-rollup
- remove TOKEN_SERVER_URL and token server functionality
- remove token-svc

## Testing
Tested against a local k8 cluster, both with celestia-node enabled and
disabled

## Breaking changes
Non breaking but as default celestia auth is disabled, in case there is
a need for a token with read/write access user with ssh access will have
to fetch the key manually for conductor to operate properly.
## Related Issues
closes #1362

charts/celestia-node/Chart.yaml

@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.3.4
+version: 0.3.5
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
@@ -26,6 +26,8 @@ appVersion: "0.14.1"
 maintainers:
   - name: wafflesvonmaple
     url: astria.org
+  - name: quasystaty1
+    url: astria.org
   - name: steezeburger
     url: astria.org
   - name: joroshiba

charts/celestia-node/templates/service.yaml

@@ -14,16 +14,3 @@ spec:
       targetPort: {{ $name }}
   {{- end }}
 ---
-kind: Service
-apiVersion: v1
-metadata:
-  name: {{ include "celestiaNode.service.token.name" . }}
-  namespace: {{ include "celestiaNode.namespace" . }}
-spec:
-  selector:
-    app: {{ $label }}
-  ports:
-    - name: token-svc
-      port: {{ .Values.ports.tokenServer }}
-      targetPort: token-svc
----

charts/celestia-node/values.yaml

@@ -24,7 +24,6 @@ images:
 ports:
   celestia:
     rpc: 26658
-  tokenServer: 5353
 
 resources:
   requests:

charts/evm-rollup/Chart.yaml

@@ -15,20 +15,14 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.26.0
+version: 0.26.1
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
 appVersion: "0.14.0"
 
-dependencies:
-  - name: celestia-node
-    version: "0.3.4"
-    repository: "file://../celestia-node"
-    condition: celestia-node.enabled
-
 maintainers:
   - name: wafflesvonmaple
     url: astria.org

charts/evm-rollup/templates/configmap.yaml

@@ -5,13 +5,8 @@ metadata:
   namespace: {{ include "rollup.namespace" . }}
 data:
   ASTRIA_CONDUCTOR_LOG: "astria_conductor={{ .Values.config.logLevel }}"
-  {{- if (index .Values "celestia-node").enabled }}
-  TOKEN_SERVER_URL: "{{ include "celestiaNode.service.addresses.token" (index .Subcharts "celestia-node") }}"
-  ASTRIA_CONDUCTOR_CELESTIA_NODE_HTTP_URL: "{{ include "celestiaNode.service.addresses.rpc" (index .Subcharts "celestia-node") }}"
-  {{- else }}
-  TOKEN_SERVER_URL: "{{ .Values.config.celestia.token }}"
   ASTRIA_CONDUCTOR_CELESTIA_NODE_HTTP_URL: "{{ .Values.config.celestia.rpc }}"
-  {{- end }}
+  ASTRIA_CONDUCTOR_CELESTIA_BEARER_TOKEN: "{{ .Values.config.celestia.token }}"
   ASTRIA_CONDUCTOR_CELESTIA_BLOCK_TIME_MS: "12000"
   ASTRIA_CONDUCTOR_EXECUTION_RPC_URL: "http://127.0.0.1:{{ .Values.ports.executionGRPC }}"
   ASTRIA_CONDUCTOR_EXECUTION_COMMIT_LEVEL: "{{ .Values.config.conductor.executionCommitLevel }}"

charts/evm-rollup/values.yaml

@@ -183,24 +183,6 @@ config:
     rpc: ""
     token: ""
 
-celestia-node:
-  # Strongly recommend leaving enabled when not doing `SoftOnly` execution
-  enabled: true
-  # By default the celestia node deploys on top of the Celestia testnet mocha network
-  config:
-    labelPrefix: astria
-    type: light
-    tokenAuthLevel: false  # Set to false to disable auth
-    # You can deploy on top of a custom celestia network, uncomment below and
-    # update fields with notes
-    # network: custom
-    # chainId: test
-    # # The below information will depend on your local celestia deployment,
-    # # using the default generated when deploying "celestia-local" chart
-    # coreIp: celestia-service.astria-dev-cluster.svc.cluster.local
-    # # The custom info below must be grabbed from the custom network bridge on startup
-    # customInfo: "<GENESIS_HASH>:<BRIDGE_MULTIADDRESS>"
-
 metrics:
   # set to enable prometheus metrics
   enabled: false

charts/evm-stack/Chart.lock

@@ -1,7 +1,10 @@
 dependencies:
+- name: celestia-node
+  repository: file://../celestia-node
+  version: 0.3.5
 - name: evm-rollup
   repository: file://../evm-rollup
-  version: 0.26.0
+  version: 0.26.1
 - name: composer
   repository: file://../composer
   version: 0.1.2
@@ -17,5 +20,5 @@ dependencies:
 - name: blockscout-stack
   repository: https://blockscout.github.io/helm-charts
   version: 1.6.2
-digest: sha256:64f8e1505a7e13fadee33ff8601eabf02879956e0fc987fc7fdfbe7466d476eb
-generated: "2024-08-22T13:56:12.338127-07:00"
+digest: sha256:6406abf0864a14a8268dc0c78512ca5d18779e9f20dac8ad540399ddcfbe062c
+generated: "2024-08-28T09:44:42.794673-04:00"

charts/evm-stack/Chart.yaml

@@ -15,11 +15,15 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.4.0
+version: 0.4.1
 
 dependencies:
+  - name: celestia-node
+    version: "0.3.5"
+    repository: "file://../celestia-node"
+    condition: celestia-node.enabled
   - name: evm-rollup
-    version: 0.26.0
+    version: 0.26.1
     repository: "file://../evm-rollup"
   - name: composer
     version: 0.1.2
@@ -52,5 +56,7 @@ appVersion: "0.1.0"
 maintainers:
   - name: wafflesvonmaple
     url: astria.org
+  - name: quasystaty1
+    url: astria.org
   - name: joroshiba
     url: astria.org

charts/evm-stack/values.yaml

@@ -39,6 +39,9 @@ evm-rollup:
     otlpHeaders: "{{ .Values.global.otel.otlpHeaders }}"
     traceHeaders: "{{ .Values.global.otel.traceHeaders }}"
 
+celestia-node:
+  enabled: false
+
 composer:
   enabled: false
   config:

dev/values/rollup/dev.yaml

@@ -118,9 +118,6 @@ evm-rollup:
         cpu: 2
         memory: 1Gi
 
-  celestia-node:
-    enabled: false
-
   storage:
     enabled: false
 
@@ -131,6 +128,9 @@ evm-rollup:
         enabled: true
       ws:
         enabled: true
+
+celestia-node:
+  enabled: false
 
 composer:
   enabled: true