updating to newest release versions (#179)

This is a wide sweeping PR with many updates two overarching goals:
- Update dev-cluster to make latest work with dev-cluster
- Enable managing "release" charts and "development" within a single
chart.

Additionally there have been some changes to make charts more
generically semantically correct and changes made during debug process
which will hopefully aid future development.

The core of these changes are adding to our main charts a
`.Values.global.dev` flag which defaults to false. There is then a
pattern setup through out the charts to manage dev pieces, such as
images and the more various configuration changes.

Image tags have been split up to now feature a `tag` and `devTag` field.
The goal should be for the charts to work with our latest produced
images at all times. In places where we have changes in chart and
configuration required for latest we use the following pattern to make
updating for new releases easy:

```
{{ if not .Values.global.dev }}
< Anything which should be removed when next release is cut >
{{ else }}
< Anything which becomes standard when next release is cut >
{{ end }}
```

Additional changes:
- utilize `.Release.namespace` as default, moving
`.Values.global.namespace` to `.Values.global.namespaceOverride`
- Added a k8s file for metrics server which can run locally
- Added resource limit configuration for rollup
- Simplified Rollup definition to no longer have a `chainId` and a
`name` matching changes made in monorepo to disambiguate `chainId`
- disable peering for geth node
- update the celestia-local configuration to be less noisy, more useful
for debugging in test environment

charts/celestia-local/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.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

charts/celestia-local/files/scripts/init-bridge.sh

@@ -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

charts/celestia-local/files/scripts/start-bridge.sh

@@ -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"

charts/celestia-local/templates/deployment.yaml

@@ -85,6 +85,13 @@ spec:
               port: bridge-rest
             failureThreshold: 30
             periodSeconds: 10
+          resources:
+            requests:
+              cpu: 1
+              memory: 4Gi
+            limits:
+              cpu: 2
+              memory: 8Gi
         - name: token-server
           image: {{ .Values.tokenServerImage }}
           command: [ "/bin/httpd", "-v", "-f", "-p", "5353", "-h", "/home/celestia/token-server/" ]

charts/celestia-local/templates/ingress.yaml

@@ -0,0 +1,53 @@
+apiVersion: networking.k8s.io/v1
+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

charts/celestia-local/templates/storageclasses.yaml

@@ -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

charts/celestia-local/templates/volumes.yaml

@@ -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 }}

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.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

charts/celestia-node/templates/_helpers.tpl

@@ -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
 */}}
@@ -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 }}
 
 {{/*
@@ -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 }}
 

charts/celestia-node/templates/configmap.yaml

@@ -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 }}
@@ -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 }}
@@ -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 }}

charts/celestia-node/templates/service.yaml

@@ -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 }}
@@ -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 }}

charts/celestia-node/templates/statefulset.yaml

@@ -6,7 +6,7 @@ metadata:
   name: {{ $label }}
   labels:
     app: {{ $label }}
-  namespace: {{ .Values.global.namespace }}
+  namespace: {{ include "celestiaNode.namespace" . }}
 spec:
   replicas: {{ .Values.global.replicaCount }}
   selector:

charts/celestia-node/templates/volumes.yaml

@@ -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 }}

charts/celestia-node/values.yaml

@@ -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: ''
 
 images:
   pullPolicy: IfNotPresent

charts/rollup/Chart.lock

@@ -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"

charts/rollup/Chart.yaml

@@ -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
@@ -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
 

charts/rollup/files/genesis/geth-genesis.json

@@ -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 }}
     },
     "difficulty": "10000000",
     "gasLimit": "8000000",

charts/rollup/templates/_helpers.tpl

@@ -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.
 */}}
@@ -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 }}
 
 
 {{/*