From 260f792b8e292ea3828a820b62e8f8d69c7d663f Mon Sep 17 00:00:00 2001 From: Enderson Maia Date: Mon, 4 Dec 2023 10:01:41 +0000 Subject: [PATCH] fixup! feat: adapt to rollups-node:1.2.0 --- charts/rollups-node/ci/test-values.yaml.tpl | 30 +++++++++++++++++++ .../authority-claimer-deployment.yaml | 1 - .../templates/dispatcher-deployment.yaml | 2 -- 3 files changed, 30 insertions(+), 3 deletions(-) diff --git a/charts/rollups-node/ci/test-values.yaml.tpl b/charts/rollups-node/ci/test-values.yaml.tpl index 43ce5eb..6862d02 100644 --- a/charts/rollups-node/ci/test-values.yaml.tpl +++ b/charts/rollups-node/ci/test-values.yaml.tpl @@ -16,6 +16,20 @@ global: tag: 1.2.0-rc.3 extraDeploy: + - apiVersion: v1 + kind: ConfigMap + metadata: + namespace: "{{ .Release.Namespace }}" + name: "{{ .Release.Name }}-sepolia-deployment" + data: + "sepolia.json": | + { + "contracts": { + "Authority": { "address": "0x5827Ec9365D3a9b27bF1dB982d258Ad234D37242" }, + "History": { "address": "0x76f4dCaC0920826541EE718214EEE4be07346cEE" }, + "InputBox": { "address": "0x59b22D57D4f067708AB0c00552767405926dc768" } + } + } - apiVersion: v1 kind: ConfigMap metadata: @@ -74,8 +88,24 @@ dispatcher: extraEnvVarsCM: "{{ .Release.Name }}-dispatcher" healthCheck: enabled: true + extraVolumes: + - name: sepolia-deployment + configMap: + name: "{{ .Release.Name }}-sepolia-deployment" + extraVolumeMounts: + - name: sepolia-deployment + mountPath: /opt/cartesi/share/deployments + readOnly: true authorityClaimer: extraEnvVarsCM: "{{ .Release.Name }}-authority-claimer" + extraVolumes: + - name: sepolia-deployment + configMap: + name: "{{ .Release.Name }}-sepolia-deployment" + extraVolumeMounts: + - name: sepolia-deployment + mountPath: /opt/cartesi/share/deployments + readOnly: true stateServer: extraEnvVarsCM: "{{ .Release.Name }}-state-server" serverManager: diff --git a/charts/rollups-node/templates/authority-claimer-deployment.yaml b/charts/rollups-node/templates/authority-claimer-deployment.yaml index f3eec63..3ce285f 100644 --- a/charts/rollups-node/templates/authority-claimer-deployment.yaml +++ b/charts/rollups-node/templates/authority-claimer-deployment.yaml @@ -54,7 +54,6 @@ spec: - --rollups-deployment-file=/opt/cartesi/share/deployments/localhost.json - --dapp-deployment-file=/deployments/localhost/dapp.json {{- else }} - - {{ print "--rollups-deployment-file=/opt/cartesi/share/deployments/" (required "A valid .Values.dapp.network is required" .Values.dapp.network | replace "-" "_") ".json" | quote }} - {{ print "--dapp-address=" (required "A valid .Values.dapp.contractAddress is required" .Values.dapp.contractAddress) | quote }} - {{ print "--dapp-deploy-block-hash=" (required "A valid .Values.dapp.blockHash is required" .Values.dapp.blockHash) | quote }} {{- end }} diff --git a/charts/rollups-node/templates/dispatcher-deployment.yaml b/charts/rollups-node/templates/dispatcher-deployment.yaml index f1db985..0bcb086 100644 --- a/charts/rollups-node/templates/dispatcher-deployment.yaml +++ b/charts/rollups-node/templates/dispatcher-deployment.yaml @@ -55,7 +55,6 @@ spec: - --rollups-deployment-file=/opt/cartesi/share/deployments/localhost.json - --dapp-deployment-file=/deployments/localhost/dapp.json {{- else }} - - {{ print "--rollups-deployment-file=/opt/cartesi/share/deployments/" (required "A valid .Values.dapp.network is required" .Values.dapp.network | replace "-" "_") ".json" | quote }} - {{ print "--dapp-address=" (required "A valid .Values.dapp.contractAddress is required" .Values.dapp.contractAddress) | quote }} - {{ print "--dapp-deploy-block-hash=" (required "A valid .Values.dapp.blockHash is required" .Values.dapp.blockHash) | quote }} {{- end }} @@ -64,7 +63,6 @@ spec: {{- end }} - {{ print (include "validator.redisConfig" .) | quote }} {{- range .Values.dispatcher.args }} - - {{ . | quote}} {{- end }} {{- range .Values.dispatcher.extraArgs }} - {{ . | quote}}