add extraEnvs parameter

Signed-off-by: Alex Chi Z <[email protected]>
neondatabase · Jul 11, 2024 · 67de2ce · 67de2ce
1 parent 6060ee5
commit 67de2ce
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/charts/neon-storage-scrubber/README.md b/charts/neon-storage-scrubber/README.md
@@ -39,12 +39,13 @@ $ helm install neon-storage-scrubber neondatabase/neon-storage-scrubber
 | serviceAccount.annotations | object | `{}` | Annotations to add to the service account |
 | serviceAccount.create | bool | `true` | Specifies whether a service account should be created |
 | serviceAccount.name | string | `""` | The name of the service account to use. If not set and create is true, a name is generated using the fullname template |
+| settings.extraEnvs | list | `[{"name":"RUST_BACKTRACE","value":"1"},{"name":"PAGESERVER_DISABLE_FILE_LOGGING","value":"1"}]` | extra env variables when running the job |
 | settings.sentryEnvironment | string | `"development"` | "development" or "production". It will be visible in sentry in order to filter issues |
 | settings.sentryUrl | string | `""` | url (will be converted into `SENTRY_DSN` environment variable) used by sentry to collect error/panic events in neon-pg-sni-router |
 | storageScrubber.awsBucket | string | `""` | The AWS bucket for the pageserver storage |
 | storageScrubber.awsRegion | string | `""` | The AWS region to run the scrubber |
 | storageScrubber.command | list | `["/usr/local/bin/storage_scrubber","pageserver-physical-gc","--min-age=1week"]` | The command to run |
-| storageScrubber.schedule | string | `"0 18 * * *"` | The schedule for the cron job |
+| storageScrubber.schedule | string | `"0 18 * * *"` |  |
 | storageScrubber.timeZone | string | `"Etc/UTC"` | The timezone for the cron job |
 | tolerations | list | `[]` | Tolerations for pod assignment. |
 

diff --git a/charts/neon-storage-scrubber/templates/cronjob.yaml b/charts/neon-storage-scrubber/templates/cronjob.yaml
@@ -46,10 +46,6 @@ spec:
                   value: {{ .Values.storageScrubber.awsBucket }}
                 - name: REGION
                   value: {{ .Values.storageScrubber.awsRegion }}
-                - name: RUST_BACKTRACE
-                  value: '1'
-                - name: PAGESERVER_DISABLE_FILE_LOGGING
-                  value: '1'
                 {{- if .Values.settings }}
                 {{- with .Values.settings.sentryUrl }}
                 - name: SENTRY_DSN
@@ -59,6 +55,9 @@ spec:
                 - name: SENTRY_ENVIRONMENT
                   value: {{ . }}
                 {{- end }}
+                {{- with .Values.settings.extraEnvs }}
+                {{- toYaml . | nindent 16 }}
+                {{- end }}
                 {{- end }}
               resources:
                 {{- toYaml .Values.resources | nindent 16 }}

diff --git a/charts/neon-storage-scrubber/values.yaml b/charts/neon-storage-scrubber/values.yaml
@@ -31,6 +31,12 @@ settings:
   sentryUrl: ""
   # settings.sentryEnvironment -- "development" or "production". It will be visible in sentry in order to filter issues
   sentryEnvironment: "development"
+  # -- extra env variables when running the job
+  extraEnvs:
+    - name: RUST_BACKTRACE
+      value: '1'
+    - name: PAGESERVER_DISABLE_FILE_LOGGING
+      value: '1'
 
 storageScrubber:
   # -- The AWS region to run the scrubber