From 74fdea0a90548e538fcbf9a6edf3e268cba6c36f Mon Sep 17 00:00:00 2001 From: hfuss Date: Mon, 8 Aug 2022 15:31:52 -0400 Subject: [PATCH 1/4] outlining evmconnect Signed-off-by: hfuss --- charts/firefly/Chart.yaml | 4 +- charts/firefly/templates/_helpers.tpl | 20 ++- .../firefly/templates/evmconnect/secret.yaml | 43 ++++++ .../firefly/templates/evmconnect/service.yaml | 35 +++++ .../templates/evmconnect/statefulset.yaml | 134 ++++++++++++++++++ charts/firefly/values.yaml | 7 +- 6 files changed, 236 insertions(+), 7 deletions(-) create mode 100644 charts/firefly/templates/evmconnect/secret.yaml create mode 100644 charts/firefly/templates/evmconnect/service.yaml create mode 100644 charts/firefly/templates/evmconnect/statefulset.yaml diff --git a/charts/firefly/Chart.yaml b/charts/firefly/Chart.yaml index 8a86a72..992ac97 100644 --- a/charts/firefly/Chart.yaml +++ b/charts/firefly/Chart.yaml @@ -18,8 +18,8 @@ apiVersion: v2 name: firefly description: A Helm chart for deploying FireFly and FireFly HTTPS Dataexchange onto Kubernetes. type: application -appVersion: "1.0.4" -version: "0.5.6" +appVersion: "1.1.0" +version: "0.6.0" maintainers: - name: hfuss diff --git a/charts/firefly/templates/_helpers.tpl b/charts/firefly/templates/_helpers.tpl index 25a3455..6d9ea22 100644 --- a/charts/firefly/templates/_helpers.tpl +++ b/charts/firefly/templates/_helpers.tpl @@ -113,9 +113,6 @@ app.kubernetes.io/managed-by: {{ .Release.Service }} app.kuberentes.io/part-of: {{ .Chart.Name }} {{- end }} -{{/* -Common labels -*/}} {{- define "firefly.ethconnectLabels" -}} helm.sh/chart: {{ include "firefly.chart" . }} {{ include "firefly.ethconnectSelectorLabels" . }} @@ -126,6 +123,16 @@ app.kubernetes.io/managed-by: {{ .Release.Service }} app.kuberentes.io/part-of: {{ .Chart.Name }} {{- end }} +{{- define "firefly.evmconnectLabels" -}} +helm.sh/chart: {{ include "firefly.chart" . }} +{{ include "firefly.evmconnectSelectorLabels" . }} +{{- if .Chart.AppVersion }} +app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} +{{- end }} +app.kubernetes.io/managed-by: {{ .Release.Service }} +app.kuberentes.io/part-of: {{ .Chart.Name }} +{{- end }} + {{/* Selector labels */}} @@ -159,10 +166,17 @@ app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/component: ethconnect {{- end }} +<<<<<<< HEAD {{- define "firefly.sandboxSelectorLabels" -}} app.kubernetes.io/name: {{ include "firefly.name" . }} app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/component: sandbox +======= +{{- define "firefly.evmconnectSelectorLabels" -}} +app.kubernetes.io/name: {{ include "firefly.name" . }} +app.kubernetes.io/instance: {{ .Release.Name }} +app.kubernetes.io/component: evmconnect +>>>>>>> a3e9662 (outlining evmconnect) {{- end }} {{- define "firefly.ethconnectRegisterContractsJobName" -}} diff --git a/charts/firefly/templates/evmconnect/secret.yaml b/charts/firefly/templates/evmconnect/secret.yaml new file mode 100644 index 0000000..59ea671 --- /dev/null +++ b/charts/firefly/templates/evmconnect/secret.yaml @@ -0,0 +1,43 @@ +{{/* + Copyright © 2022 Kaleido, Inc. + + SPDX-License-Identifier: Apache-2.0 + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://swww.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +*/}} + +{{- if .Values.evmconnect.enabled }} +apiVersion: v1 +kind: Secret +metadata: + name: {{ include "firefly.fullname" . }}-evmconnect-config + labels: + {{- include "firefly.evmconnectLabels" . | nindent 4 }} +stringData: + # TODO + config.yaml: |- + rest: + rest-gateway: + rpc: + url: {{ tpl .Values.evmconnect.config.jsonRpcUrl . }} + openapi: + eventPollingIntervalSec: {{ .Values.evmconnect.config.eventPollingIntervalSec }} + storagePath: /var/run/evmconnect/abis + eventsDB: /var/run/evmconnect/events + catchupModePageSize: {{ .Values.evmconnect.config.catchupModePageSize }} + catchupModeBlockGap: {{ .Values.evmconnect.config.catchupModeBlockGap }} + http: + port: {{ .Values.evmconnect.service.apiPort }} + maxTXWaitTime: {{ .Values.evmconnect.config.maxTXWaitTimeSec }} + maxInFlight: {{ .Values.evmconnect.config.maxInFlight }} +{{- end }} diff --git a/charts/firefly/templates/evmconnect/service.yaml b/charts/firefly/templates/evmconnect/service.yaml new file mode 100644 index 0000000..8064cfe --- /dev/null +++ b/charts/firefly/templates/evmconnect/service.yaml @@ -0,0 +1,35 @@ +{{/* + Copyright © 2022 Kaleido, Inc. + + SPDX-License-Identifier: Apache-2.0 + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://swww.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +*/}} + +{{- if .Values.evmconnect.enabled }} +apiVersion: v1 +kind: Service +metadata: + name: {{ include "firefly.fullname" . }}-evmconnect + labels: + {{- include "firefly.evmconnectLabels" . | nindent 4 }} +spec: + type: {{ .Values.evmconnect.service.type }} + ports: + - port: {{ .Values.evmconnect.service.apiPort }} + targetPort: http + protocol: TCP + name: http + selector: + {{- include "firefly.evmconnectSelectorLabels" . | nindent 4 }} +{{- end }} diff --git a/charts/firefly/templates/evmconnect/statefulset.yaml b/charts/firefly/templates/evmconnect/statefulset.yaml new file mode 100644 index 0000000..c6c56b8 --- /dev/null +++ b/charts/firefly/templates/evmconnect/statefulset.yaml @@ -0,0 +1,134 @@ +{{/* + Copyright © 2022 Kaleido, Inc. + + SPDX-License-Identifier: Apache-2.0 + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://swww.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +*/}} + +{{- if .Values.evmconnect.enabled }} +apiVersion: apps/v1 +kind: StatefulSet +metadata: + name: {{ include "firefly.fullname" . }}-evmconnect + labels: + {{- include "firefly.evmconnectLabels" . | nindent 4 }} +spec: + replicas: 1 + serviceName: {{ include "firefly.fullname" . }}-evmconnect + updateStrategy: + type: RollingUpdate + selector: + matchLabels: + {{- include "firefly.evmconnectSelectorLabels" . | nindent 6 }} + template: + metadata: + annotations: + checksum/config: {{ include (print $.Template.BasePath "/evmconnect/secret.yaml") . | sha256sum }} + {{- with .Values.evmconnect.podAnnotations }} + {{- toYaml . | nindent 8 }} + {{- end }} + labels: + {{- include "firefly.evmconnectSelectorLabels" . | nindent 8 }} + spec: + {{- with .Values.evmconnect.imagePullSecrets }} + imagePullSecrets: + {{- toYaml . | nindent 8 }} + {{- end }} + securityContext: + {{- toYaml .Values.evmconnect.podSecurityContext | nindent 8 }} + {{- if .Values.evmconnect.initContainers }} + initContainers: + {{- tpl .Values.evmconnect.initContainers . | nindent 8 }} + {{- end }} + containers: + - name: evmconnect + securityContext: + {{- toYaml .Values.evmconnect.securityContext | nindent 12 }} + image: "{{ .Values.evmconnect.image.repository }}:{{ .Values.evmconnect.image.tag }}" + imagePullPolicy: {{ .Values.evmconnect.image.pullPolicy }} + env: + - name: evmconnect_CONFIGFILE + value: /etc/evmconnect/config.yaml + {{- if .Values.evmconnect.extraEnv }} + {{- toYaml .Values.evmconnect.extraEnv | nindent 12 }} + {{- end }} + ports: + - name: http + containerPort: {{ .Values.evmconnect.service.apiPort }} + protocol: TCP + livenessProbe: + tcpSocket: + port: http + initialDelaySeconds: 5 + failureThreshold: 5 + successThreshold: 1 + periodSeconds: 5 + readinessProbe: + tcpSocket: + port: http + initialDelaySeconds: 5 + failureThreshold: 10 + successThreshold: 3 + periodSeconds: 3 + resources: + {{- toYaml .Values.evmconnect.resources | nindent 12 }} + volumeMounts: + - mountPath: /var/run/evmconnect/abis + subPath: abis + name: evmconnect + - mountPath: /var/run/evmconnect/events + subPath: events + name: evmconnect + - mountPath: /etc/evmconnect/config.yaml + name: config + subPath: config.yaml + {{- if .Values.evmconnect.extraContainers }} + {{- tpl .Values.evmconnect.extraContainers . | nindent 8 }} + {{- end }} + {{- with .Values.evmconnect.nodeSelector }} + nodeSelector: + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.evmconnect.affinity }} + affinity: + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.evmconnect.tolerations }} + tolerations: + {{- toYaml . | nindent 8 }} + {{- end }} + volumes: + - name: config + secret: + secretName: "{{ include "firefly.fullname" . }}-evmconnect-config" + volumeClaimTemplates: + - metadata: + name: evmconnect + {{- with .Values.evmconnect.persistentVolume }} + {{- with .annotations }} + annotations: + {{- toYaml . | nindent 10 }} + {{- end }} + spec: + accessModes: + {{- toYaml .accessModes | nindent 10 }} + storageClassName: {{ .storageClass }} + resources: + requests: + storage: {{ .size }} + {{- end }} + {{- if .Values.evmconnect.extraVolumeClaimTemplates }} + {{- tpl .Values.evmconnect.extraVolumeClaimTemplates . | nindent 4 }} + {{- end }} +{{- end }} \ No newline at end of file diff --git a/charts/firefly/values.yaml b/charts/firefly/values.yaml index 47b851f..93780a0 100644 --- a/charts/firefly/values.yaml +++ b/charts/firefly/values.yaml @@ -572,7 +572,6 @@ ethconnect: size: 2Gi storageClass: "" - sandbox: enabled: true @@ -612,4 +611,8 @@ sandbox: tolerations: [] - affinity: {} \ No newline at end of file + affinity: {} + +evmconnect: + enabled: true + From ca572b49534de8c033ed1a212423d496f41d228a Mon Sep 17 00:00:00 2001 From: hfuss Date: Wed, 10 Aug 2022 21:59:59 -0400 Subject: [PATCH 2/4] [0.6.0] EVMConnect StatefulSet Signed-off-by: hfuss --- charts/firefly/ci/evmconnect-values.yaml | 40 ++++++++++ .../firefly/templates/evmconnect/secret.yaml | 67 +++++++++++++---- .../firefly/templates/evmconnect/service.yaml | 2 +- .../templates/evmconnect/statefulset.yaml | 17 ++--- charts/firefly/values.yaml | 75 ++++++++++++++++++- 5 files changed, 174 insertions(+), 27 deletions(-) create mode 100644 charts/firefly/ci/evmconnect-values.yaml diff --git a/charts/firefly/ci/evmconnect-values.yaml b/charts/firefly/ci/evmconnect-values.yaml new file mode 100644 index 0000000..29b20a1 --- /dev/null +++ b/charts/firefly/ci/evmconnect-values.yaml @@ -0,0 +1,40 @@ +config: + debugEnabled: true + adminEnabled: true + metricsEnabled: true + preInit: true + + organizationName: "firefly-os" + organizationKey: "0xeb7284ce905e0665b7d42cabe31c76c45da1d331" + fireflyContractAddress: "0xeb7284ce905e0665b7d42cabe31c76c45da1d254" + + ethconnectUrl: "http://ethconnect.firefly-os" + + postgresUrl: "postgres://postgres:firef1y@postgresql.default.svc:5432?sslmode=disable" + postgresAutomigrate: true + + ipfsApiUrl: "http://ipfs.firefly-os:5001" + ipfsGatewayUrl: "http://ipfs.firefly-os:8080" + + addresssResolverUrlTemplate: "http://address-resolver.firefly-os/wallets/{{.Key}}" + +core: + metrics: + serviceMonitor: + enabled: true + +dataexchange: + certificate: + enabled: true + issuerRef: + kind: ClusterIssuer + name: selfsigned-ca + + tlsSecret: + enabled: false + +evmconnect: + enabled: true + + config: + jsonRpcUrl: "http://geth.firefly-os:8545" diff --git a/charts/firefly/templates/evmconnect/secret.yaml b/charts/firefly/templates/evmconnect/secret.yaml index 59ea671..ce9aed8 100644 --- a/charts/firefly/templates/evmconnect/secret.yaml +++ b/charts/firefly/templates/evmconnect/secret.yaml @@ -24,20 +24,57 @@ metadata: labels: {{- include "firefly.evmconnectLabels" . | nindent 4 }} stringData: - # TODO config.yaml: |- - rest: - rest-gateway: - rpc: - url: {{ tpl .Values.evmconnect.config.jsonRpcUrl . }} - openapi: - eventPollingIntervalSec: {{ .Values.evmconnect.config.eventPollingIntervalSec }} - storagePath: /var/run/evmconnect/abis - eventsDB: /var/run/evmconnect/events - catchupModePageSize: {{ .Values.evmconnect.config.catchupModePageSize }} - catchupModeBlockGap: {{ .Values.evmconnect.config.catchupModeBlockGap }} - http: - port: {{ .Values.evmconnect.service.apiPort }} - maxTXWaitTime: {{ .Values.evmconnect.config.maxTXWaitTimeSec }} - maxInFlight: {{ .Values.evmconnect.config.maxInFlight }} + {{- with .Values.evmconnect.config.confirmations }} + confirmations: + {{- toYaml . | nindent 6 }} + {{- end }} + + {{- with .Values.evmconnect.config.eventstreams }} + eventstreams: + {{= toYaml . | nindent 6 }} + {{- end }} + + {{- with .Values.evmconnect.config.webhooks }} + webhooks: + {{- toYaml . | nindent 6 }} + {{- end }} + + {{- with .Values.evmconnect.config.policyLoop }} + policyloop: + {{- toYaml . | nindent 6 }} + {{- end }} + + {{- with .Values.evmconnect.config.transactions }} + transactions: + {{- toYaml . | nindent 6 }} + {{- end }} + + {{- tpl .Values.evmconnect.config.policyEngine . | nindent 4 }} + + log: + level: {{ .Values.evmconnect.config.log.level | quote }} + json: + enabled: {{ .Values.evmconnect.config.log.jsonEnabled }} + + persistence: + type: leveldb + leveldb: + maxHandles: {{ .Values.evmconnect.config.leveldb.maxHandles | int }} + path: /var/run/leveldb + syncWrites: {{ .Values.evmconnect.config.leveldb.syncWrites }} + + connector: + {{- tpl .Values.evmconnect.config.connector . | nindent 6 }} + + api: + port: {{ .Values.evmconnect.service.port }} + address: 0.0.0.0 + publicURL: http://{{ include "firefly.fullname" . }}-evmconnect:{{ .Values.evmconnect.service.port }} + + ffcore: + url: "http://{{ include "firefly.fullname" . }}:{{ .Values.core.service.httpPort }}" + # TODO + namespaces: + - default {{- end }} diff --git a/charts/firefly/templates/evmconnect/service.yaml b/charts/firefly/templates/evmconnect/service.yaml index 8064cfe..c5e5015 100644 --- a/charts/firefly/templates/evmconnect/service.yaml +++ b/charts/firefly/templates/evmconnect/service.yaml @@ -26,7 +26,7 @@ metadata: spec: type: {{ .Values.evmconnect.service.type }} ports: - - port: {{ .Values.evmconnect.service.apiPort }} + - port: {{ .Values.evmconnect.service.port }} targetPort: http protocol: TCP name: http diff --git a/charts/firefly/templates/evmconnect/statefulset.yaml b/charts/firefly/templates/evmconnect/statefulset.yaml index c6c56b8..15bee07 100644 --- a/charts/firefly/templates/evmconnect/statefulset.yaml +++ b/charts/firefly/templates/evmconnect/statefulset.yaml @@ -57,15 +57,16 @@ spec: {{- toYaml .Values.evmconnect.securityContext | nindent 12 }} image: "{{ .Values.evmconnect.image.repository }}:{{ .Values.evmconnect.image.tag }}" imagePullPolicy: {{ .Values.evmconnect.image.pullPolicy }} + args: + - -f + - /etc/evmconnect/config.yaml + {{- if .Values.evmconnect.extraEnv }} env: - - name: evmconnect_CONFIGFILE - value: /etc/evmconnect/config.yaml - {{- if .Values.evmconnect.extraEnv }} {{- toYaml .Values.evmconnect.extraEnv | nindent 12 }} - {{- end }} + {{- end }} ports: - name: http - containerPort: {{ .Values.evmconnect.service.apiPort }} + containerPort: {{ .Values.evmconnect.service.port }} protocol: TCP livenessProbe: tcpSocket: @@ -84,11 +85,7 @@ spec: resources: {{- toYaml .Values.evmconnect.resources | nindent 12 }} volumeMounts: - - mountPath: /var/run/evmconnect/abis - subPath: abis - name: evmconnect - - mountPath: /var/run/evmconnect/events - subPath: events + - mountPath: /var/run/leveldb name: evmconnect - mountPath: /etc/evmconnect/config.yaml name: config diff --git a/charts/firefly/values.yaml b/charts/firefly/values.yaml index 93780a0..727ec88 100644 --- a/charts/firefly/values.yaml +++ b/charts/firefly/values.yaml @@ -614,5 +614,78 @@ sandbox: affinity: {} evmconnect: - enabled: true + enabled: false + + service: + type: ClusterIP + port: 5000 + + podAnnotations: {} + + imagePullSecrets: [] + + podSecurityContext: {} + + securityContext: {} + + extraEnv: [] + + initContainers: "" + extraContainers: "" + extraVolumeClaimTemplates: "" + + resources: {} + + nodeSelector: {} + + affinity: {} + + tolerations: {} + + persistentVolume: + accessModes: + - ReadWriteOnce + annotations: {} + size: 2Gi + storageClass: "" + + image: + repository: ghcr.io/hyperledger/firefly-evmconnect + pullPolicy: IfNotPresent + tag: v0.1.0 + + # see https://github.com/hyperledger/firefly-evmconnect/blob/main/config.md for more info + config: + jsonRpcUrl: "" + + log: + level: debug + jsonEnabled: false + + confirmations: + required: 0 + # blockQueueLength: 50 + # staleReceiptTimeout: 1m + # notificationQueueLength: 50 + + leveldb: + maxHandles: 100 + syncWrites: false + + connector: | + url: {{ .Values.evmconnect.config.jsonRpcUrl | quote }} + + policyEngine: | + policyengine.simple: + fixedGasPrice: "0" + resubmitInterval: 5m + gasOracle: + mode: fixed + + policyLoop: {} + + transactions: {} + + webhooks: {} + eventstreams: {} From 06c16f8251fdfdbf4d7747cca37a2eface32bec4 Mon Sep 17 00:00:00 2001 From: hfuss Date: Wed, 10 Aug 2022 22:03:55 -0400 Subject: [PATCH 3/4] fixing helper from mergE Signed-off-by: hfuss --- charts/firefly/templates/_helpers.tpl | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/charts/firefly/templates/_helpers.tpl b/charts/firefly/templates/_helpers.tpl index 6d9ea22..d98cf91 100644 --- a/charts/firefly/templates/_helpers.tpl +++ b/charts/firefly/templates/_helpers.tpl @@ -166,17 +166,16 @@ app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/component: ethconnect {{- end }} -<<<<<<< HEAD {{- define "firefly.sandboxSelectorLabels" -}} app.kubernetes.io/name: {{ include "firefly.name" . }} app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/component: sandbox -======= +{{- end }} + {{- define "firefly.evmconnectSelectorLabels" -}} app.kubernetes.io/name: {{ include "firefly.name" . }} app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/component: evmconnect ->>>>>>> a3e9662 (outlining evmconnect) {{- end }} {{- define "firefly.ethconnectRegisterContractsJobName" -}} From fe9888d40d985d18c987990f828ae26559df0318 Mon Sep 17 00:00:00 2001 From: hfuss Date: Wed, 10 Aug 2022 22:12:18 -0400 Subject: [PATCH 4/4] fixing linter and ensuring evmconnect template compiles Signed-off-by: hfuss --- Makefile | 2 +- charts/firefly/ci/evmconnect-values.yaml | 40 ------------------- .../firefly/templates/evmconnect/secret.yaml | 2 +- charts/firefly/values.yaml | 2 +- 4 files changed, 3 insertions(+), 43 deletions(-) delete mode 100644 charts/firefly/ci/evmconnect-values.yaml diff --git a/Makefile b/Makefile index b6f5374..2381f53 100644 --- a/Makefile +++ b/Makefile @@ -9,7 +9,7 @@ clean: kind delete cluster lint: - helm template charts/firefly --set "erc20erc721.enabled=true" --set "erc1155.enabled=true" --set "ethconnect.enabled=true" + helm template charts/firefly --set "erc20erc721.enabled=true" --set "erc1155.enabled=true" --set "ethconnect.enabled=true" --set "evmconnect.enabled=true" ct lint \ --target-branch=main \ --exclude-deprecated \ diff --git a/charts/firefly/ci/evmconnect-values.yaml b/charts/firefly/ci/evmconnect-values.yaml deleted file mode 100644 index 29b20a1..0000000 --- a/charts/firefly/ci/evmconnect-values.yaml +++ /dev/null @@ -1,40 +0,0 @@ -config: - debugEnabled: true - adminEnabled: true - metricsEnabled: true - preInit: true - - organizationName: "firefly-os" - organizationKey: "0xeb7284ce905e0665b7d42cabe31c76c45da1d331" - fireflyContractAddress: "0xeb7284ce905e0665b7d42cabe31c76c45da1d254" - - ethconnectUrl: "http://ethconnect.firefly-os" - - postgresUrl: "postgres://postgres:firef1y@postgresql.default.svc:5432?sslmode=disable" - postgresAutomigrate: true - - ipfsApiUrl: "http://ipfs.firefly-os:5001" - ipfsGatewayUrl: "http://ipfs.firefly-os:8080" - - addresssResolverUrlTemplate: "http://address-resolver.firefly-os/wallets/{{.Key}}" - -core: - metrics: - serviceMonitor: - enabled: true - -dataexchange: - certificate: - enabled: true - issuerRef: - kind: ClusterIssuer - name: selfsigned-ca - - tlsSecret: - enabled: false - -evmconnect: - enabled: true - - config: - jsonRpcUrl: "http://geth.firefly-os:8545" diff --git a/charts/firefly/templates/evmconnect/secret.yaml b/charts/firefly/templates/evmconnect/secret.yaml index ce9aed8..ac88321 100644 --- a/charts/firefly/templates/evmconnect/secret.yaml +++ b/charts/firefly/templates/evmconnect/secret.yaml @@ -32,7 +32,7 @@ stringData: {{- with .Values.evmconnect.config.eventstreams }} eventstreams: - {{= toYaml . | nindent 6 }} + {{- toYaml . | nindent 6 }} {{- end }} {{- with .Values.evmconnect.config.webhooks }} diff --git a/charts/firefly/values.yaml b/charts/firefly/values.yaml index 727ec88..794db6b 100644 --- a/charts/firefly/values.yaml +++ b/charts/firefly/values.yaml @@ -673,7 +673,7 @@ evmconnect: syncWrites: false connector: | - url: {{ .Values.evmconnect.config.jsonRpcUrl | quote }} + url: {{ .Values.evmconnect.config.jsonRpcUrl | quote }} policyEngine: | policyengine.simple: