Skip to content
This repository has been archived by the owner on Jul 29, 2024. It is now read-only.

updating to newest release versions #179

Merged
merged 18 commits into from
Mar 11, 2024
Merged
Show file tree
Hide file tree
Changes from 16 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion charts/celestia-local/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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.5
version: 0.3.6

# 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
Expand Down
3 changes: 3 additions & 0 deletions charts/celestia-local/files/scripts/init-bridge.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,6 @@ celestia bridge init \
--core.grpc.port $celestia_app_grpc_port \
--gateway.port $bridge_host_port
cp -r "$home_dir/keyring-test" "$home_dir/bridge/keys/"

sed -i 's/PeersLimit = 5/PeersLimit = 1/' $home_dir/bridge/config.toml
sed -i 's/Low = 50/Low = 0/' $home_dir/bridge/config.toml
Comment on lines +18 to +19
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We don't need celestia local to have any peers, it shouldnt have any it's a one off instance.

4 changes: 3 additions & 1 deletion charts/celestia-local/files/scripts/start-bridge.sh
Original file line number Diff line number Diff line change
Expand Up @@ -59,4 +59,6 @@ exec celestia bridge start \
--gateway.port "$bridge_host_port" \
--rpc.addr 0.0.0.0 \
--rpc.port "$bridge_rpc_port" \
--keyring.accname "$validator_key_name"
--keyring.accname "$validator_key_name" \
--log.level "debug" \
--log.level.module "share/discovery:error"
Comment on lines +63 to +64
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cleaning up logs, and removing share discovery warnings about no networking, cleaner logs in case there is a celestia local issue.

7 changes: 7 additions & 0 deletions charts/celestia-local/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,13 @@ spec:
port: bridge-rest
failureThreshold: 30
periodSeconds: 10
resources:
requests:
cpu: 1
memory: 4Gi
limits:
cpu: 2
memory: 8Gi
Comment on lines +88 to +94
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Contraining bridge node on dev cluster since it can be an expensive service to run.

- name: token-server
image: {{ .Values.tokenServerImage }}
command: [ "/bin/httpd", "-v", "-f", "-p", "5353", "-h", "/home/celestia/token-server/" ]
Expand Down
53 changes: 53 additions & 0 deletions charts/celestia-local/templates/ingress.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
apiVersion: networking.k8s.io/v1
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added ingress which makes it possible to communicate directly with deployed Celestia app and bridge node from local machine.

kind: Ingress
metadata:
name: celestia-local-network-ingress
namespace: {{ $.Values.global.namespace }}
labels:
app: celestia-local-network
annotations:
nginx.ingress.kubernetes.io/proxy-read-timeout: "3600"
nginx.ingress.kubernetes.io/proxy-send-timeout: "3600"
spec:
ingressClassName: nginx
rules:
- host: rpc.node.celestia.localdev.me
http:
paths:
- path: /
pathType: Prefix
backend:
service:
name: celestia-service
port:
name: bridge-jsonrpc
- host: rest.node.celestia.localdev.me
http:
paths:
- path: /
pathType: Prefix
backend:
service:
name: celestia-service
port:
name: bridge-rest
- host: token.node.celestia.localdev.me
http:
paths:
- path: /
pathType: Prefix
backend:
service:
name: celestia-service
port:
name: token-svc
- host: rpc.app.celestia.localdev.me
http:
paths:
- path: /
pathType: Prefix
backend:
service:
name: celestia-app-service
port:
name: app-rpc
2 changes: 1 addition & 1 deletion charts/celestia-local/templates/storageclasses.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ apiVersion: storage.k8s.io/v1
kind: StorageClass
metadata:
name: {{ $value.persistentVolumeName }}-local
namespace: {{ .Values.global.namespace }}
namespace: {{ $.Values.global.namespace }}
# NOTE - gce-pd provisioner has not been tested yet
provisioner: kubernetes.io/no-provisioner
volumeBindingMode: WaitForFirstConsumer
Expand Down
2 changes: 1 addition & 1 deletion charts/celestia-local/templates/volumes.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ apiVersion: v1
kind: PersistentVolume
metadata:
name: {{ $value.persistentVolumeName }}-pv
namespace: {{ .Values.global.namespace }}
namespace: {{ $.Values.global.namespace }}
spec:
capacity:
storage: {{ $value.size }}
Expand Down
2 changes: 1 addition & 1 deletion charts/celestia-node/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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.1.11
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
Expand Down
31 changes: 28 additions & 3 deletions charts/celestia-node/templates/_helpers.tpl
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
{{/*
Namepsace to deploy elements into.
*/}}
{{- define "celestiaNode.namespace" -}}
{{- default .Release.Namespace .Values.global.namespaceOverride | trunc 63 | trimSuffix "-" -}}
{{- end }}

{{/*
Define the base label
*/}}
Expand All @@ -15,8 +22,26 @@ Define the service name
{{/*
Define the k8s path to rpc service
*/}}
{{- define "celestiaNode.service.adresses.rpc" -}}
http://{{ include "celestiaNode.service.name" . }}.{{ .Values.global.namespace }}.svc.cluster.local:{{ .Values.ports.celestia.rpc }}
{{- define "celestiaNode.service.addresses.base" -}}
{{ include "celestiaNode.service.name" . }}.{{ .Values.global.namespace }}.svc.cluster.local:{{ .Values.ports.celestia.rpc }}
{{- end }}


{{/*
Define the k8s path to rpc service as http rpc
*/}}
{{- define "celestiaNode.service.addresses.rpc" -}}
http://{{ include "celestiaNode.service.addresses.base" . }}
{{- end }}

{{/*
{{- end }}

{{/*
Define the k8s path to rpc service as ws
*/}}
{{- define "celestiaNode.service.addresses.ws" -}}
ws://{{ include "celestiaNode.service.addresses.base" . }}
{{- end }}

{{/*
Expand All @@ -28,7 +53,7 @@ Define the token service name
{{/*
Define the k8s path to token service
*/}}
{{- define "celestiaNode.service.adresses.token" -}}
{{- define "celestiaNode.service.addresses.token" -}}
http://{{ include "celestiaNode.service.token.name" . }}.{{ .Values.global.namespace }}.svc.cluster.local:{{ .Values.ports.tokenServer }}
{{- end }}

Expand Down
6 changes: 3 additions & 3 deletions charts/celestia-node/templates/configmap.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: v1
kind: ConfigMap
metadata:
name: {{ $label }}-files-env
namespace: {{ .Values.global.namespace }}
namespace: {{ include "celestiaNode.namespace" . }}
data:
config.toml: |
{{- tpl (.Files.Get "files/config.toml") $ | nindent 4 }}
Expand All @@ -12,7 +12,7 @@ apiVersion: v1
kind: ConfigMap
metadata:
name: {{ $label }}-scripts-env
namespace: {{ .Values.global.namespace }}
namespace: {{ include "celestiaNode.namespace" . }}
data:
start-node.sh: |
{{- tpl (.Files.Get "files/scripts/start-node.sh") $ | nindent 4 }}
Expand All @@ -23,7 +23,7 @@ apiVersion: v1
kind: ConfigMap
metadata:
name: {{ $label }}-env
namespace: {{ .Values.global.namespace }}
namespace: {{ include "celestiaNode.namespace" . }}
data:
CELESTIA_CUSTOM_TO_BE: {{ .Values.config.chainId }}:{{ $customInfo }}
{{- end }}
4 changes: 2 additions & 2 deletions charts/celestia-node/templates/service.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ kind: Service
apiVersion: v1
metadata:
name: {{ include "celestiaNode.service.name" . }}
namespace: {{ .Values.global.namespace }}
namespace: {{ include "celestiaNode.namespace" . }}
spec:
selector:
app: {{ $label }}
Expand All @@ -18,7 +18,7 @@ kind: Service
apiVersion: v1
metadata:
name: {{ include "celestiaNode.service.token.name" . }}
namespace: {{ .Values.global.namespace }}
namespace: {{ include "celestiaNode.namespace" . }}
spec:
selector:
app: {{ $label }}
Expand Down
2 changes: 1 addition & 1 deletion charts/celestia-node/templates/statefulset.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: {{ $label }}
labels:
app: {{ $label }}
namespace: {{ .Values.global.namespace }}
namespace: {{ include "celestiaNode.namespace" . }}
spec:
replicas: {{ .Values.global.replicaCount }}
selector:
Expand Down
2 changes: 1 addition & 1 deletion charts/celestia-node/templates/volumes.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ apiVersion: v1
kind: PersistentVolumeClaim
metadata:
name: {{ $label }}-{{ $key }}-pvc
namespace: {{ $.Values.global.namespace }}
namespace: {{ include "celestiaNode.namespace" $ }}
labels:
"app.kubernetes.io/name": "{{ $label }}-{{ $.Chart.Name }}"
"app.kubernetes.io/managed-by": {{ $.Release.Service | quote }}
Expand Down
4 changes: 2 additions & 2 deletions charts/celestia-node/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,18 @@
# This is a YAML-formatted file.
# Declare variables to be passed into your templates.
global:
namespace: "astria-dev-cluster"
namespaceOverride: ''
replicaCount: 1

config:
name: celestia-node
network: mocha-4
chainId: mocha-4
coreIp: "full.consensus.mocha-4.celestia-mocha.com"
configInfo: false
type: light
coreGrpcPort: 9090
tokenAuthLevel: 'read'
customInfo: ''
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

more technically correct, still falsey.


images:
pullPolicy: IfNotPresent
Expand Down
6 changes: 3 additions & 3 deletions charts/rollup/Chart.lock
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
dependencies:
- name: celestia-node
repository: file://../celestia-node
version: 0.1.11
digest: sha256:d8bafe8e16323154332ee709b38754df209a51d4577b1d9c80a29898d7733421
generated: "2024-01-22T12:37:57.716528-08:00"
version: 0.2.0
digest: sha256:d259cf4f2d0f17d0c70a2e88f9735ab011831410284dade0f5846677fc836ba4
generated: "2024-02-15T15:04:33.506122-08:00"
4 changes: 2 additions & 2 deletions charts/rollup/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ type: application
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)

version: 0.8.10
version: 0.9.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
Expand All @@ -26,7 +26,7 @@ appVersion: "0.5.2"

dependencies:
- name: celestia-node
version: "0.1.11"
version: "0.2.0"
repository: "file://../celestia-node"
condition: celestia-node.enabled

Expand Down
Binary file removed charts/rollup/charts/celestia-node-0.1.11.tgz
Binary file not shown.
Binary file added charts/rollup/charts/celestia-node-0.2.0.tgz
Binary file not shown.
8 changes: 7 additions & 1 deletion charts/rollup/files/genesis/geth-genesis.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,17 @@
"ethash": {},
{{- if .Values.config.rollup.genesis.extraDataOverride }}
"astriaExtraDataOverride": "{{ .Values.config.rollup.genesis.extraDataOverride }}",
{{ end -}}
{{- end }}
"astriaOverrideGenesisExtraData": {{ .Values.config.rollup.genesis.overrideGenesisExtraData }},
"astriaSequencerInitialHeight": {{ .Values.config.sequencer.initialBlockHeight }},
{{- if not .Values.global.dev }}
"astriaDataAvailabilityInitialHeight": {{ .Values.config.celestia.initialBlockHeight }},
"astriaDataAvailabilityHeightVariance": {{ .Values.config.celestia.heightVariance }}
{{- else }}
"astriaRollupName": "{{ .Values.config.rollup.name }}",
"astriaCelestiaInitialHeight": {{ .Values.config.celestia.initialBlockHeight }},
"astriaCelestiaHeightVariance": {{ .Values.config.celestia.heightVariance }}
{{- end }}
Comment on lines +22 to +29
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note pattern used throughout for configuration which might change between releases.

},
"difficulty": "10000000",
"gasLimit": "8000000",
Expand Down
19 changes: 19 additions & 0 deletions charts/rollup/templates/_helpers.tpl
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
{{/*
Namepsace to deploy elements into.
*/}}
{{- define "rollup.namespace" -}}
{{- default .Release.Namespace .Values.global.namespaceOverride | trunc 63 | trimSuffix "-" -}}
{{- end }}

{{/*
Expand the name of the chart.
*/}}
Expand All @@ -19,6 +26,18 @@ Selector labels
app: {{ include "rollup.name" . }}
{{- end }}

{{/*
Full image paths for Astria built images
*/}}
{{- define "rollup.image" -}}
{{ .Values.images.geth.repo }}:{{ if .Values.global.dev }}{{ .Values.images.geth.devTag }}{{ else }}{{ .Values.images.geth.tag }}{{ end }}
{{- end }}
{{- define "conductor.image" -}}
{{ .Values.images.conductor.repo }}:{{ if .Values.global.dev }}{{ .Values.images.conductor.devTag }}{{ else }}{{ .Values.images.conductor.tag }}{{ end }}
{{- end }}
{{- define "composer.image" -}}
{{ .Values.images.composer.repo }}:{{ if .Values.global.dev }}{{ .Values.images.composer.devTag }}{{ else }}{{ .Values.images.composer.tag }}{{ end }}
{{- end }}


{{/*
Expand Down
Loading
Loading