renterd 1.1.1

artur9010 · Mar 20, 2024 · 506e06b · 506e06b
1 parent 0bc5061
commit 506e06b
Show file tree

Hide file tree

Showing 13 changed files with 67 additions and 38 deletions.
diff --git a/index.yaml b/index.yaml
@@ -3,7 +3,31 @@ entries:
   renterd:
   - apiVersion: v2
     appVersion: 1.0.5
-    created: "2024-03-15T18:49:59.089364457Z"
+    created: "2024-03-20T19:36:33.333175888Z"
+    dependencies:
+    - condition: mysql.enabled
+      name: mysql
+      repository: https://charts.bitnami.com/bitnami
+      version: 9.23.0
+    description: Sia renterd helm chart
+    digest: 6a4559b2cc30a8743f7b9c7bb9c96cd3677b3e4f38d08d1ac46354c99c791b63
+    icon: https://i.imgur.com/pWg0PRK.png
+    keywords:
+    - storage
+    - distributed
+    - blockchain
+    - sia
+    - renter
+    - s3
+    - webui
+    name: renterd
+    type: application
+    urls:
+    - https://charts.motyka.pro/renterd-1.1.1.tgz
+    version: 1.1.1
+  - apiVersion: v2
+    appVersion: 1.0.5
+    created: "2024-03-20T19:36:33.328092258Z"
     dependencies:
     - condition: mysql.enabled
       name: mysql
@@ -27,7 +51,7 @@ entries:
     version: 1.1.0
   - apiVersion: v2
     appVersion: 1.0.5
-    created: "2024-03-15T18:49:59.085465767Z"
+    created: "2024-03-20T19:36:33.307541742Z"
     dependencies:
     - condition: mysql.enabled
       name: mysql
@@ -51,7 +75,7 @@ entries:
     version: 1.0.6
   - apiVersion: v2
     appVersion: 1.0.5
-    created: "2024-03-15T18:49:59.078159715Z"
+    created: "2024-03-20T19:36:33.294665348Z"
     dependencies:
     - condition: mysql.enabled
       name: mysql
@@ -75,7 +99,7 @@ entries:
     version: 1.0.5
   - apiVersion: v2
     appVersion: 1.0.5
-    created: "2024-03-15T18:49:59.061529279Z"
+    created: "2024-03-20T19:36:33.278546781Z"
     dependencies:
     - condition: mysql.enabled
       name: mysql
@@ -99,7 +123,7 @@ entries:
     version: 1.0.4
   - apiVersion: v2
     appVersion: 1.0.0
-    created: "2024-03-15T18:49:59.047452313Z"
+    created: "2024-03-20T19:36:33.265578315Z"
     dependencies:
     - condition: mysql.enabled
       name: mysql
@@ -123,7 +147,7 @@ entries:
     version: 1.0.3
   - apiVersion: v2
     appVersion: 1.0.0
-    created: "2024-03-15T18:49:59.031214036Z"
+    created: "2024-03-20T19:36:33.250700105Z"
     dependencies:
     - condition: mysql.enabled
       name: mysql
@@ -147,7 +171,7 @@ entries:
     version: 1.0.2
   - apiVersion: v2
     appVersion: 1.0.0
-    created: "2024-03-15T18:49:59.020636194Z"
+    created: "2024-03-20T19:36:33.236798029Z"
     dependencies:
     - condition: mysql.enabled
       name: mysql
@@ -171,7 +195,7 @@ entries:
     version: 1.0.1
   - apiVersion: v2
     appVersion: 1.0.0
-    created: "2024-03-15T18:49:59.004517368Z"
+    created: "2024-03-20T19:36:33.218128894Z"
     dependencies:
     - condition: mysql.enabled
       name: mysql
@@ -185,4 +209,4 @@ entries:
     urls:
     - https://charts.motyka.pro/renterd-1.0.0.tgz
     version: 1.0.0
-generated: "2024-03-15T18:49:58.989826439Z"
+generated: "2024-03-20T19:36:33.204944076Z"
diff --git a/renterd-1.1.1.tgz b/renterd-1.1.1.tgz
diff --git a/renterd/Chart.yaml b/renterd/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: renterd
 description: Sia renterd helm chart
 type: application
-version: 1.1.0
+version: 1.1.1
 appVersion: "1.0.5"
 icon: https://i.imgur.com/pWg0PRK.png
 keywords:

diff --git a/renterd/README.md b/renterd/README.md
@@ -10,7 +10,7 @@ Helm chart for [Sia renterd software](https://sia.tech/software/renterd).
 
 ```
 helm repo add artur9010 https://charts.motyka.pro
-helm install renterd artur9010/renterd --version 1.1.0
+helm install renterd artur9010/renterd --version 1.1.1
 ```
 
 ## Requirements
@@ -28,13 +28,13 @@ Before you install this helm chart, create a secrets in destination namespace.
 
 Create an .txt file named secret.txt and containing:
 ```
-RENTERD_SEED=24 words
+RENTERD_SEED=12 words
 RENTERD_API_PASSWORD=secure_api_password
 RENTERD_BUS_API_PASSWORD=secure_api_password
 RENTERD_WORKER_API_PASSWORD=secure_api_password
 ```
 
-Seed: You can generate seed here: https://iancoleman.io/bip39/, make sure to select 24 words.
+Seed: You can generate seed here: https://iancoleman.io/bip39/, make sure to select 12 words.
 Password: API password, use the same value for all 3 of them.
 
 Now run `kubectl create secret generic <secret name from values> -n <your namespace> --from-env-file=secret.txt`
@@ -87,6 +87,10 @@ Looking for more [netcup coupons](https://netcup-coupons.com)? Check [netcup-cou
 
 ## Changelog
 
+### 1.1.1
+- Added a database readiness check to renterd-bus init container to make sure it won't start before db.
+- Added missing labels to all objects
+
 ### 1.1.0
 - Moved all contents of `.renterd` to main level of values.yaml
 
@@ -130,27 +134,10 @@ s3:
 - Removed renterd.s3.keys from values as keypairs can now be managed inside webUI.
 - mysql: changed default authentication plugin from `mysql_native_password` to `caching_sha2_password` due to massive spam in container logs, see https://github.com/bitnami/charts/issues/18606
 
-## Components
-This chart runs all 3 of renterd components as separate pods - bus, autopilot and workers.
-There can be only one bus, probably multiple autopilots and multiple workers. Bus also requires some kind of persistent storage for consensus (blockchain) and partial or not uploaded yet slabs.
-Workers are stateless, but autopilot dosen't have any kind of service discovery - it need to have workers specified in env - that means we can't easily scale workers without restarting autopilot each time (it also dosen't like to scale down number of workers).
-
-Workers requires bus to start, autopilot requires workers, bus requires database.
-
-## Testnet automatic faucet claimer
+## Sia Zen testnet automatic faucet claimer
 
 This helm chart has built-in automatic faucet claimer for Sia Zen testnet, you can enable it in `autofaucet` section in values. You can claim up to 5000 ZenSC per day.
 
-Example:
-```yaml
-autofaucet:
-  enabled: true
-  address: "68bf48e81536f2221f3809aa9d1c89c1c869a17c6f186a088e49fd2605e4bfaaa24f26e4c42c"
-  amount: "1000000000000000000000000000" # 1000 SC
-  cron: "0 */4 * * *"
-  restartPolicy: Never
-```
-
 ## Ingress
 
 Tested with k3s default traefik.

diff --git a/renterd/templates/configmaps/renterd-autopilot.yaml b/renterd/templates/configmaps/renterd-autopilot.yaml
@@ -2,6 +2,8 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: renterd-autopilot
+  labels:
+    {{- include "renterd.labels" . | nindent 4 }}
 data:
   renterd.yml: |
     # Managed by Helm - configmap/renterd-autopilot/renterd.yml

diff --git a/renterd/templates/configmaps/renterd-bus.yaml b/renterd/templates/configmaps/renterd-bus.yaml
@@ -2,6 +2,8 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: renterd-bus
+  labels:
+    {{- include "renterd.labels" . | nindent 4 }}
 data:
   renterd.yml: |
     # Managed by Helm - configmap/renterd-bus/renterd.yml

diff --git a/renterd/templates/configmaps/renterd-worker.yaml b/renterd/templates/configmaps/renterd-worker.yaml
@@ -2,6 +2,8 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: renterd-worker
+  labels:
+    {{- include "renterd.labels" . | nindent 4 }}
 data:
   renterd.yml: |
     # Managed by Helm - configmap/renterd-worker/renterd.yml

diff --git a/renterd/templates/configmaps/renterd.yaml b/renterd/templates/configmaps/renterd.yaml
@@ -2,6 +2,8 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: renterd
+  labels:
+    {{- include "renterd.labels" . | nindent 4 }}
 data:
   entrypoint.sh: |
     #!/bin/sh

diff --git a/renterd/templates/cronjob-faucet-claimer.yaml b/renterd/templates/cronjob-faucet-claimer.yaml
@@ -3,6 +3,8 @@ apiVersion: batch/v1
 kind: CronJob
 metadata:
   name: faucet-claimer
+  labels:
+    {{- include "renterd.labels" . | nindent 4 }}
 spec:
   schedule: "{{.Values.autofaucet.cron}}"
   jobTemplate:

diff --git a/renterd/templates/secrets/renterd-mysql.yaml b/renterd/templates/secrets/renterd-mysql.yaml
@@ -3,6 +3,8 @@ apiVersion: v1
 kind: Secret
 metadata:
   name: {{ .Values.databaseSecretName | quote }}
+  labels:
+    {{- include "renterd.labels" . | nindent 4 }}
 type: Opaque
 data:
   RENTERD_DB_URI: {{ "mysql:3306" | b64enc | quote }}

diff --git a/renterd/templates/statefulset-renterd-autopilot.yaml b/renterd/templates/statefulset-renterd-autopilot.yaml
@@ -31,6 +31,7 @@ spec:
           image: ghcr.io/patrickdappollonio/wait-for:v1.0.0
           args:
             - --verbose
+            - --timeout=60s
             # Wait for bus before starting autopilot
             - --host="renterd-bus:{{$.Values.service.http.port}}"
             # Make sure all workers are online before starting autopilot

diff --git a/renterd/templates/statefulset-renterd-bus.yaml b/renterd/templates/statefulset-renterd-bus.yaml
@@ -28,13 +28,17 @@ spec:
       securityContext:
         {{- toYaml . | nindent 8 }}
       {{- end }}
-      # initContainers:
-      #   - name: wait-for
-      #     image: ghcr.io/patrickdappollonio/wait-for:v1.0.0
-      #     args:
-      #       - --verbose
-      #       # Wait for db before starting bus
-      #       - --host=""
+      initContainers:
+        - name: wait-for
+          image: ghcr.io/patrickdappollonio/wait-for:v1.0.0
+          args:
+            - --verbose
+            - --timeout=60s
+            # Wait for db before starting bus
+            - --host="$(RENTERD_DB_URI)"
+          envFrom:
+            - secretRef:
+                name: {{ .Values.databaseSecretName | quote }}
       containers:
         - name: renterd
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"

diff --git a/renterd/templates/statefulset-renterd-worker.yaml b/renterd/templates/statefulset-renterd-worker.yaml
@@ -33,6 +33,7 @@ spec:
           image: ghcr.io/patrickdappollonio/wait-for:v1.0.0
           args:
             - --verbose
+            - --timeout=60s
             # Wait for bus before starting workers
             - --host="renterd-bus:{{$.Values.service.http.port}}"
       containers: