diff --git a/stable/burrow/Chart.yaml b/stable/burrow/Chart.yaml index 6245bc9eb1..533903ac70 100644 --- a/stable/burrow/Chart.yaml +++ b/stable/burrow/Chart.yaml @@ -1,6 +1,6 @@ name: burrow -version: 1.1.0 -appVersion: 0.24.6 +version: 1.1.5 +appVersion: 0.25.0 description: Burrow is a permissionable smart contract machine home: https://github.com/hyperledger/burrow icon: https://raw.githubusercontent.com/hyperledger/burrow/develop/docs/assets/images/burrow.png diff --git a/stable/burrow/README.md b/stable/burrow/README.md index db240fbaca..8fffc2c719 100644 --- a/stable/burrow/README.md +++ b/stable/burrow/README.md @@ -52,7 +52,7 @@ The following table lists the configurable parameters of the Burrow chart and it | Parameter | Description | Default | | --------- | ----------- | ------- | | `image.repository` | image repository | `"hyperledger/burrow"` | -| `image.tag` | image tag | `"0.24.6"` | +| `image.tag` | image tag | `"0.25.0"` | | `image.pullPolicy` | image pull policy | `"IfNotPresent"` | | `chain.nodes` | number of nodes for the blockchain network | `1` | | `chain.logLevel` | log level for the nodes (`debug`, `info`, `warn`) | `"info"` | @@ -62,6 +62,8 @@ The following table lists the configurable parameters of the Burrow chart and it | `contracts.image` | contract deployer image | `""` | | `contracts.tag` | contract deployer tag | `""` | | `contracts.deploy` | command to run in post-install hook | `""` | +| `chain.restore.enabled` | toggle chain restore mechanism | `false` | +| `chain.restore.dumpURL` | accessible dump file from absolute url | `""` | | `validatorAddresses` | list of validators to deploy | `[]` | | `env` | environment variables to configure burrow | `{}` | | `extraArgs` | extra arguments to give to the build in `burrow start` command | `{}` | diff --git a/stable/burrow/templates/configmap.yaml b/stable/burrow/templates/configmap.yaml index 766d0999ba..09372648d4 100644 --- a/stable/burrow/templates/configmap.yaml +++ b/stable/burrow/templates/configmap.yaml @@ -32,7 +32,7 @@ data: ListenAddress = "tcp://0.0.0.0:{{ .Values.rpcProfiler.port }}" [RPC.GRPC] Enabled = {{ .Values.rpcGRPC.enabled }} - ListenAddress = "0.0.0.0:{{ .Values.rpcGRPC.service.port }}" + ListenAddress = "tcp://0.0.0.0:{{ .Values.rpcGRPC.service.port }}" [RPC.Metrics] Enabled = {{ .Values.rpcMetrics.enabled }} ListenAddress = "tcp://0.0.0.0:{{ .Values.rpcMetrics.port }}" diff --git a/stable/burrow/templates/deployments.yaml b/stable/burrow/templates/deployments.yaml index 93c4034d86..57bf66d92d 100644 --- a/stable/burrow/templates/deployments.yaml +++ b/stable/burrow/templates/deployments.yaml @@ -60,25 +60,52 @@ spec: mkdir -p {{ $workDir }}/.burrow/config && \ cp nodekey-Validator_{{ . }} {{ $workDir }}/.burrow/config/node_key.json && \ chmod 600 {{ $workDir }}/.burrow/config/node_key.json - containers: - - name: node +{{- if $.Values.chain.restore.enabled }} + - name: retreive + image: appropriate/curl + imagePullPolicy: {{ $.Values.image.pullPolicy }} + workingDir: {{ $workDir }} + command: + - curl + args: + - -o + - dumpFile + - {{ $.Values.chain.restore.dumpURL }} + volumeMounts: + - mountPath: {{ $workDir }} + name: work-dir + - name: restore image: "{{ $.Values.image.repository }}:{{ $.Values.image.tag }}" imagePullPolicy: {{ $.Values.image.pullPolicy }} workingDir: {{ $workDir }} command: - - "burrow" + - burrow args: - - "start" - - "--config" + - restore + - dumpFile + volumeMounts: + - mountPath: {{ $workDir }} + name: work-dir +{{- end }} + containers: + - name: burrow + image: "{{ $.Values.image.repository }}:{{ $.Values.image.tag }}" + imagePullPolicy: {{ $.Values.image.pullPolicy }} + workingDir: {{ $workDir }} + command: + - burrow + args: + - start + - --config - "{{ $refDir }}/burrow.toml" - - "--genesis" + - --genesis - "{{ $refDir }}/genesis.json" - - "--validator-address" + - --validator-address - {{ (index $.Values.validatorAddresses ( printf "Validator_%d" $nodeIndex )).Address | quote }} - - "--validator-moniker" + - --validator-moniker - {{ printf "%s-validator-%s" $.Values.organization $nodeNumber | quote }} {{- if (and $.Values.peer.ingress.enabled (not (eq (len $.Values.peer.ingress.hosts) 0))) }} - - "--external-address" + - --external-address - "{{ $nodeNumber }}.{{ index $.Values.peer.ingress.hosts 0 }}:{{ $.Values.peer.service.port }}" {{- end }} {{- range $key, $value := $.Values.extraArgs }} diff --git a/stable/burrow/values.yaml b/stable/burrow/values.yaml index 6a8df4c0a9..180a7f73c5 100644 --- a/stable/burrow/values.yaml +++ b/stable/burrow/values.yaml @@ -1,6 +1,6 @@ image: repository: hyperledger/burrow - tag: 0.24.6 + tag: 0.25.0 pullPolicy: IfNotPresent chain: @@ -8,6 +8,9 @@ chain: logLevel: info extraSeeds: [] testing: false + restore: + enabled: false + dumpURL: "" config: Logging: