Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Enhancement] Replace with the correct blocks pruning args #312

Merged
merged 8 commits into from
Nov 17, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion charts/node/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: v2
name: node
description: A Helm chart to deploy Substrate/Polkadot nodes
type: application
version: 5.4.3
version: 5.4.4
maintainers:
- name: Parity
url: https://github.com/paritytech/helm-charts
Expand Down
3 changes: 2 additions & 1 deletion charts/node/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ This is intended behaviour. Make sure to run `git add -A` once again to stage ch

# Substrate/Polkadot node Helm chart

![Version: 5.4.3](https://img.shields.io/badge/Version-5.4.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)
![Version: 5.4.4](https://img.shields.io/badge/Version-5.4.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)

## Maintainers

Expand Down Expand Up @@ -190,6 +190,7 @@ An error will be thrown if any of those flags are set directly.
- `--light`
- `--database`
- `--pruning`
- `--blocks-pruning`
- `--prometheus-external`
- `--prometheus-port`
- `--node-key`
Expand Down
1 change: 1 addition & 0 deletions charts/node/README.md.gotmpl
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,7 @@ An error will be thrown if any of those flags are set directly.
- `--light`
- `--database`
- `--pruning`
- `--blocks-pruning`
lazam marked this conversation as resolved.
Show resolved Hide resolved
- `--prometheus-external`
- `--prometheus-port`
- `--node-key`
Expand Down
2 changes: 1 addition & 1 deletion charts/node/templates/_helpers.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -98,5 +98,5 @@ Create the database path depending on the database backend in use (rocksdb or pa
Define a regex matcher to check if the passed node flags are managed by the chart already
*/}}
{{- define "node.chartManagedFlagsRegex" -}}
{{- "(\\W|^)(--name|--base-path|--chain|--validator|--collator|--light|--database|--pruning|--prometheus-external|--prometheus-port|--node-key|--wasm-runtime-overrides|--jaeger-agent|--rpc-external|--unsafe-rpc-external|--ws-external|--unsafe-ws-external|--rpc-methods|--rpc-cors|--rpc-port|--ws-port|--enable-offchain-indexing)(\\W|$)" }}
{{- "(\\W|^)(--name|--base-path|--chain|--validator|--collator|--light|--database|--pruning|--blocks-pruning|--prometheus-external|--prometheus-port|--node-key|--wasm-runtime-overrides|--jaeger-agent|--rpc-external|--unsafe-rpc-external|--ws-external|--unsafe-ws-external|--rpc-methods|--rpc-cors|--rpc-port|--ws-port|--enable-offchain-indexing)(\\W|$)" }}
lazam marked this conversation as resolved.
Show resolved Hide resolved
{{- end }}
8 changes: 4 additions & 4 deletions charts/node/templates/statefulset.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -531,9 +531,9 @@ spec:
--database={{ .Values.node.chainData.database }} \
{{- end }}
{{- if ge ( int .Values.node.chainData.pruning ) 1 }}
--pruning={{ .Values.node.chainData.pruning }} \
--blocks-pruning={{ .Values.node.chainData.pruning }} \
{{- else if and ( not ( kindIs "invalid" .Values.node.chainData.pruning ) ) ( eq 0 ( int .Values.node.chainData.pruning ) ) }}
--pruning=archive \
--blocks-pruning=archive \
{{- end }}
{{- if eq .Values.node.role "collator" }}
--collator \
Expand Down Expand Up @@ -630,9 +630,9 @@ spec:
--database={{ .Values.node.collatorRelayChain.chainData.database }} \
{{- end }}
{{- if ge ( int .Values.node.collatorRelayChain.chainData.pruning ) 1 }}
--pruning={{ .Values.node.collatorRelayChain.chainData.pruning }} \
--blocks-pruning={{ .Values.node.collatorRelayChain.chainData.pruning }} \
{{- else if and ( not ( kindIs "invalid" .Values.node.collatorRelayChain.chainData.pruning ) ) ( eq 0 ( int .Values.node.collatorRelayChain.chainData.pruning ) ) }}
--pruning=archive \
--blocks-pruning=archive \
{{- end }}
{{- if .Values.node.collatorRelayChain.prometheus.enabled }}
--prometheus-external \
Expand Down