diff --git a/charts/rollup/Chart.yaml b/charts/rollup/Chart.yaml index e8063fc3..68c6337e 100644 --- a/charts/rollup/Chart.yaml +++ b/charts/rollup/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.5.0 +version: 0.6.0 # 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 diff --git a/charts/rollup/charts/celestia-node-0.1.0.tgz b/charts/rollup/charts/celestia-node-0.1.0.tgz index 6920974b..7bc7eedc 100644 Binary files a/charts/rollup/charts/celestia-node-0.1.0.tgz and b/charts/rollup/charts/celestia-node-0.1.0.tgz differ diff --git a/charts/rollup/templates/configmap.yaml b/charts/rollup/templates/configmap.yaml index 1237748f..42e4dad9 100644 --- a/charts/rollup/templates/configmap.yaml +++ b/charts/rollup/templates/configmap.yaml @@ -16,6 +16,10 @@ data: ASTRIA_CONDUCTOR_EXECUTION_COMMIT_LEVEL: "{{ .Values.config.rollup.executionCommitLevel }}" ASTRIA_CONDUCTOR_SEQUENCER_URL: "{{ .Values.config.sequencer.websocket }}" ASTRIA_CONDUCTOR_INITIAL_SEQUENCER_BLOCK_HEIGHT: "{{ .Values.config.sequencer.initialBlockHeight }}" + ASTRIA_CONDUCTOR_ENABLE_OPTIMISM: "{{ .Values.config.rollup.optimism.enabled }}" + ASTRIA_CONDUCTOR_ETHEREUM_L1_URL: "{{ .Values.config.rollup.optimism.ethereumL1Websocket }}" + ASTRIA_CONDUCTOR_OPTIMISM_PORTAL_CONTRACT_ADDRESS: "{{ .Values.config.rollup.optimism.portalContractAddress }}" + ASTRIA_CONDUCTOR_INITIAL_ETHEREUM_L1_BLOCK_HEIGHT: "{{ .Values.config.rollup.optimism.initialEthereumL1BlockHeight }}" --- apiVersion: v1 kind: ConfigMap diff --git a/charts/rollup/templates/ingress.yaml b/charts/rollup/templates/ingress.yaml index 27c0f313..79e95033 100644 --- a/charts/rollup/templates/ingress.yaml +++ b/charts/rollup/templates/ingress.yaml @@ -2,85 +2,65 @@ {{- $ingressApiIsStable := eq (include "rollup.ingress.isStable" .) "true" -}} {{- $ingressSupportsIngressClassName := eq (include "rollup.ingress.supportsIngressClassName" .) "true" -}} {{- $ingressSupportsPathType := eq (include "rollup.ingress.supportsPathType" .) "true" -}} -{{- $ingressPathType := .Values.ingress.pathType -}} -{{- $extraPaths := .Values.ingress.extraPaths -}} -apiVersion: networking.k8s.io/v1 + +{{- range $service, $ingress := .Values.ingress.services }} +{{- $servicePort := $ingress.service.port -}} +{{- $serviceName := $ingress.service.name -}} +{{- $ingressPath := $ingress.path -}} +{{- $ingressPathType := $ingress.pathType -}} +{{- $extraPaths := $ingress.extraPaths }} +--- +apiVersion: {{ include "rollup.ingress.apiVersion" $ }} kind: Ingress metadata: - name: {{ .Values.config.rollup.name }}-ingress - namespace: {{ .Values.global.namespace }} + name: {{ $.Values.config.rollup.name }}-{{ $service }}-ingress + namespace: {{ $.Values.global.namespace }} labels: - {{- with .Values.ingress.labels }} - {{- toYaml . | nindent 4 }} + {{- with $ingress.labels }} + {{- toYaml . | nindent 4 }} {{- end }} annotations: - {{- if .Values.ingress.annotations }} - {{- with .Values.ingress.annotations }} - {{- range $key, $value := . }} + kubernetes.io/ingress.class: {{ $.Values.ingress.className }} + {{- if $ingressApiIsStable }} + {{- range $key, $value := $ingress.annotations }} {{ $key }}: {{ tpl $value $ | quote }} - {{- end }} {{- end }} - {{- else }} - kubernetes.io/ingress.class: nginx {{- end }} spec: - {{- if and $ingressSupportsIngressClassName .Values.ingress.ingressClassName }} - ingressClassName: {{ .Values.ingress.ingressClassName }} + {{- if $ingressSupportsIngressClassName }} + ingressClassName: {{ $.Values.ingress.className }} {{- end -}} - {{- with .Values.ingress.defaultBackend }} + {{- with $ingress.service }} defaultBackend: - {{- tpl (toYaml .) $ | nindent 4 }} + service: + {{- tpl (toYaml .) $ | nindent 6 }} {{- end }} rules: - {{- if .Values.ingress.hosts }} - {{- with .Values.ingress.hosts }} - {{- tpl (toYaml .) $ | nindent 6 }} - {{- end }} - {{- with .Values.ingress.tls }} - tls: - {{- tpl (toYaml .) $ | nindent 4 }} - {{- end }} - {{- else }} - - host: executor.{{ .Values.config.rollup.name }}.{{ .Values.ingress.hostname }} - http: - paths: - - path: "/" - pathType: Prefix - backend: - service: - name: {{ .Values.config.rollup.name }}-evm-service - port: - name: json-rpc-svc - - host: ws-executor.{{ .Values.config.rollup.name }}.{{ .Values.ingress.hostname }} - http: - paths: - - path: "/" - pathType: Prefix - backend: - service: - name: {{ .Values.config.rollup.name }}-evm-service - port: - name: ws-rpc-svc - - host: faucet.{{ .Values.config.rollup.name }}.{{ .Values.ingress.hostname }} + {{- with $ingress.hosts }} + {{- range $host := . }} + - host: {{ tpl $host $ }} http: paths: - - path: "/" - pathType: Prefix + {{- with $extraPaths }} + {{- toYaml . | nindent 10 }} + {{- end }} + - path: {{ $ingressPath }} + {{- if $ingressSupportsPathType }} + pathType: {{ $ingressPathType }} + {{- end }} backend: - service: - name: {{ .Values.config.rollup.name }}-faucet-service - port: - name: faucet-svc - - host: blockscout.{{ .Values.config.rollup.name }}.{{ .Values.ingress.hostname }} - http: - paths: - - path: "/" - pathType: Prefix - backend: - service: - name: {{ .Values.config.rollup.name }}-blockscout-svc - port: - name: blockscout-svc - {{- end -}} + {{- if $ingressApiIsStable }} + service: + {{- tpl (toYaml $ingress.service) $ | nindent 16 }} + {{- else }} + serviceName: {{ tpl $serviceName $ }} + servicePort: {{ tpl $servicePort $ }} + {{- end }} + {{- end }} + {{- end }} + {{- if $ingress.tls }} + tls: + {{- tpl (toYaml $ingress.tls) $ | nindent 4 }} + {{- end }} +{{- end }} {{- end }} - diff --git a/charts/rollup/templates/secretproviderclass.yaml b/charts/rollup/templates/secretproviderclass.yaml index 665c85db..55bd7882 100644 --- a/charts/rollup/templates/secretproviderclass.yaml +++ b/charts/rollup/templates/secretproviderclass.yaml @@ -8,14 +8,14 @@ metadata: spec: provider: gcp secretObjects: - - secretName: {{ $key }} + - secretName: {{ kebabcase $key }} type: Opaque data: - objectName: {{ $value.filename }} key: {{ $value.key }} parameters: secrets: | - - resourceName: "{{ $value.resourceName }}" - filename: "{{ $value.filename }}" + - resourceName: {{ $value.resourceName }} + fileName: "{{ $value.filename }}" {{- end }} {{- end }} diff --git a/charts/rollup/templates/volumes.yaml b/charts/rollup/templates/volumes.yaml index 071d04ac..7c32f64a 100644 --- a/charts/rollup/templates/volumes.yaml +++ b/charts/rollup/templates/volumes.yaml @@ -34,7 +34,7 @@ apiVersion: v1 kind: PersistentVolumeClaim metadata: name: {{ $.Values.config.rollup.name }}-{{ $value.persistentVolumeName }}-pvc-geth - namespace: astria-dev-cluster + namespace: {{ $.Values.global.namespace }} labels: "app.kubernetes.io/name": "{{ $.Values.config.rollup.name }}-{{ $.Chart.Name }}" "app.kubernetes.io/managed-by": {{ $.Release.Service | quote }} @@ -53,7 +53,7 @@ apiVersion: v1 kind: PersistentVolumeClaim metadata: name: {{ $.Values.config.rollup.name }}-{{ $value.persistentVolumeName }}-pvc-blockscout - namespace: astria-dev-cluster + namespace: {{ $.Values.global.namespace }} labels: "app.kubernetes.io/name": {{ $.Values.config.rollup.name }}-{{ $.Chart.Name }} "app.kubernetes.io/managed-by": {{ $.Release.Service | quote }} diff --git a/charts/rollup/values.yaml b/charts/rollup/values.yaml index 41926321..cedfbced 100644 --- a/charts/rollup/values.yaml +++ b/charts/rollup/values.yaml @@ -27,6 +27,16 @@ config: - address: "0xaC21B97d35Bf75A7dAb16f35b111a50e78A72F30" # The balance must be a string due to size balance: "1000000000000000000000" + optimism: + # set to true to enable op-stack integration, and setup rest of config + enabled: false + # Websocket URL of Ethereum L1 node. + ethereumL1Websocket: "ws://127.0.0.1:8545" + # Contract address of the OptimismPortal contract on L1. + portalContractAddress: "" + # The block height of the Ethereum L1 chain that the + # OptimismPortal contract was deployed at. + initialEthereumL1BlockHeight: 1 faucet: # The account from which the faucet disburses funds, likely want to have @@ -76,7 +86,7 @@ celestia-node: images: # Core images for the rollup, developed for Astria geth: "ghcr.io/astriaorg/go-ethereum:0.4.1" - conductor: "ghcr.io/astriaorg/conductor:0.9.0--conductor" + conductor: "ghcr.io/astriaorg/conductor:0.10.0--conductor" composer: "ghcr.io/astriaorg/composer:0.2.5--composer" # Rollup faucet @@ -111,51 +121,78 @@ secretProvider: ingress: enabled: true - # This is only used when using the default hosts and not overriding below. - hostname: localdev.me - # For Kubernetes >= 1.18 you should specify the ingress-controller via the field ingressClassName - # See https://kubernetes.io/blog/2020/04/02/improvements-to-the-ingress-api-in-kubernetes-1.18/#specifying-the-class-of-an-ingress - # ingressClassName: nginx - # Values can be templated - annotations: {} - # kubernetes.io/ingress.class: nginx - # kubernetes.io/tls-acme: "true" labels: {} - hosts: {} - # - host: executor.example.com - # http: - # paths: - # - path: "/" - # pathType: Prefix - # backend: - # service: - # name: astria-evm-service - # port: - # name: json-rpc-svc - # - host: faucet.example.com - # http: - # paths: - # - path: "/" - # pathType: Prefix - # backend: - # service: - # name: astria-faucet-service - # port: - # name: faucet-svc - # - host: blockscout.example.com - # http: - # paths: - # - path: "/" - # pathType: Prefix - # backend: - # service: - # name: astria-blockscout-svc - # port: - # name: blockscout-svc - tls: {} - # - secretName: chart-example-tls - # hosts: - # - chart-example.local + hostname: localdev.me + className: nginx + services: + rpc: + hosts: + - executor.{{ .Values.config.rollup.name }}.{{ .Values.ingress.hostname }} + path: / + pathType: Prefix + service: + name: "{{ .Values.config.rollup.name }}-evm-service" + port: + name: json-rpc-svc + annotations: {} + # kubernetes.io/ingress.class: nginx + # kubernetes.io/tls-acme: "true" + labels: {} + tls: {} + # - secretName: chart-example-tls + # hosts: + # - chart-example.local + ws: + hosts: + - ws-executor.{{ .Values.config.rollup.name }}.{{ .Values.ingress.hostname }} + path: / + pathType: Prefix + service: + name: "{{ .Values.config.rollup.name }}-evm-service" + port: + name: ws-rpc-svc + annotations: {} + # kubernetes.io/ingress.class: nginx + # kubernetes.io/tls-acme: "true" + labels: {} + tls: {} + # - secretName: chart-example-tls + # hosts: + # - chart-example.local + faucet: + hosts: + - faucet.{{ .Values.config.rollup.name }}.{{ .Values.ingress.hostname }} + path: / + pathType: Prefix + service: + name: "{{ .Values.config.rollup.name }}-faucet-service" + port: + name: faucet-svc + annotations: {} + # kubernetes.io/ingress.class: nginx + # kubernetes.io/tls-acme: "true" + labels: {} + tls: {} + # - secretName: chart-example-tls + # hosts: + # - chart-example.local + explorer: + hosts: + - blockscout.{{ .Values.config.rollup.name }}.{{ .Values.ingress.hostname }} + path: / + pathType: Prefix + service: + name: "{{ .Values.config.rollup.name }}-blockscout-svc" + port: + name: blockscout-svc + annotations: {} + # kubernetes.io/ingress.class: nginx + # kubernetes.io/tls-acme: "true" + labels: {} + tls: {} + # - secretName: chart-example-tls + # hosts: + # - chart-example.local # Default persistent storage values # NOTE - `rollupName` will be used with `persistentVolumeName` to generate names for kubernetes resources. diff --git a/charts/sequencer-faucet/Chart.yaml b/charts/sequencer-faucet/Chart.yaml index 9a3091f1..53b0bca2 100644 --- a/charts/sequencer-faucet/Chart.yaml +++ b/charts/sequencer-faucet/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.2.4 +version: 0.3.0 # 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 diff --git a/charts/sequencer-faucet/templates/ingress.yaml b/charts/sequencer-faucet/templates/ingress.yaml index c4f10acf..e0b15378 100644 --- a/charts/sequencer-faucet/templates/ingress.yaml +++ b/charts/sequencer-faucet/templates/ingress.yaml @@ -2,12 +2,12 @@ {{- $ingressApiIsStable := eq (include "sequencer.ingress.isStable" .) "true" -}} {{- $ingressSupportsIngressClassName := eq (include "sequencer.ingress.supportsIngressClassName" .) "true" -}} {{- $ingressSupportsPathType := eq (include "sequencer.ingress.supportsPathType" .) "true" -}} -{{- $servicePort := .Values.ingress.service.port -}} -{{- $serviceName := .Values.ingress.service.name -}} +{{- $servicePort := tpl .Values.ingress.service.port.name . -}} +{{- $serviceName := tpl .Values.ingress.service.name . -}} {{- $ingressPath := .Values.ingress.path -}} {{- $ingressPathType := .Values.ingress.pathType -}} {{- $extraPaths := .Values.ingress.extraPaths -}} -apiVersion: networking.k8s.io/v1 +apiVersion: {{ include "sequencer.ingress.apiVersion" . }} kind: Ingress metadata: name: sequencer-faucet-ingress @@ -18,17 +18,19 @@ metadata: {{- end }} {{- with .Values.ingress.annotations }} annotations: + kubernetes.io/ingress.class: {{ $.Values.ingress.className }} {{- range $key, $value := . }} {{ $key }}: {{ tpl $value $ | quote }} {{- end }} {{- end }} spec: - {{- if and $ingressSupportsIngressClassName .Values.ingress.ingressClassName }} - ingressClassName: {{ .Values.ingress.ingressClassName }} + {{- if and $ingressSupportsIngressClassName .Values.ingress.className }} + ingressClassName: {{ .Values.ingress.className }} {{- end -}} - {{- with .Values.ingress.defaultBackend }} + {{- with .Values.ingress.service }} defaultBackend: - {{- tpl (toYaml .) $ | nindent 4 }} + service: + {{- tpl (toYaml .) $ | nindent 6 }} {{- end }} rules: {{- if .Values.ingress.hosts }} @@ -46,9 +48,7 @@ spec: backend: {{- if $ingressApiIsStable }} service: - name: {{ $serviceName }} - port: - number: {{ $servicePort }} + {{- tpl (toYaml $.Values.ingress.service) $ | nindent 16 }} {{- else }} serviceName: {{ $serviceName }} servicePort: {{ $servicePort }} @@ -58,16 +58,5 @@ spec: tls: {{- tpl (toYaml .) $ | nindent 4 }} {{- end }} - {{- else }} - - host: sequencer-faucet.localdev.me - http: - paths: - - path: "/" - pathType: Prefix - backend: - service: - name: sequencer-faucet-service - port: - name: seq-faucet-svc {{- end -}} {{- end }} diff --git a/charts/sequencer-faucet/templates/secretproviderclass.yaml b/charts/sequencer-faucet/templates/secretproviderclass.yaml index 0652f5ea..1d44aba5 100644 --- a/charts/sequencer-faucet/templates/secretproviderclass.yaml +++ b/charts/sequencer-faucet/templates/secretproviderclass.yaml @@ -15,7 +15,7 @@ spec: key: {{ $value.key }} parameters: secrets: | - - resourceName: "{{ $value.resourceName }}" - filename: "{{ $value.filename }}" + - resourceName: {{ $value.resourceName }} + fileName: "{{ $value.filename }}" {{- end }} {{- end }} diff --git a/charts/sequencer-faucet/values.yaml b/charts/sequencer-faucet/values.yaml index a21e694d..2887c7c2 100644 --- a/charts/sequencer-faucet/values.yaml +++ b/charts/sequencer-faucet/values.yaml @@ -38,24 +38,19 @@ ingress: # See https://kubernetes.io/blog/2020/04/02/improvements-to-the-ingress-api-in-kubernetes-1.18/#specifying-the-class-of-an-ingress # ingressClassName: nginx # Values can be templated + className: nginx annotations: {} # kubernetes.io/ingress.class: nginx # kubernetes.io/tls-acme: "true" labels: {} - path: {} - # pathType is only for k8s >= 1.1= + path: / pathType: Prefix - hosts: {} - # - chart-example.local - service: {} - # name: sequencer-faucet-service - # port: - # name: seq-faucet-svc - defaultBackend: {} - # service: - # name: sequencer-faucet-service - # port: - # name: seq-faucet-svc + hosts: + - sequencer-faucet.localdev.me + service: + name: sequencer-faucet-service + port: + name: seq-faucet-svc ## Extra paths to prepend to every host configuration. This is useful when working with annotation based services. extraPaths: {} # - path: /* diff --git a/charts/sequencer-relayer/Chart.yaml b/charts/sequencer-relayer/Chart.yaml index 9f47f438..68e20b77 100644 --- a/charts/sequencer-relayer/Chart.yaml +++ b/charts/sequencer-relayer/Chart.yaml @@ -15,13 +15,13 @@ 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.1.0 +version: 0.2.0 # 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.1.0" +appVersion: "0.2.0" maintainers: - name: wafflesvonmaple diff --git a/charts/sequencer-relayer/files/scripts/start-relayer.sh b/charts/sequencer-relayer/files/scripts/start-relayer.sh index 97aeddd7..2f6acb69 100644 --- a/charts/sequencer-relayer/files/scripts/start-relayer.sh +++ b/charts/sequencer-relayer/files/scripts/start-relayer.sh @@ -2,17 +2,21 @@ set -o errexit -o nounset -o pipefail -# FIXME - how to use `token-svc` port here instead of hardcoding? -BEARER_TOKEN=$(wget -qO- http://celestia-service:5353) +echo "Starting the Astria Sequencer Relayer..." +if [ -z "$ASTRIA_SEQUENCER_RELAYER_CELESTIA_BEARER_TOKEN" ]; then + echo "Fetching the Celestia bearer token..." + # FIXME - how to use `token-svc` port here instead of hardcoding? + BEARER_TOKEN=$(wget -qO- $TOKEN_SERVER) -if [ -z "$BEARER_TOKEN" ]; then - echo "Failed to fetch the Celestia bearer token." - exit 1 -fi - -echo "Celestia Bearer token fetched successfully." + if [ -z "$BEARER_TOKEN" ]; then + echo "Failed to fetch the Celestia bearer token." + exit 1 + fi -export ASTRIA_SEQUENCER_RELAYER_CELESTIA_BEARER_TOKEN="$BEARER_TOKEN" + echo "Celestia Bearer token fetched successfully." + export ASTRIA_SEQUENCER_RELAYER_CELESTIA_BEARER_TOKEN="$BEARER_TOKEN" +fi +echo "ASTRIA_SEQUENCER_RELAYER_CELESTIA_BEARER_TOKEN set" /usr/local/bin/astria-sequencer-relayer diff --git a/charts/sequencer-relayer/templates/configmaps.yaml b/charts/sequencer-relayer/templates/configmaps.yaml index b2982f9f..071e6dc8 100644 --- a/charts/sequencer-relayer/templates/configmaps.yaml +++ b/charts/sequencer-relayer/templates/configmaps.yaml @@ -7,11 +7,12 @@ data: ASTRIA_SEQUENCER_RELAYER_LOG: "astria_sequencer_relayer=debug" ASTRIA_SEQUENCER_RELAYER_SEQUENCER_ENDPOINT: "{{ .Values.config.relayer.sequencerRpc }}" ASTRIA_SEQUENCER_RELAYER_CELESTIA_ENDPOINT: "{{ .Values.config.relayer.celestiaRpc }}" - ASTRIA_SEQUENCER_RELAYER_GAS_LIMIT: "1000000" ASTRIA_SEQUENCER_RELAYER_BLOCK_TIME: "1000" ASTRIA_SEQUENCER_RELAYER_VALIDATOR_KEY_FILE: /cometbft/config/priv_validator_key.json ASTRIA_SEQUENCER_RELAYER_RPC_PORT: "{{ .Values.ports.relayerRPC }}" ASTRIA_SEQUENCER_RELAYER_RELAY_ONLY_VALIDATOR_KEY_BLOCKS: "false" + ASTRIA_SEQUENCER_RELAYER_CELESTIA_BEARER_TOKEN: "{{ .Values.config.relayer.celestiaBearerToken }}" + TOKEN_SERVER: "{{ .Values.config.relayer.tokenServer }}" --- apiVersion: v1 kind: ConfigMap diff --git a/charts/sequencer-relayer/values.yaml b/charts/sequencer-relayer/values.yaml index 28fc679a..0d32e2e5 100644 --- a/charts/sequencer-relayer/values.yaml +++ b/charts/sequencer-relayer/values.yaml @@ -10,12 +10,14 @@ global: config: relayer: + celestiaBearerToken: "" celestiaRpc: http://celestia-service.astria-dev-cluster.svc.cluster.local:26658 - sequencerRpc: http://node0-sequencer-rpc-service.astria-dev-cluster.svc.cluster.local:26657 + tokenServer: http://celestia-service.astria-dev-cluster.svc.cluster.local:5353 + sequencerRpc: "" # sequencer core images images: - sequencerRelayer: ghcr.io/astriaorg/sequencer-relayer:0.7.0--sequencer-relayer + sequencerRelayer: ghcr.io/astriaorg/sequencer-relayer:0.8.0--sequencer-relayer ports: relayerRPC: 2450 diff --git a/charts/sequencer/Chart.lock b/charts/sequencer/Chart.lock index a609088c..a8604556 100644 --- a/charts/sequencer/Chart.lock +++ b/charts/sequencer/Chart.lock @@ -1,6 +1,6 @@ dependencies: - name: sequencer-relayer repository: file://../sequencer-relayer - version: 0.1.0 -digest: sha256:b590f80d592cca01e643d5b55ac539aa8a0ff57f6d0956c6b0bd0997d04e484e -generated: "2023-11-09T19:41:12.348179+03:00" + version: 0.2.0 +digest: sha256:e4bf6b0b4488f90c4c7240039c06dc4e2034149a7f0ec2b1d1cf9532942c9235 +generated: "2023-11-19T20:10:10.344601+03:00" diff --git a/charts/sequencer/Chart.yaml b/charts/sequencer/Chart.yaml index 94df603e..52c980bc 100644 --- a/charts/sequencer/Chart.yaml +++ b/charts/sequencer/Chart.yaml @@ -15,17 +15,17 @@ 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.6.0 +version: 0.7.0 # 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.6.0" +appVersion: "0.7.0" dependencies: - name: sequencer-relayer - version: "0.1.0" + version: "0.2.0" repository: "file://../sequencer-relayer" condition: sequencer-relayer.enabled diff --git a/charts/sequencer/charts/sequencer-relayer-0.1.0.tgz b/charts/sequencer/charts/sequencer-relayer-0.1.0.tgz deleted file mode 100644 index 4fe1d054..00000000 Binary files a/charts/sequencer/charts/sequencer-relayer-0.1.0.tgz and /dev/null differ diff --git a/charts/sequencer/charts/sequencer-relayer-0.2.0.tgz b/charts/sequencer/charts/sequencer-relayer-0.2.0.tgz new file mode 100644 index 00000000..0e62e250 Binary files /dev/null and b/charts/sequencer/charts/sequencer-relayer-0.2.0.tgz differ diff --git a/charts/sequencer/values.yaml b/charts/sequencer/values.yaml index 07e3eeec..27f84876 100644 --- a/charts/sequencer/values.yaml +++ b/charts/sequencer/values.yaml @@ -75,8 +75,7 @@ sequencer-relayer: # sequencer core images images: cometBFT: docker.io/cometbft/cometbft:v0.37.x - sequencer: ghcr.io/astriaorg/sequencer:0.5.0--sequencer - sequencerRelayer: ghcr.io/astriaorg/sequencer-relayer:0.6.0--sequencer-relayer + sequencer: ghcr.io/astriaorg/sequencer:0.6.0--sequencer ports: cometBFTP2P: 26656 diff --git a/justfile b/justfile index 4383d1e5..9422e2e4 100644 --- a/justfile +++ b/justfile @@ -25,7 +25,7 @@ load-image image: kind load docker-image {{image}} --name astria-dev-cluster deploy-chart chart: - helm install --debug {{chart}}-chart ./charts/{{chart}} + helm install --debug --dry-run {{chart}}-chart ./charts/{{chart}} delete-chart chart: helm uninstall {{chart}}-chart diff --git a/values/validators/node0.yml b/values/validators/node0.yml index fb2bf754..bcc822af 100644 --- a/values/validators/node0.yml +++ b/values/validators/node0.yml @@ -47,7 +47,6 @@ ingress: sequencer-relayer: enabled: true config: - useTTY: true relayer: celestiaRpc: http://celestia-service.astria-dev-cluster.svc.cluster.local:26658 sequencerRpc: http://node0-sequencer-rpc-service.astria-dev-cluster.svc.cluster.local:26657