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.

Sign up for GitHub

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

Add remoteStorageConfig variable to neon-storage-scrubber #112

Merged
merged 3 commits into from
Nov 20, 2024
Merged

Add remoteStorageConfig variable to neon-storage-scrubber #112

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
611c8f6
Add remoteStorageConfig
arpad-m Nov 19, 2024
741299b
bump version
skyzh Nov 20, 2024
2328314
fix toml newline
skyzh Nov 20, 2024
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/neon-storage-scrubber/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: v2
name: neon-storage-scrubber
description: neon-storage-scrubber
type: application
version: 1.2.0
version: 1.3.0
appVersion: "v0.1.0"
sources:
- https://github.com/neondatabase/neon/tree/main/storage_scrubber
3 changes: 2 additions & 1 deletion charts/neon-storage-scrubber/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# neon-storage-scrubber

![Version: 1.2.0](https://img.shields.io/badge/Version-1.2.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) [![Lint and Test Charts](https://github.com/neondatabase/helm-charts/actions/workflows/lint-test.yaml/badge.svg)](https://github.com/neondatabase/helm-charts/actions/workflows/lint-test.yaml)
![Version: 1.3.0](https://img.shields.io/badge/Version-1.3.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) [![Lint and Test Charts](https://github.com/neondatabase/helm-charts/actions/workflows/lint-test.yaml/badge.svg)](https://github.com/neondatabase/helm-charts/actions/workflows/lint-test.yaml)

neon-storage-scrubber

Expand Down Expand Up @@ -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 |
Expand Down
9 changes: 9 additions & 0 deletions charts/neon-storage-scrubber/templates/cronjob.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,19 @@ 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
Expand Down
2 changes: 2 additions & 0 deletions charts/neon-storage-scrubber/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading