From 067bfe055253a58adbf03f9bbf7d0e5ed2142ac8 Mon Sep 17 00:00:00 2001 From: StevenMcElligott <89483932+StevenMcElligott@users.noreply.github.com> Date: Sun, 25 Feb 2024 05:38:01 -0500 Subject: [PATCH] fix(monero-node): Redo chart for updated container **Breaking** (#18552) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit **Description** Redid the app, removed bad persistence, added args and new maintained container ⚒️ Fixes #17532 **⚙️ Type of change** - [ ] ⚙️ Feature/App addition - [ ] 🪛 Bugfix - [ ] ⚠️ Breaking change (fix or feature that would cause existing functionality to not work as expected) - [ ] 🔃 Refactor of current code **🧪 How Has This Been Tested?** **📃 Notes:** **✔️ Checklist:** - [ ] ⚖️ My code follows the style guidelines of this project - [ ] 👀 I have performed a self-review of my own code - [ ] #️⃣ I have commented my code, particularly in hard-to-understand areas - [ ] 📄 I have made corresponding changes to the documentation - [ ] ⚠️ My changes generate no new warnings - [ ] 🧪 I have added tests to this description that prove my fix is effective or that my feature works - [ ] ⬆️ I increased versions for any altered app according to semantic versioning **➕ App addition** If this PR is an app addition please make sure you have done the following. - [ ] 🖼️ I have added an icon in the Chart's root directory called `icon.png` --- _Please don't blindly check all the boxes. Read them and only check those that apply. Those checkboxes are there for the reviewer to see what is this all about and the status of this PR with a quick glance._ --- charts/stable/monero-node/Chart.yaml | 4 +- charts/stable/monero-node/questions.yaml | 84 ++++++++++++------- charts/stable/monero-node/templates/_args.tpl | 17 ++++ .../stable/monero-node/templates/common.yaml | 9 +- charts/stable/monero-node/values.yaml | 51 ++++++----- 5 files changed, 105 insertions(+), 60 deletions(-) create mode 100644 charts/stable/monero-node/templates/_args.tpl diff --git a/charts/stable/monero-node/Chart.yaml b/charts/stable/monero-node/Chart.yaml index 23dcafee5b6..932196da52c 100644 --- a/charts/stable/monero-node/Chart.yaml +++ b/charts/stable/monero-node/Chart.yaml @@ -7,7 +7,7 @@ annotations: truecharts.org/min_helm_version: "3.12" truecharts.org/train: stable apiVersion: v2 -appVersion: latest +appVersion: 18.3.1 dependencies: - name: common version: 18.0.2 @@ -36,4 +36,4 @@ sources: - https://github.com/truecharts/charts/tree/master/charts/stable/monero-node - https://hub.docker.com/r/kannix/monero-full-node type: application -version: 5.1.1 +version: 6.0.0 diff --git a/charts/stable/monero-node/questions.yaml b/charts/stable/monero-node/questions.yaml index 62f71a95b04..a1160a69e1b 100644 --- a/charts/stable/monero-node/questions.yaml +++ b/charts/stable/monero-node/questions.yaml @@ -9,17 +9,53 @@ questions: # Include{replicas1} # Include{podSpec} # Include{containerMain} - - variable: env - label: Image Environment - schema: - additional_attrs: true - type: dict - attrs: - - variable: name - label: "name" - schema: - type: string - default: "monerod" +# Include{containerBasic} +# Include{containerAdvanced} + - variable: monero + group: App Configuration + label: Monero Node Configuration + schema: + additional_attrs: true + type: dict + attrs: + - variable: rpcbindip + label: Restricted Bind Ip + description: Restrict bind IP, default is 0.0.0.0 or none + schema: + type: string + default: "0.0.0.0" + - variable: rpcbindport + label: Restricted Bind Port + description: Restrict bind port, default is 18089 + schema: + type: string + default: "18089" + - variable: publicnode + label: Enable Public Node + description: Make node pbulic + schema: + type: boolean + default: true + - variable: noigd + label: Enable No IGD + description: Enable no-igd arg + schema: + type: boolean + default: true + - variable: enablednsblocklist + label: Enable DNS Blocklist + description: Use built-in DNS Blocklist + schema: + type: boolean + default: true + - variable: pruneblockchain + label: Prune Blockchain + description: Enable prune-blockchain arg + schema: + type: boolean + default: true +# Include{containerConfig} +# Include{podOptions} # Include{serviceRoot} - variable: main label: "Main Service" @@ -43,16 +79,16 @@ questions: type: int default: 18080 required: true - - variable: port2 - label: 'port2 service' + - variable: rpc + label: 'RPC service' schema: additional_attrs: true type: dict attrs: # Include{serviceSelectorLoadBalancer} # Include{serviceSelectorExtras} - - variable: port2 - label: "port2 Service Port Configuration" + - variable: rpc + label: "RPC Service Port Configuration" schema: additional_attrs: true type: dict @@ -62,28 +98,14 @@ questions: description: "This port exposes the container port on the service" schema: type: int - default: 18081 + default: 18089 required: true # Include{serviceExpertRoot} # Include{serviceExpert} # Include{serviceList} # Include{persistenceRoot} - - variable: containerdir1 - label: "containerdir1 Storage" - schema: - additional_attrs: true - type: dict - attrs: -# Include{persistenceBasic} - - variable: containerdir2 - label: "containerdir2 Storage" - schema: - additional_attrs: true - type: dict - attrs: -# Include{persistenceBasic} - variable: blockchainstorage - label: "blockchainstorage Storage" + label: "Main Container / Blockchain Storage" schema: additional_attrs: true type: dict diff --git a/charts/stable/monero-node/templates/_args.tpl b/charts/stable/monero-node/templates/_args.tpl new file mode 100644 index 00000000000..cee64209b70 --- /dev/null +++ b/charts/stable/monero-node/templates/_args.tpl @@ -0,0 +1,17 @@ +{{- define "monero.args" -}} +args: + - --rpc-restricted-bind-ip={{ .Values.monero.rpcbindip }} + - --rpc-restricted-bind-port={{ .Values.service.rpc.ports.rpc.port }} + {{- if .Values.monero.publicnode }} + - --public-node + {{- end -}} + {{- if .Values.monero.noigd }} + - --no-igd + {{- end -}} + {{- if .Values.monero.enablednsblocklist }} + - --enable-dns-blocklist + {{- end -}} + {{- if .Values.monero.pruneblockchain }} + - --prune-blockchain + {{- end -}} +{{- end -}} diff --git a/charts/stable/monero-node/templates/common.yaml b/charts/stable/monero-node/templates/common.yaml index 78d963fb168..75b30de1c95 100644 --- a/charts/stable/monero-node/templates/common.yaml +++ b/charts/stable/monero-node/templates/common.yaml @@ -1,2 +1,9 @@ +{{/* Make sure all variables are set properly */}} +{{- include "tc.v1.common.loader.init" . }} + +{{- $newArgs := (include "monero.args" . | fromYaml) }} +{{- $args := concat ((get .Values.workload.main.podSpec.containers.main "args") | default list) $newArgs.args }} +{{- $_ := set .Values.workload.main.podSpec.containers.main "args" $args -}} + {{/* Render the templates */}} -{{ include "tc.v1.common.loader.all" . }} +{{ include "tc.v1.common.loader.apply" . }} diff --git a/charts/stable/monero-node/values.yaml b/charts/stable/monero-node/values.yaml index f5b5b921829..579e3553208 100644 --- a/charts/stable/monero-node/values.yaml +++ b/charts/stable/monero-node/values.yaml @@ -1,25 +1,22 @@ image: pullPolicy: IfNotPresent - repository: kannix/monero-full-node - tag: latest@sha256:24071a723ae6a748ddbe892dfb8f6029f51aec381b760284ea71ccc16030a18e -persistence: - blockchainstorage: - enabled: true - mountPath: /home/monero/.bitmonero - containerdir1: - enabled: true - mountPath: /usr/local - containerdir2: - enabled: true - mountPath: /src -portal: - open: - enabled: true + repository: ghcr.io/sethforprivacy/simple-monerod + tag: v0.18.3.1@sha256:26492ad584d1022c62efe3529574264fc0a30107e797d23686c42c4c62eea093 + +monero: + rpcbindip: "0.0.0.0" + rpcbindport: "18089" + publicnode: true + noigd: true + enablednsblocklist: true + pruneblockchain: true + securityContext: container: readOnlyRootFilesystem: false runAsGroup: 0 runAsUser: 0 + service: main: ports: @@ -27,18 +24,20 @@ service: port: 18080 protocol: tcp targetPort: 18080 - port2: + rpc: enabled: true ports: - port2: + rpc: enabled: true - port: 18081 + port: 18089 protocol: tcp - targetPort: 18081 -workload: - main: - podSpec: - containers: - main: - env: - name: monerod + targetPort: 18089 + +persistence: + blockchainstorage: + enabled: true + mountPath: /home/monero/.bitmonero + +portal: + open: + enabled: true