Add remoteStorageConfig

neondatabase · Nov 19, 2024 · 611c8f6 · 611c8f6
1 parent fdc3d7c
commit 611c8f6
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 0 deletions.
diff --git a/charts/neon-storage-scrubber/README.md b/charts/neon-storage-scrubber/README.md
@@ -47,6 +47,7 @@ $ helm install neon-storage-scrubber neondatabase/neon-storage-scrubber
 | storageScrubber.awsRegion | string | `""` | The AWS region to run the scrubber |
 | storageScrubber.command | list | `["pageserver-physical-gc","--min-age=1week"]` | The command to run |
 | storageScrubber.enableStorageControllerConnection | bool | `false` | Enable storage controller related functionalities |
+| storageScrubber.remoteStorageConfig | object | `{}` | The config object to connect to the remote storage (alternative to previous two vars) |
 | storageScrubber.schedule | string | `"0 18 * * *"` |  |
 | storageScrubber.storageControllerJwtToken | string | `""` | Control plane / storage controller JWT token for connecting to the storage controller |
 | storageScrubber.storageControllerUrl | string | `""` | URL of the storage controller |

diff --git a/charts/neon-storage-scrubber/templates/cronjob.yaml b/charts/neon-storage-scrubber/templates/cronjob.yaml
@@ -50,10 +50,18 @@ spec:
                 {{- end -}}
                 {{- toYaml .Values.storageScrubber.command | nindent 16 }}
               env:
+                {{- if .Values.storageScrubber.awsBucket }}
                 - name: BUCKET
                   value: {{ .Values.storageScrubber.awsBucket }}
+                {{- end }}
+                {{- if .Values.storageScrubber.awsRegion }}
                 - name: REGION
                   value: {{ .Values.storageScrubber.awsRegion }}
+                {{- end }}
+                {{- if .Values.storageScrubber.remoteStorageConfig }}
+                - name: REMOTE_STORAGE_CONFIG
+                  value: {{ toToml .Values.storageScrubber.remoteStorageConfig | nindent 20 }}
+                {{- end }}
                 {{- if .Values.settings }}
                 {{- with .Values.settings.sentryUrl }}
                 - name: SENTRY_DSN

diff --git a/charts/neon-storage-scrubber/values.yaml b/charts/neon-storage-scrubber/values.yaml
@@ -43,6 +43,8 @@ storageScrubber:
   awsRegion: ""
   # -- The AWS bucket for the pageserver storage
   awsBucket: ""
+  # -- The config object to connect to the remote storage (alternative to previous two vars)
+  remoteStorageConfig: {}
   # -- The timezone for the cron job
   timeZone: "Etc/UTC"
   # -- The schedule for the cron job -- By default runs every day at 6pm