feat: updates for dusk 2

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

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

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

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

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

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.

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